Changeset 3737 for trunk/MagicSoft/Mars/mjobs/MJCalibration.h

Timestamp:

04/14/04 17:23:58 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJCalibration.h (modified) (4 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibration.h

@@ -4 +4 @@
 #ifndef MARS_MCalibrationChargeCam
 #include "MCalibrationChargeCam.h"
+#endif
+#ifndef MARS_MCalibrationRelTimeCam
+#include "MCalibrationRelTimeCam.h"
 #endif
 #ifndef MARS_MCalibrationQECam
@@ -26 +29 @@
   MRunIter *fRuns;                                         // Calibration files
   
-  MCalibrationChargeCam fCalibrationCam;                   // Calibration conversion factors FADC2Phe
-  MCalibrationQECam     fQECam;                            // Quantum efficiency, can be set from previous runs
-  MBadPixelsCam         fBadPixels;                        // Bad Pixels cam, can be set from previous runs
+  MBadPixelsCam          fBadPixels;                       // Bad Pixels cam, can be set from previous runs
+  MCalibrationChargeCam  fCalibrationCam;                  // Calibration conversion factors FADC2Phe
+  MCalibrationQECam      fQECam;                           // Quantum efficiency, can be set from previous runs
+  MCalibrationRelTimeCam fRelTimeCam;                      // Calibration constants rel. times
 
   MCalibrationCam::PulserColor_t fColor;                   // Colour of the pulsed LEDs
 
-  enum  Display_t { kFullDisplay, kDataCheck, kNormalDisplay }; // Possible Display types
+  enum  Display_t   { kFullDisplay, kDataCheck, kNormalDisplay }; // Possible Display types
+  
   Display_t fDisplayType;                                  // Chosen Display type
+
+  Bool_t fRelTimes;                                        // Flag if relative times have to be calibrated
+  UInt_t fExtractorLevel;                                  // Level signal extractor (e.g. MExtractSignal2) 
+  UInt_t fArrivalTimeLevel;                                // Level arr. time extractor (e.g. MArrivalTimeCalc2)
   
   void DrawProjection   ( MHCamera *obj, Int_t fit) const; // Draw projection of pixels values
@@ -42 +51 @@
   void   DisplayResult(MParList &plist);
   Bool_t WriteResult();
-  
+
 public:
 
@@ -51 +60 @@
   
   TString GetOutputFile() const;
-  
-  MCalibrationChargeCam &GetCalibrationCam()     { return fCalibrationCam; }
-  MCalibrationQECam     &GetQECam()              { return fQECam;          }    
-  const MBadPixelsCam   &GetBadPixels() const    { return fBadPixels;      }
+
+  MCalibrationChargeCam  &GetCalibrationCam()     { return fCalibrationCam; }  
+  MCalibrationRelTimeCam &GetRelTimeCam()         { return fRelTimeCam;     }
+  MCalibrationQECam      &GetQECam()              { return fQECam;          }    
+  const MBadPixelsCam    &GetBadPixels() const    { return fBadPixels;      }
   
   void SetBadPixels(const MBadPixelsCam &bad)    { bad.Copy(fBadPixels);   }
   void SetQECam    (const MCalibrationQECam &qe) { qe.Copy(fQECam);        }    
-  void SetColor    (const MCalibrationCam::PulserColor_t color) { fColor = color;   }
+  void SetColor    (const MCalibrationCam::PulserColor_t color) { fColor = color; }
 
   // Displays
-  void SetFullDisplay()  { fDisplayType = kFullDisplay;  }
-  void SetDataCheck()  { fDisplayType = kDataCheck;  }
-  void SetNormalDisplay()  { fDisplayType = kNormalDisplay;  }
+  void SetFullDisplay()    { fDisplayType = kFullDisplay;   }
+  void SetDataCheck()      { fDisplayType = kDataCheck;     }
+  void SetNormalDisplay()  { fDisplayType = kNormalDisplay; }
+
+  // Rel. Time
+  void SetRelTimeCalibration(const Bool_t b=kTRUE) { fRelTimes         = b; }
+
+  // Extractors
+  void SetExtractorLevel    (const UInt_t i=1    ) { fExtractorLevel   = i; }
+  void SetArrivalTimeLevel  (const UInt_t i=1    ) { fArrivalTimeLevel = i; }  
+      
   
   Bool_t ReadCalibrationCam();