Changeset 6913 for trunk/MagicSoft/Mars/mjobs

Timestamp:

04/07/05 11:32:22 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalib.cc (modified) (1 diff)
• MJCalib.h (modified) (3 diffs)
• MJCalibrateSignal.cc (modified) (9 diffs)
• MJCalibration.cc (modified) (2 diffs)
• MJCalibration.h (modified) (3 diffs)
• calibrationref_Dec04.rc (added)

trunk/MagicSoft/Mars/mjobs/MJCalib.cc

@@ -54 +54 @@
                      fRuns(NULL)
 {
+  SetUseBlindPixel(kFALSE);
+  SetUsePINDiode(kFALSE);
+  
   SetCheckedPixId();
 }

trunk/MagicSoft/Mars/mjobs/MJCalib.h

@@ -32 +32 @@
     Byte_t fStorage;                    // Bit-field for chosen storage type
 
+    enum  Device_t                                       // Possible devices for calibration
+    {
+        kUseBlindPixel,
+        kUsePINDiode
+    };
+
+    Byte_t fDevices;                                     // Bit-field for used devices for calibration
+
 protected:
 
@@ -58 +66 @@
     Bool_t IsUseMC()       const { return fDataFlag==kIsUseMC;       }
 
+    Bool_t IsUseBlindPixel() const { return TESTBIT(fDevices,kUseBlindPixel); }
+    Bool_t IsUsePINDiode  () const { return TESTBIT(fDevices,kUsePINDiode);   }
+
     void SetUseRawData () { fDataFlag=kIsUseRawData;  }
     void SetUseRootData() { fDataFlag=kIsUseRootData; }
@@ -72 +83 @@
     void SetPixelCheck     ( const Bool_t b=kTRUE )  { fIsPixelCheck        = b; }
     void SetPulsePosCheck  ( const Bool_t b=kTRUE )  { fIsPulsePosCheck     = b; }
-  
+
+    void SetUseBlindPixel(const Bool_t b=kTRUE) { b ? SETBIT(fDevices,kUseBlindPixel) : CLRBIT(fDevices,kUseBlindPixel); }
+    void SetUsePINDiode(const Bool_t b=kTRUE)   { b ? SETBIT(fDevices,kUsePINDiode) : CLRBIT(fDevices,kUsePINDiode); }
+
     ClassDef(MJCalib, 0) // Base class for calibration jobs
 };

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -92 +92 @@
 #include "MTriggerPatternDecode.h"
 #include "MFTriggerPattern.h"
+#include "MFTriggerLvl1.h"
 #include "MGeomApply.h"
 //#include "MMcPedestalCopy.h"
@@ -179 +180 @@
 }
 
-Bool_t MJCalibrateSignal::ReadCalibration(TObjArray &l, MBadPixelsCam &cam, MExtractor* &ext1, MExtractor* &ext2, TString &geom) const
+Bool_t MJCalibrateSignal::ReadCalibration(TObjArray &l, MBadPixelsCam &cam, MExtractor* &ext2, MExtractor* &ext3, TString &geom) const
 {
 
@@ -193 +194 @@
     }
 
-    if (!ext1)
-    {
-        TObject *o = file.Get("ExtractSignal");
-        if (o && !o->InheritsFrom(MExtractor::Class()))
-        {
-            *fLog << err << dbginf << "ERROR - ExtractSignal read from " << fname << " doesn't inherit from MExtractor!" << endl;
-            return kFALSE;
-        }
-        ext1 = o ? (MExtractor*)o->Clone() : NULL;
-    }
-
-    TObject *o = file.Get("ExtractTime");
+    TObject *o = file.Get("ExtractSignal");
+    if (o && !o->InheritsFrom(MExtractor::Class()))
+    {
+        *fLog << err << dbginf << "ERROR - ExtractSignal read from " << fname << " doesn't inherit from MExtractor!" << endl;
+        return kFALSE;
+    }
+    ext3 = o ? (MExtractor*)o->Clone() : NULL;
+
+    o = file.Get("ExtractTime");
     if (o && !o->InheritsFrom(MExtractor::Class()))
     {
@@ -211 +209 @@
     }
     ext2 = o ? (MExtractor*)o->Clone() : NULL;
