Changeset 5857 for trunk/MagicSoft

Timestamp:

01/16/05 17:21:10 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibCalcFromPast.cc (modified) (8 diffs)
• MCalibCalcFromPast.h (modified) (2 diffs)
• Makefile (modified) (2 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc

@@ -62 +62 @@
 #include "MCalibrateData.h"
 
-#include "MRawRunHeader.h"
-
 #include "MGeomCam.h"
 
@@ -79 +77 @@
 //
 MCalibCalcFromPast::MCalibCalcFromPast(const char *name, const char *title)
-    : fRunHeader(NULL), fGeom(NULL), fParList(NULL), 
+    : fGeom(NULL), fParList(NULL), 
       fIntensCharge(NULL), fIntensRelTime(NULL), fIntensBad(NULL),
       fChargeCalc(NULL), fRelTimeCalc(NULL), fCalibrate(NULL),
@@ -99 +97 @@
 {
 
-  /*
-  fTrigPattern = (MTriggerPattern*)pList->FindObject("MTriggerPattern");
-  if (!fTrigPattern)
-    {
-      *fLog << err << "MTriggerPattern not found... abort." << endl;
-      return kFALSE;
-    }
-  */
-
-  fRunHeader = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
-  if (!fRunHeader)
-    {
-      *fLog << err << "MRawRunHeader not found... abort." << endl;
-      return kFALSE;
-    }
-
   fGeom = (MGeomCam*)pList->FindObject("MGeomCam");
   if (!fGeom)
@@ -126 +108 @@
     {
       *fLog << err << "MParList not found... abort." << endl;
-      return kFALSE;
-    }
-
-  MTaskList *tlist = (MTaskList*)pList->FindObject("MTaskList");
-  if (!tlist)
-    {
-      *fLog << err << "MTaskList not found... abort." << endl;
       return kFALSE;
     }
@@ -146 +121 @@
   
   // 
-  // Look for the MCalibrationIntensityBlindCam
-  //
-  fIntensBlind = (MCalibrationIntensityBlindCam*)pList->FindCreateObj("MCalibrationIntensityBlindCam");
-  if (fIntensBlind)
-    *fLog << inf << "Found MCalibrationIntensityBlindCam ... " << flush;
-  else
-    return kFALSE;
-  
-  // 
-  // Look for the MFillH name "FillChargeCam". In case yes, initialize the 
+  // Look for the MFillH-class "MHCalibrationBlindCam". In case yes, initialize the 
+  // corresponding IntensityCam
+  //
+  if (pList->FindObject(AddSerialNumber("MHCalibrationBlindCam")))
+  {
+
+    *fLog << inf << "Found MHCalibrationBlindCam ... " << flush;
+
+    fIntensBlind = (MCalibrationIntensityBlindCam*)pList->FindCreateObj("MCalibrationIntensityBlindCam");
+    if (!fIntensBlind)
+      {
+        *fLog << err << "Could not find nor create MCalibrationIntensitBlindCam abort... " << endl;
+        return kFALSE;
+      }
+  }
+  
+  // 
+  // Look for the MFillH-class "MHCalibrationChargeCam". In case yes, initialize the 
   // corresponding IntensityCam
   //
@@ -165 +148 @@
 
     if (!fChargeCalc)
-      fChargeCalc   = (MCalibrationChargeCalc*)tlist->FindObject("MCalibrationChargeCalc");
+      fChargeCalc   = (MCalibrationChargeCalc*)pList->FindObject("MCalibrationChargeCalc");
 
     if (!fCalibrate)
-      fCalibrate   = (MCalibrateData*)tlist->FindObject("MCalibrateData");
+      fCalibrate   = (MCalibrateData*)pList->FindObject("MCalibrateData");
     
     *fLog << inf << "Found MHCalibrationChargeCam ... " << flush;
-    *fLog << err << fCalibrate << flush;
 
     if (!fIntensCharge)
@@ -207 +189 @@
     fIntensRelTime = (MCalibrationIntensityRelTimeCam*)pList->FindCreateObj("MCalibrationIntensityRelTimeCam");
     if (!fRelTimeCalc)
-      fRelTimeCalc   = (MCalibrationRelTimeCalc*)tlist->FindObject(AddSerialNumber("MCalibrationRelTimeCalc"));
+      fRelTimeCalc   = (MCalibrationRelTimeCalc*)pList->FindObject(AddSerialNumber("MCalibrationRelTimeCalc"));
 
     *fLog << inf << "Found MHCalibrationRelTimeCam ... " << flush;
@@ -257 +239 @@
 Int_t MCalibCalcFromPast::Process()
 {
-
-  /*
-  if (!(fTrigPattern->GetPrescaled() & MTriggerPattern::kCalibration))
-    return kTRUE;
-  */
 
   if (fNumEvents++ < fNumEventsDump)

trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.h

@@ -8 +8 @@
 class MParList;
 class MGeomCam;
-class MRawRunHeader;
 class MPedCalcFromLoGain;
 class MCalibrationChargeCalc;
@@ -25 +24 @@
   static const UInt_t fgNumEventsDump;               //! Default for fNumEventsDump
   
-  MRawRunHeader                   *fRunHeader;       //! Run Header
   MGeomCam                        *fGeom;            //! Camera Geometry
   MParList                        *fParList;         //! Parameter List

trunk/MagicSoft/Mars/mcalib/Makefile

@@ -21 +21 @@
 INCLUDES = -I. -I../mbase -I../mgui -I../mgeom -I../mhcalib -I../mhbase \
            -I../manalysis -I../mraw -I../mtools -I../mmc -I../mhist  \
-           -I../mimage -I../msignal -I../mbadpixels -I../mpedestal
+           -I../mimage -I../msignal -I../mbadpixels -I../mpedestal \
+           -I../mtrigger
 
 # mhbase:    MBinning MH 
@@ -34 +35 @@
            MCalibColorSet.cc \
            MCalibColorSteer.cc \
+           MCalibCalcFromPast.cc \
            MCalibrateData.cc \
            MCalibrateRelTimes.cc \