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

Timestamp:

04/18/07 16:34:51 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mjobs/MJCalibration.h

@@ -5 +5 @@
 #include "MJCalib.h"
 #endif
-#ifndef MARS_MCalibrationIntensityChargeCam
-#include "MCalibrationIntensityChargeCam.h"
-#endif
 #ifndef MARS_MCalibrationChargeCam
 #include "MCalibrationChargeCam.h"
-#endif
-#ifndef MARS_MCalibrationIntensityBlindCam
-#include "MCalibrationIntensityBlindCam.h"
 #endif
 #ifndef MARS_MCalibrationBlindCam
@@ -20 +14 @@
 #include "MCalibrationChargePINDiode.h"
 #endif
-#ifndef MARS_MCalibrationIntensityRelTimeCam
-#include "MCalibrationIntensityRelTimeCam.h"
-#endif
 #ifndef MARS_MCalibrationRelTimeCam
 #include "MCalibrationRelTimeCam.h"
 #endif
-#ifndef MARS_MCalibrationIntensityQECam
-#include "MCalibrationIntensityQECam.h"
-#endif
 #ifndef MARS_MCalibrationQECam
 #include "MCalibrationQECam.h"
-#endif
-#ifndef MARS_MBadPixelsIntensityCam
-#include "MBadPixelsIntensityCam.h"
 #endif
 #ifndef MARS_MBadPixelsCam
@@ -102 +87 @@
   MExtractTime   *fTimeExtractor;                       // Arrival Time extractor
   
-  MBadPixelsIntensityCam          fIntensBadCam;        // Bad Pixels cam, can be set from previous runs
   MBadPixelsCam                   fBadPixels;           // Bad Pixels cam, can be set from previous runs  
-  MCalibrationIntensityChargeCam  fIntensCalibCam;      // Calibration conversion factors FADC2Phe for diff. intens.
   MCalibrationChargeCam           fCalibrationCam;      // Calibration conversion factors FADC2Phe  
-  MCalibrationIntensityBlindCam   fIntensBlindCam;      // Calibration from Blind Pixel(s)
   MCalibrationBlindCam            fCalibrationBlindCam; // Calibration from Blind Pixel(s)  
   MCalibrationChargePINDiode      fCalibrationPINDiode; // Calibration from PIN Diode
-  MCalibrationIntensityQECam      fIntensQECam;         // Quantum efficiency for diff. intensities, 
   MCalibrationQECam               fQECam;               // Quantum efficiency, can be set from previous runs
-  MCalibrationIntensityRelTimeCam fIntensRelTimeCam;    // Calibration constants rel. times for diff. intensities
   MCalibrationRelTimeCam          fRelTimeCam;          // Calibration constants rel. times
   
@@ -127 +107 @@
   Display_t fDisplayType;                              // Chosen Display type
   
-  enum { kRelTimes, kDebug, kIntensity };  // Possible flags
+  enum { kRelTimes, kDebug };                          // Possible flags
 
   Byte_t fFlags;                                       // Bit-field for the flags
@@ -135 +115 @@
   Bool_t IsRelTimes     () const { return TESTBIT(fFlags,kRelTimes);       }
   Bool_t IsDebug        () const { return TESTBIT(fFlags,kDebug);          }
-  Bool_t IsIntensity    () const { return TESTBIT(fFlags,kIntensity);      }
 
   void   DrawTab(MParList &plist, const char *cont, const char *name, Option_t *opt);
@@ -162 +141 @@
 public:
   MJCalibration(const char *name=NULL, const char *title=NULL);
-  
-  MCalibrationIntensityChargeCam  &GetIntensCalibrationCam() { return fIntensCalibCam;   }
-  MCalibrationIntensityRelTimeCam &GetIntensRelTimeCam()     { return fIntensRelTimeCam; }
-  MCalibrationIntensityQECam      &GetIntensQECam()          { return fIntensQECam;      }
-  MBadPixelsIntensityCam          &GetIntensBadCam()         { return fIntensBadCam;     }  
 
-  MCalibrationChargeCam           &GetCalibrationCam()       { return fCalibrationCam;   }
-  MCalibrationRelTimeCam          &GetRelTimeCam()           { return fRelTimeCam;       }
-  MCalibrationQECam               &GetQECam()                { return fQECam;            }
-  MBadPixelsCam                   &GetBadPixels()            { return fBadPixels;        }
+  const MCalibrationChargeCam  &GetCalibrationCam() const { return fCalibrationCam; }
+  const MCalibrationRelTimeCam &GetRelTimeCam()     const { return fRelTimeCam;     }
+  const MCalibrationQECam      &GetQECam()          const { return fQECam;          }
+  const MBadPixelsCam          &GetBadPixels()      const { return fBadPixels;      }
   
   // Containers and pointers
@@ -192 +166 @@
   void SetRelTimeCalibration( const Bool_t b=kTRUE ) { b ? SETBIT(fFlags,kRelTimes)  : CLRBIT(fFlags,kRelTimes); }
   void SetDebug             ( const Bool_t b=kTRUE ) { b ? SETBIT(fFlags,kDebug)     : CLRBIT(fFlags,kDebug); }
-  void SetIntensity         ( const Bool_t b=kTRUE ) { b ? SETBIT(fFlags,kIntensity) : CLRBIT(fFlags,kIntensity); }
+  //void SetIntensity         ( const Bool_t b=kTRUE ) { b ? SETBIT(fFlags,kIntensity) : CLRBIT(fFlags,kIntensity); }
   
   // Files