Changeset 6777

Timestamp:

03/07/05 18:45:14 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• callisto.rc (modified) (1 diff)
• mhcalib/MHPedestalCam.h (modified) (1 diff)
• mjobs/MJCalib.cc (modified) (2 diffs)
• mjobs/MJCalib.h (modified) (2 diffs)
• mjobs/MJCalibTest.cc (modified) (1 diff)
• mjobs/MJCalibrateSignal.cc (modified) (5 diffs)
• mjobs/MJCalibrateSignal.h (modified) (2 diffs)
• mjobs/MJCalibration.cc (modified) (3 diffs)
• mjobs/MJPedestal.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/callisto.rc

@@ -203 +203 @@
 # Use this if you want to change the higain-vs. logain intercalibration
 # -------------------------------------------------------------------------
-MJCalibration.HiLoCalibFile:    mjobs/hilocalib_df6.root
+#MJCalibration.HiLoCalibFile:    mjobs/hilocalib_df6.root
+#MJCalibration.HiLoCalibration:  yes
 
 # -------------------------------------------------------------------------

trunk/MagicSoft/Mars/mhcalib/MHPedestalCam.h

@@ -70 +70 @@
 
   void SetNamePedestalCamOut(const char *name) { fNamePedestalCamOut = name; }
+  void SetPedestalsOut ( MPedestalCam *cam) { fPedestalsOut = cam; }
   void SetRenorm         (const Bool_t b=kTRUE )  {  fRenorm = b; }
   

trunk/MagicSoft/Mars/mjobs/MJCalib.cc

@@ -50 +50 @@
 //
 MJCalib::MJCalib() : fDataFlag(kIsUseRootData), fStorage(0), 
