Changeset 8363

Timestamp:

03/04/07 13:49:06 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mjobs/MJCalibrateSignal.cc (modified) (1 diff)
• mmain/MEventDisplay.cc (modified) (8 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -625 +625 @@
     MFillH fillR(&evtR, "MExtractedSignalCam",           "FillHiLoCal");
     MFillH fillO(&evtO, "MArrivalTimeCam",               "FillHiLoOff");
+
+    if (!extractor1->HasLoGain())
+    {
+        fill0.SetFilter(&ftp2);
+        fill1.SetFilter(&ftp2);
+    }
 
     MTaskEnv fillflorian("FinalFantasy");

trunk/MagicSoft/Mars/mmain/MEventDisplay.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MEventDisplay.cc,v 1.58 2007-03-01 17:39:59 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MEventDisplay.cc,v 1.59 2007-03-04 13:49:05 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -225 +225 @@
     MHEvent *evt06a= new MHEvent(MHEvent::kEvtCleaningData);
     MHEvent *evt06b= new MHEvent(MHEvent::kEvtCleaningLevels);
-    MHEvent *evt07 = new MHEvent(MHEvent::kEvtIdxMax);
+    //MHEvent *evt07 = new MHEvent(MHEvent::kEvtIdxMax);
     MHEvent *evt08 = new MHEvent(MHEvent::kEvtArrTime);
     MHEvent *evt09 = new MHEvent(MHEvent::kEvtArrTimeCleaned);
@@ -237 +237 @@
     evt06a->SetName("CleanData");
     evt06b->SetName("Levels");
-    evt07->SetName("MaxSliceIdx");
+    //evt07->SetName("MaxSliceIdx");
     evt08->SetName("ArrTime");
     evt09->SetName("Time");
@@ -254 +254 @@
     plist->AddToList(evt06a);
     plist->AddToList(evt06b);
-    plist->AddToList(evt07);
+    //plist->AddToList(evt07);
     plist->AddToList(evt08);
     plist->AddToList(evt09);
@@ -300 +300 @@
         MCalibrationPatternDecode *decode = new MCalibrationPatternDecode;
 
+        MPedestalSubtract *pedsub1  = new MPedestalSubtract;
+        MPedestalSubtract *pedsub2  = new MPedestalSubtract;
+        pedsub2->SetNamePedestalCam();
+
         MMcCalibrationUpdate* mcupd = new MMcCalibrationUpdate;
         mcupd->SetOuterPixelsGainScaling(kFALSE);
@@ -307 +311 @@
         calib->SetPedestalFlag(MCalibrateData::kEvent);
 
-        MPedestalSubtract *pedsub = new MPedestalSubtract;
-        pedsub->SetNamePedestalCam();
-        //MCalibrationRelTimeCalc *tcalc = new MCalibrationRelTimeCalc;
+        // MPedestalCam is extracted using the simple MSignalCalc!
 
         // MC
@@ -322 +324 @@
         tlist->AddToList(decode);
 
-        tlist->AddToList(pedsub);
-
-        tlist->AddToList(nanal);    // Calculated MPedPhotCam
+        tlist->AddToList(pedsub1);   // Produce arrays
+        tlist->AddToList(nanal);     // Estimate pedestal!
+        tlist->AddToList(pedsub2);   // subtract pedestal
+
         tlist->AddToList(taskenv1); // Calculates MExtractedSignalCam, MArrivalTimeCam
         tlist->AddToList(mcupd);
@@ -344 +347 @@
     if (type==2)
     {
-        MFillH *fill07 = new MFillH(evt07, "MRawEvtData",     "MFillH7");
+        //MFillH *fill07 = new MFillH(evt07, "MRawEvtData",     "MFillH7");
         MFillH *fill08 = new MFillH(evt08, "MArrivalTimeCam", "MFillH8");
-        tlist->AddToList(fill07);
+        //tlist->AddToList(fill07);
         tlist->AddToList(fill08);