Changeset 5858 for trunk/MagicSoft/Mars/mhcalib

Timestamp:

01/16/05 17:31:49 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhcalib

Files:

• MHCalibrationCam.cc (modified) (5 diffs)
• MHCalibrationCam.h (modified) (5 diffs)
• MHCalibrationRelTimeCam.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc

@@ -81 +81 @@
 
 #include "MRawRunHeader.h"
-#include "MTriggerPattern.h"
 
 ClassImp(MHCalibrationCam);
@@ -121 +120 @@
        fColor(MCalibrationCam::kNONE), fIntensBad(NULL),
        fBadPixels(NULL), fIntensCam(NULL), fCam(NULL), fGeom(NULL), 
-       fRunHeader(NULL), fTrigPattern(NULL), fInterlacedFlags(0), 
-       fMaskInterlaced(0)
+       fRunHeader(NULL)
 {
 
@@ -151 +149 @@
     SetOscillations(kTRUE);
     SetSizeCheck   (kTRUE);
-    SetInterlaced  (kFALSE);
 }
 
@@ -515 +512 @@
   }
 
-  if (IsInterlaced())
-    {
-      fTrigPattern = (MTriggerPattern*)pList->FindObject("MTriggerPattern");
-      if (!fTrigPattern)
-        {
-          *fLog << err << "MTriggerPattern not found... abort." << endl;
-          return kFALSE;
-        }
-      if (IsInterlacedTypePed())
-        fMaskInterlaced |= MTriggerPattern::kPedestal;
-      if (IsInterlacedTypeCal())
-        fMaskInterlaced |= MTriggerPattern::kCalibration;
-      if (IsInterlacedTypePin())
-        fMaskInterlaced |= MTriggerPattern::kPinDiode;
-    }
-  
   return SetupHists(pList);
 }
@@ -863 +844 @@
 {
 
-  if (IsInterlaced())
-    // check whether one of the bits in fMaskInterlaced is set in the trigger pattern
-    if (!(fTrigPattern->GetPrescaled() & fMaskInterlaced))
-      return kTRUE;
-
   if (!IsSizeCheck())
     return FillHists(par,w);

trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.h

@@ -29 +29 @@
 class MGeomCam;
 class MRawRunHeader;
-class MTriggerPattern;
 class MCalibrationIntensityCam;
 class MCalibrationCam;
@@ -89 +88 @@
   MGeomCam         *fGeom;                //! Camera geometry
   MRawRunHeader    *fRunHeader;           //! Run Header
-  MTriggerPattern  *fTrigPattern;         //! Trigger Pattern
   
   TOrdCollection *fHiGainArray;           // Array of calibration pixels, one per pixel
@@ -97 +95 @@
 
   enum { kDebug, kLoGain, kAverageing,
-         kOscillations, kSizeCheck,
-         kInterlaced  };                  // Possible global flags
+         kOscillations, kSizeCheck };     // Possible global flags
    
   Byte_t  fFlags;                         // Bit-field to hold the global flags
-  
-  enum InterlacedMode_t
-    {
-      kInterlacedPed = BIT(0),
-      kInterlacedCal = BIT(1),
-      kInterlacedPin = BIT(2)
-    };                                    // Possible interlaced event types to be treated
-
-  Byte_t  fInterlacedFlags;               // Bit-field to hold the interlaced flags
-  Byte_t  fMaskInterlaced;                // Mask to define the interlaced event types
   
   virtual Bool_t SetupHists ( const MParList *pList ) { return kTRUE; }
@@ -157 +144 @@
   Bool_t IsOscillations() const  { return TESTBIT(fFlags,kOscillations); }
   Bool_t IsSizeCheck   () const  { return TESTBIT(fFlags,kSizeCheck);    }
-  Bool_t IsInterlaced  () const  { return TESTBIT(fFlags,kInterlaced);   }
-
-  Bool_t IsInterlacedTypePed() const { return TESTBIT(fInterlacedFlags,kInterlacedPed); }
-  Bool_t IsInterlacedTypeCal() const { return TESTBIT(fInterlacedFlags,kInterlacedCal); }
-  Bool_t IsInterlacedTypePin() const { return TESTBIT(fInterlacedFlags,kInterlacedPin); }
-  
+
   void   Remove  ( TOrdCollection *col );
   
@@ -222 +204 @@
                                                                 ? SETBIT(fFlags,kSizeCheck) 
                                                                 : CLRBIT(fFlags,kSizeCheck); }
-  void SetInterlaced              ( const Bool_t b=kTRUE ) { b 
-                                                                ? SETBIT(fFlags,kInterlaced) 
-                                                                : CLRBIT(fFlags,kInterlaced); }
-
-  void SetInterlacedTypePed() { SETBIT(fInterlacedFlags,kInterlacedPed); }
-  void SetInterlacedTypeCal() { SETBIT(fInterlacedFlags,kInterlacedCal); }
-  void SetInterlacedTypePin() { SETBIT(fInterlacedFlags,kInterlacedPin); }
-
   void SetHistName  ( const char *name )  { fHistName  = name;  }
   void SetHistTitle ( const char *name )  { fHistTitle = name;  }

trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc

@@ -282 +282 @@
 
   InitHiGainArrays(npixels,nareas,nsectors);
-  if (IsLoGain())
-    InitLoGainArrays(npixels,nareas,nsectors);
+  InitLoGainArrays(npixels,nareas,nsectors);
 
   fSumareahi  .Set(nareas);