-                     fPixelCheck(kFALSE), fPulsePosCheck(kFALSE),
+                     fIsPixelCheck(kFALSE), fIsPulsePosCheck(kFALSE),
+                     fIsHiLoCalibration(kFALSE),
                      fRuns(NULL)
 {
@@ -59 +60 @@
 {
     if (HasEnv("PixelCheck"))
-        SetPixelCheck(GetEnv("PixelCheck", fPixelCheck));
+        SetPixelCheck(GetEnv("PixelCheck", fIsPixelCheck));
 
     if (HasEnv("PulsePosCheck"))
-        SetPulsePosCheck(GetEnv("PulsePosCheck", fPulsePosCheck));
+        SetPulsePosCheck(GetEnv("PulsePosCheck", fIsPulsePosCheck));
 
     if (HasEnv("CheckedPixId"))
         SetCheckedPixId(GetEnv("CheckedPixId",fCheckedPixId));
+
+    if (HasEnv("HiLoCalibration"))    
+      SetHiLoCalibration(GetEnv("HiLoCalibration", fIsHiLoCalibration));
 
     if (HasEnv("StorageType"))

trunk/MagicSoft/Mars/mjobs/MJCalib.h

@@ -34 +34 @@
 protected:
 
-    Bool_t fPixelCheck;                 // Check a test pixel?
+    Bool_t fIsPixelCheck;               // Check a test pixel?
     Int_t  fCheckedPixId;               // ID of checked pixel
 
-    Bool_t fPulsePosCheck;              // Check pulse position?
+    Bool_t fIsPulsePosCheck;            // Check pulse position?
+    Bool_t fIsHiLoCalibration;          // Choose to calibrate the high-gain vs. low-gains
     
     MRunIter *fRuns;                    // Data files, only used for test applications, default is sequence files!
@@ -63 +64 @@
     void SetDataType(DataType_t type) { fDataFlag=type; }
   
-    void SetPixelCheck   ( const Bool_t b=kTRUE )          { fPixelCheck    = b; }
-    void SetPulsePosCheck( const Bool_t b=kTRUE )          { fPulsePosCheck = b; }
     void SetCheckedPixId ( const Int_t  i=fgCheckedPixId ) { fCheckedPixId  = i; }
 
     void SetNoStorage    ( const Bool_t b=kTRUE ) { b ? SETBIT(fStorage,kNoStorage)    : CLRBIT(fStorage,kNoStorage); }
     void SetHistsStorage ( const Bool_t b=kTRUE ) { b ? SETBIT(fStorage,kHistsStorage) : CLRBIT(fStorage,kHistsStorage); }
+
+    void SetHiLoCalibration( const Bool_t b=kTRUE )  { fIsHiLoCalibration = b; }
+    void SetPixelCheck     ( const Bool_t b=kTRUE )  { fIsPixelCheck        = b; }
+    void SetPulsePosCheck  ( const Bool_t b=kTRUE )  { fIsPulsePosCheck     = b; }
   
     ClassDef(MJCalib, 0) // Base class for calibration jobs

trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc

@@ -530 +530 @@
   tlist.PrintStatistics();
   
-  if (fPixelCheck)
+  if (fIsPixelCheck)
     {
       MHCalibrationTestCam *hcam = (MHCalibrationTestCam*)plist.FindObject("MHCalibrationTestCam");

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -127 +127 @@
 MJCalibrateSignal::MJCalibrateSignal(const char *name, const char *title)
     : fIsInterlaced(kTRUE), fIsRelTimesUpdate(kFALSE), 
-      fIsHiLoCalibration(kFALSE), fIsModifiedExtractWin(kTRUE)
+      fIsModifiedExtractWin(kTRUE)
 {
     fName  = name  ? name  : "MJCalibrateSignal";
     fTitle = title ? title : "Tool to calibrate data";
 
-    fPulsePosCheck = kTRUE;
+    SetPulsePosCheck();
     //fCruns = NULL;
 }
@@ -255 +255 @@
     SetInterlaced(GetEnv("Interlaced", fIsInterlaced));
     SetRelTimesUpdate(GetEnv("RelTimesUpdate", fIsRelTimesUpdate));
-    SetHiLoCalibration(GetEnv("HiLoCalibration", fIsHiLoCalibration));
     SetModifiedExtractWin(GetEnv("ModifiedExtractWin", fIsModifiedExtractWin));
 
@@ -745 +744 @@
     if (fIsHiLoCalibration)
       tlist2.AddToList(&filhil);
-    if (fPulsePosCheck)
+    if (fIsPulsePosCheck)
       tlist2.AddToList(&filpul);
     tlist2.AddToList(&fill2);
@@ -815 +814 @@
     DisplayResult(plist);
 
-    if (fPixelCheck)
+    if (fIsPixelCheck)
       {
-        if (fPulsePosCheck)
+        if (fIsPulsePosCheck)
           {
             MHCalibrationPulseTimeCam *pcam = (MHCalibrationPulseTimeCam*)plist.FindObject("MHCalibrationPulseTimeCam");
@@ -885 +884 @@
     disp21.SetYTitle("T [FADC sl.]");
 
-    if (fPulsePosCheck)
+    if (fIsPulsePosCheck)
       {
         TCanvas &c0 = fDisplay->AddTab("PulseTime");

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.h

@@ -25 +25 @@
     Bool_t fIsInterlaced;               // Distinguish interlaced from other calibration
     Bool_t fIsRelTimesUpdate;           // Choose to update relative times from interlaced
-    Bool_t fIsHiLoCalibration;          // Choose to calibrate the high-gain vs. low-gains
     Bool_t fIsModifiedExtractWin;       // Choose to use the modified extraction window from pulse position
     
@@ -48 +47 @@
     void SetInterlaced     ( const Bool_t b=kTRUE )  { fIsInterlaced      = b; }
     void SetRelTimesUpdate ( const Bool_t b=kTRUE )  { fIsRelTimesUpdate  = b; }
-    void SetHiLoCalibration( const Bool_t b=kTRUE )  { fIsHiLoCalibration = b; }
     void SetModifiedExtractWin( const Bool_t b=kTRUE )  { fIsModifiedExtractWin = b; }
 

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -200 +200 @@
   SetUsePINDiode();
   
+  SetHiLoCalibration();
   SetRelTimeCalibration();
   SetDebug(kFALSE);
@@ -1474 +1475 @@
 {
 
+  if (!fIsHiLoCalibration)
+    return kTRUE;
+
   TFile file(fHiLoCalibFile,"READ");
 
@@ -1971 +1975 @@
     tlist.PrintStatistics();
 
-  if (fPixelCheck)
+  if (fIsPixelCheck)
     {
       MHCalibrationChargeCam *hcam = (MHCalibrationChargeCam*)plist.FindObject("MHCalibrationChargeCam");

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -282 +282 @@
     //
     MGeomCam           &geomcam   = *(MGeomCam*)plist.FindObject("MGeomCam");
-    MCalibrationPedCam &calpedcam = *(MCalibrationPedCam*)plist.FindObject("MCalibrationPedCam");
+    //    MCalibrationPedCam &calpedcam = *(MCalibrationPedCam*)plist.FindObject("MCalibrationPedCam");
 
     //
@@ -1036 +1036 @@
     fcalib.SetInverted();
 
-    if (fPulsePosCheck)
+    if (fIsPulsePosCheck)
       {
         fillpul.SetFilter(&fcalib);
@@ -1212 +1212 @@
     fExtractor->SetFilter(0);
 
-    if (fPixelCheck)
+    if (fIsPixelCheck)
       {
         MHPedestalCam *hcam = (MHPedestalCam*)plist.FindObject("MHPedestalCam");
@@ -1228 +1228 @@
         return kFALSE;
 
-    if (fPulsePosCheck)
+    if (fIsPulsePosCheck)
       {
 
         MHCalibrationPulseTimeCam *hcam = (MHCalibrationPulseTimeCam*)plist.FindObject("MHCalibrationPulseTimeCam");
-        if (fPixelCheck)
+        if (fIsPixelCheck)
           {
             hcam->DrawClone();