-    if (!ext1 && !ext2)
+    if (!ext3 && !ext2)
     {
         *fLog << err << dbginf << "ERROR - Neither ExtractSignal nor ExrtractTime found in " << fname << "!" << endl;
@@ -385 +383 @@
     calibcont.Add(&tmcam);
 
-    if (!ReadCalibration(calibcont, badpix, extractor1, extractor2, geom))
+    if (!ReadCalibration(calibcont, badpix, extractor2, extractor3, geom))
         return kFALSE;
 
@@ -394 +392 @@
         *fLog << inf << "No Camera geometry found using default <MGeomCamMagic>" << endl;
 
+    if (extractor3)
+    {
+        *fLog << underline << "Signal Extractor found in calibration file" << endl;
+        extractor3->Print();
+        *fLog << endl;
+    }
+    else
+        *fLog << inf << "No Signal Extractor: ExtractSignal in file." << endl;
+
+
     if (extractor1)
     {
-      *fLog << underline << "Signal Extractor found in calibration file" << endl;
+      *fLog << underline << "Modified Signal Extractor set by user." << endl;
       extractor1->Print();
       *fLog << endl;
-      extractor3 = (MExtractor*)extractor1->Clone();
     }
     else
-      *fLog << inf << "No Signal Extractor: ExtractSignal in file." << endl;
+    {
+        *fLog << inf << "No modified Signal Extractor set by user... using ExtractSignal." << endl;
+        extractor1 = extractor3 ? (MExtractor*)extractor3->Clone() : 0;
+    }
 
     if (extractor2)
@@ -455 +465 @@
     
     // Skips empty MC events (Not necessary, but faster!)
-    MContinue contmc("MRawEvtData.GetNumPixels<0.5", "ContEmptyMC");
+    MFTriggerLvl1 trigmc;
+    MContinue contmc(&trigmc, "ContTrigMC");
+    contmc.SetInverted();
 
     MPointingPosInterpolate pextr;
@@ -718 +730 @@
         pacalc.SetFilter(&fcalib);
         filcam.SetFilter(&fcalib);
-        filtme.SetFilter(&fcalib);
-        filbnd.SetFilter(&fcalib);
-        filpin.SetFilter(&fcalib);
+        filtme.SetFilter(&fcalib);
+        if (IsUseBlindPixel())
+            filbnd.SetFilter(&fcalib);
+        if (IsUsePINDiode())
+            filpin.SetFilter(&fcalib);
         chcalc.SetFilter(&fcalib);
         recalc.SetFilter(&fcalib);
@@ -775 +789 @@
     tlist.AddToList(read);
     if (IsUseMC())
+    {
         tlist.AddToList(&writemc);
-    tlist.AddToList(&contmc);
+        tlist.AddToList(&contmc);
+    }
 
     if (IsUseRootData())

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -198 +198 @@
   fName  = name  ? name  : "MJCalibration";
   fTitle = title ? title : "Tool to create the calibration constants for one calibration run";
-  
-  SetUseBlindPixel(kFALSE);
-  SetUsePINDiode(kFALSE);
   
   SetHiLoCalibration();
@@ -2105 +2102 @@
 }
 
-
-// --------------------------------------------------------------------------
-//
-// Set the useage of the Blind Pixel device 
-// 
-void MJCalibration::SetUseBlindPixel(const Bool_t b)
-{
-  b ? SETBIT(fDevices,kUseBlindPixel) : CLRBIT(fDevices,kUseBlindPixel);
-}
-
-// --------------------------------------------------------------------------
-//
-// Set the useage of the PIN Diode device 
-// 
-void MJCalibration::SetUsePINDiode(const Bool_t b)
-{
-  b ? SETBIT(fDevices,kUsePINDiode) : CLRBIT(fDevices,kUsePINDiode);
-}
-
 /*
 Bool_t MJCalibration::WriteEventloop(MEvtLoop &evtloop) const

trunk/MagicSoft/Mars/mjobs/MJCalibration.h

@@ -125 +125 @@
   Display_t fDisplayType;                              // Chosen Display type
   
-  enum  Device_t                                       // Possible devices for calibration
-    {
-      kUseBlindPixel,
-      kUsePINDiode
-    }; 
-  
-  Byte_t fDevices;                                     // Bit-field for used devices for calibration
-
   enum { kRelTimes, kDebug, kIntensity };  // Possible flags
 
@@ -139 +131 @@
   TString fGeometry;                                   // Class name geometry
   
-  Bool_t IsUseBlindPixel() const { return TESTBIT(fDevices,kUseBlindPixel); }
-  Bool_t IsUsePINDiode  () const { return TESTBIT(fDevices,kUsePINDiode);   }
-
   Bool_t IsRelTimes     () const { return TESTBIT(fFlags,kRelTimes);       }
   Bool_t IsDebug        () const { return TESTBIT(fFlags,kDebug);          }
@@ -205 +194 @@
   void SetIntensity         ( const Bool_t b=kTRUE ) { b ? SETBIT(fFlags,kIntensity) : CLRBIT(fFlags,kIntensity); }
   
-  // Devices
-  void SetUseBlindPixel(const Bool_t b=kTRUE);
-  void SetUsePINDiode(const Bool_t b=kTRUE);
-
   // Files
   void SetReferenceFile( const TString ref=fgReferenceFile ) { fReferenceFile = ref; }