Changeset 5802 for trunk

Timestamp:

01/11/05 12:02:44 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhcalib/MHCalibrationCam.cc (modified) (7 diffs)
• mhcalib/MHCalibrationCam.h (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -31 +31 @@
 
    * mhcalib/MHCalibrationCam.[h,cc]
-     - add possible flag 'kInterlaced'
+     - add possible flag 'kInterlaced': default: kFALSE (like before)
+     - added pointer to MRawEvtHeader to deny cosmics events in case
+       of 'interlaced' flag is set. No changes for 'normal' calibration
 
 

trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc

@@ -81 +81 @@
 
 #include "MRawRunHeader.h"
+#include "MRawEvtHeader.h"
 
 ClassImp(MHCalibrationCam);
@@ -113 +114 @@
 //-  SetOscillations(kTRUE);
 //-  SetSizeCheck   (kTRUE);
+//-  SetInterlaced  (kFALSE);
 //
 MHCalibrationCam::MHCalibrationCam(const char *name, const char *title)
@@ -118 +120 @@
        fHistXTitle(gsHistXTitle),fHistYTitle(gsHistYTitle), 
        fColor(MCalibrationCam::kNONE), fIntensBad(NULL),
-       fBadPixels(NULL), fIntensCam(NULL), fCam(NULL), fGeom(NULL), fRunHeader(NULL)
+       fBadPixels(NULL), fIntensCam(NULL), fCam(NULL), fGeom(NULL), 
+       fRunHeader(NULL), fEvtHeader(NULL)
 {
 
@@ -147 +150 @@
     SetOscillations(kTRUE);
     SetSizeCheck   (kTRUE);
+    SetInterlaced  (kFALSE);
 }
 
@@ -510 +514 @@
   }
 
-  /* not needed -> Class is never used twice
-  fHiGainArray->Delete();
-  fLoGainArray->Delete();
-
-  fAverageHiGainAreas->Delete();
-  fAverageLoGainAreas->Delete();
-
-  fAverageHiGainSectors->Delete();
-  fAverageLoGainSectors->Delete();
-  */
+  fEvtHeader = (MRawEvtHeader*)pList->FindObject("MRawEvtHeader");
+  if (!fEvtHeader)
+  {
+    if (IsInterlaced())
+      {
+        *fLog << err << GetDescriptor() 
+              << ": MRawEvtHeader not found... Cannot run interlaced calibration events." << endl;
+        return kFALSE;
+      }
+  }
 
   return SetupHists(pList);
@@ -853 +857 @@
 {
 
+  if (IsInterlaced())
+    if (!(fEvtHeader->GetTriggerID() & BIT(1)))
+      return kTRUE;
+
   if (!IsSizeCheck())
     return FillHists(par,w);
@@ -1439 +1447 @@
   return rc;
 }
+

trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.h

@@ -29 +29 @@
 class MGeomCam;
 class MRawRunHeader;
+class MRawEvtHeader;
 class MCalibrationIntensityCam;
 class MCalibrationCam;
@@ -88 +89 @@
   MGeomCam         *fGeom;               //! Camera geometry
   MRawRunHeader    *fRunHeader;          //! Run Header
+  MRawEvtHeader    *fEvtHeader;          //! Evt Header
   
   TOrdCollection *fHiGainArray;          // Array of calibration pixels, one per pixel
@@ -95 +97 @@
 
   enum { kDebug, kLoGain, kAverageing,
-         kOscillations, kSizeCheck };    // Possible flags
+         kOscillations, kSizeCheck,
+         kInterlaced };                  // Possible flags
   
   Byte_t     fFlags;                     // Bit-field to hold the flags
@@ -144 +147 @@
   Bool_t IsOscillations() const  { return TESTBIT(fFlags,kOscillations); }
   Bool_t IsSizeCheck   () const  { return TESTBIT(fFlags,kSizeCheck);    }
+  Bool_t IsInterlaced  () const  { return TESTBIT(fFlags,kInterlaced);   }
   
   void   Remove(TOrdCollection *col);
@@ -204 +208 @@
                                                                 ? SETBIT(fFlags,kSizeCheck) 
                                                                 : CLRBIT(fFlags,kSizeCheck); }
+  void SetInterlaced              ( const Bool_t b=kTRUE ) { b 
+                                                                ? SETBIT(fFlags,kInterlaced) 
+                                                                : CLRBIT(fFlags,kInterlaced); }
   void SetHistName  ( const char *name )  { fHistName  = name;  }
   void SetHistTitle ( const char *name )  { fHistTitle = name;  }