Changeset 8361 for trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

Timestamp:

03/04/07 12:01:41 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJPedestal.cc (modified) (10 diffs)

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -95 +95 @@
 #include "MPedestalCam.h"
 #include "MPedestalPix.h"
+#include "MPedestalSubtract.h"
 
 ClassImp(MJPedestal);
@@ -211 +212 @@
     TString title = fDisplay->GetTitle();
     title += "--  Pedestal ";
-    title += fSequence.GetName();
+    title += fSequence.GetFileName();
     title += "  --";
     fDisplay->SetTitle(title);
@@ -914 +915 @@
 
     //
+    // This is for data without lo-gains
+    //
+    const Bool_t haslo = ext->HasLoGain();
+
+    //
     // Get the ranges for the new extractor setting. The window
     // size is always rounded to the next higher integer.
@@ -940 +946 @@
     }
 
-    if (poslo+wslogain+fExtractWinRight > lo1-0.5)
+    if (haslo && poslo+wslogain+fExtractWinRight > lo1-0.5)
     {
         *fLog << err;
@@ -959 +965 @@
     }
 
-    if (poslo2-fExtractWinLeft < lo0+0.5)
+    if (haslo && poslo2-fExtractWinLeft < lo0+0.5)
     {
         *fLog << warn;
@@ -1064 +1070 @@
         hpedcam.SetRenorm(kTRUE);
 
-    MFillH fillpul("MHCalibrationPulseTimeCam", "MPedestalSubtractedEvt", "FillPulseTime");
+    // To have it in the parlist!
+    MHCalibrationPulseTimeCam pulcam;
+    plist.AddToList(&pulcam);
+    MFillH fillpul(&pulcam, "MPedestalSubtractedEvt", "FillPulseTime");
     fillpul.SetBit(MFillH::kDoNotDisplay);
 
@@ -1103 +1112 @@
     MFTriggerPattern fcalib("CalibFilter");
     fcalib.SetDefault(kFALSE);
-    fcalib.RequireCalibration();
-    fcalib.SetInverted();
+    fcalib.DenyCalibration();
+    fcalib.DenyPedestal();
 
     tlist.AddToList(&decode);
@@ -1127 +1136 @@
     // ----------------------------------------------------------------------
     MTaskEnv taskenv("ExtractPedestal");
+
+    //------------------------------
+    MFTriggerPattern ftp2("PedestalFilter");
+    ftp2.SetDefault(kTRUE);
+    ftp2.DenyCalibration();
+//    ftp2.RequirePedestal();
+
+    if (!IsUseMC())
+    {
+        taskenv.SetFilter(&ftp2);
+        tlist.AddToList(&ftp2);
+    }
+    //------------------------------
+
     switch (fExtractType)
     {
@@ -1166 +1189 @@
     pedlogain.SetPedestalsOut(&fPedestalCamOut);
 
-     // kFundamental
+    // kFundamental
     if (fExtractor)
     {
@@ -1181 +1204 @@
         else
         {
-            // The window size of the extractor is not yet initialized,
-            // so we have to stick to the extraction range
-            const Int_t f = fExtractor->GetHiGainFirst();
-            const Int_t l = fExtractor->GetHiGainLast();
-            const Int_t w = (l-f+1)&~1;
-
-            // Setup to use the hi-gain extraction window in the lo-gain
-            // range (the start of the lo-gain range is added automatically
-            // by MPedCalcFromLoGain)
-            pedcalc.SetExtractWindow(f, w);
-            pedlogain.SetExtractWindow(f, w);
+            pedcalc.SetRangeFromExtractor(*fExtractor);
+            pedlogain.SetRangeFromExtractor(*fExtractor);
         }