Changeset 8428 for trunk/MagicSoft/Mars/mjobs

Timestamp:

04/20/07 14:59:58 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibrateSignal.cc (modified) (3 diffs)
• MJCalibration.cc (modified) (1 diff)
• MJCalibration.h (modified) (10 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -70 +70 @@
 #include "MCalibConstCam.h"
 #include "MCalibrationIntensityChargeCam.h"
-#include "MCalibrationIntensityRelTimeCam.h"
 
 #include "MHCalibrationChargeCam.h"
@@ -255 +254 @@
     // Read File
     MCalibrationIntensityChargeCam      ichcam;
-    MCalibrationIntensityRelTimeCam     itmcam;
 
     MHCalibrationChargeCam      hchacam;
@@ -282 +280 @@
     {
         interlacedcont.Add(&ichcam);
-        interlacedcont.Add(&itmcam);
         interlacedcont.Add(&hchacam);
         if (IsUseBlindPixel())

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -2038 +2038 @@
 //
 // If the flag kRelTimes is set, then also:
-// - MCalibrationRelTimeCam or MCalibrationIntensityRelTimeCam     
+// - MCalibrationRelTimeCam
 //
 Bool_t MJCalibration::WriteResult(MParList &plist)

trunk/MagicSoft/Mars/mjobs/MJCalibration.h

@@ -11 +11 @@
 #include "MCalibrationBlindCam.h"
 #endif
+#ifndef MARS_MCalibrationRelTimeCam
+#include "MCalibrationRelTimeCam.h"
+#endif
 #ifndef MARS_MCalibrationChargePINDiode
 #include "MCalibrationChargePINDiode.h"
-#endif
-#ifndef MARS_MCalibrationRelTimeCam
-#include "MCalibrationRelTimeCam.h"
 #endif
 #ifndef MARS_MCalibrationQECam
@@ -80 +80 @@
   Float_t  fRefTimeResolutionInner;        //! Reference value for the time resolution - inner
   Float_t  fRefTimeResolutionOuter;        //! Reference value for the time resolution - outer
-                                           
+
   TString  fReferenceFile;                 // File name containing the reference values
   TString  fHiLoCalibFile;                 // File name containing the hi-lo calib. constants
@@ -86 +86 @@
   MExtractor     *fExtractor;                           // Signal extractor
   MExtractTime   *fTimeExtractor;                       // Arrival Time extractor
-  
+
   MBadPixelsCam                   fBadPixels;           // Bad Pixels cam, can be set from previous runs  
   MCalibrationChargeCam           fCalibrationCam;      // Calibration conversion factors FADC2Phe  
@@ -93 +93 @@
   MCalibrationQECam               fQECam;               // Quantum efficiency, can be set from previous runs
   MCalibrationRelTimeCam          fRelTimeCam;          // Calibration constants rel. times
-  
+
   MPedestalCam                    fExtractorCam;        // Pedestal Cam with extractor resolution
 
   MCalibrationCam::PulserColor_t fColor;                // Colour of the pulsed LEDs
-  
+
   enum  Display_t                                       // Possible Display types
     {
@@ -104 +104 @@
       kNormalDisplay
     };
-  
+
   Display_t fDisplayType;                              // Chosen Display type
-  
+
   enum { kRelTimes, kDebug };                          // Possible flags
 
   Byte_t fFlags;                                       // Bit-field for the flags
-  
+
   TString fGeometry;                                   // Class name geometry
-  
+
   Bool_t IsRelTimes     () const { return TESTBIT(fFlags,kRelTimes);       }
   Bool_t IsDebug        () const { return TESTBIT(fFlags,kDebug);          }
@@ -124 +124 @@
   const  Int_t CountBadPixels ( MHCamera *cam , const Int_t what                           ) const;
   void   FixDataCheckHist     ( TH1D     *hist  ) const;
-  
+
   Bool_t WriteResult   (MParList &plist);
   //Bool_t WriteEventloop( MEvtLoop &evtloop   ) const;
   Bool_t WriteTasks    ( MTask *t1, MTask *t2) const;
   Bool_t CheckEnvLocal ();
-  
+
   // WORKAROUNDS!!!
   void   InitBlindPixel(MExtractBlindPixel &blindext,
@@ -138 +138 @@
   void ReadReferenceFile();
   Bool_t ReadHiLoCalibFile();
-  
+
 public:
   MJCalibration(const char *name=NULL, const char *title=NULL);
@@ -146 +146 @@
   const MCalibrationQECam      &GetQECam()          const { return fQECam;          }
   const MBadPixelsCam          &GetBadPixels()      const { return fBadPixels;      }
-  
+
   // Containers and pointers
   void SetBadPixels    ( const MBadPixelsCam &bad)                   { bad.Copy(fBadPixels); }
@@ -154 +154 @@
   void SetQECam        ( const MCalibrationQECam &qe)                { qe.Copy(fQECam);      }
   void SetTimeExtractor( MExtractTime* ext)                          { fTimeExtractor = ext; }
-    
+
   // Displays
   void SetFullDisplay()      { fDisplayType = kFullDisplay;      }
@@ -162 +162 @@
   // Camera Geomtry
   void SetGeometry(const char *geom) { fGeometry = geom; }
-  
+
   // Flags
   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); }
-  
+
   // Files
   void SetReferenceFile( const TString ref=fgReferenceFile ) { fReferenceFile = ref; }