Changeset 6963 for trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc

Timestamp:

04/20/05 11:59:48 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc (modified) (10 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc

@@ -46 +46 @@
 
 #include "MParList.h"
-#include "MTaskList.h"
+
+#include "MRawRunHeader.h"
 
 #include "MHCalibrationCam.h"
@@ -61 +62 @@
 #include "MCalibrateData.h"
 
-#include "MGeomCam.h"
-
 ClassImp(MCalibCalcFromPast);
 
@@ -68 +67 @@
 
 const UInt_t MCalibCalcFromPast::fgNumEventsDump = 500;
+
 // --------------------------------------------------------------------------
 //
@@ -76 +76 @@
 //
 MCalibCalcFromPast::MCalibCalcFromPast(const char *name, const char *title)
-    : fGeom(NULL), fParList(NULL), 
+    : fGeom(NULL), fParList(NULL), fRunHeader(NULL),
       fIntensCharge(NULL), fIntensBlind(NULL), fIntensRelTime(NULL), fIntensBad(NULL),
       fChargeCalc(NULL), fRelTimeCalc(NULL), fCalibrate(NULL),
@@ -90 +90 @@
 // -----------------------------------------------------------------------------------
 //
-// The following container are searched for and execution aborted if not in MParList:
-//  - MTaskList
-//
 Int_t MCalibCalcFromPast::PreProcess(MParList *pList)
 {
@@ -109 +106 @@
       return kFALSE;
     }
+
+  fRunHeader = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
+  if (!fRunHeader)
+  {
+      *fLog << err << "MRawRunHeader not found... abort." << endl;
+      return kFALSE;
+  }
 
   // 
@@ -285 +289 @@
   *fLog << inf << "MCalibCalcFromPast::ReInitialize #" << fNumCam << " ";
 
+  const Int_t runnumber = fRunHeader->GetRunNumber();
+
   if (fIntensBad)
     {
@@ -294 +300 @@
     {
       fIntensCharge->AddToList(Form("MCalibrationChargeCam%04d",fNumCam),*fGeom);
+      fIntensCharge->GetCam()->SetRunNumber(runnumber);
       *fLog << "MCalibrationChargeCam...";
     }
@@ -299 +306 @@
     {
       fIntensQE->AddToList(Form("MCalibrationQECam%04d",fNumCam),*fGeom);
+      fIntensQE->GetCam()->SetRunNumber(runnumber);
       *fLog << "MCalibrationQECam...";
     }
@@ -304 +312 @@
     {
       fIntensBlind->AddToList(Form("MCalibrationBlindCam%04d",fNumCam),*fGeom);
+      fIntensBlind->GetCam()->SetRunNumber(runnumber);
       *fLog << "MCalibrationBlindCam...";
     }