Changeset 6013 for trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc

Timestamp:

01/26/05 00:58:00 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc (modified) (12 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc

@@ -30 +30 @@
 // 
 //  Input Containers:
-//   MRawEvtHeader
+//   MCalibrationPattern
 //   MParList
 //   MCalibrationIntensityChargeCam
@@ -66 +66 @@
 #include "MRawRunHeader.h"
 #include "MRawEvtHeader.h"
+#include "MCalibrationPattern.h"
 
 #include "MGeomCam.h"
@@ -78 +79 @@
 //
 MCalibColorSteer::MCalibColorSteer(const char *name, const char *title)
-    : fHeader(NULL), fGeom(NULL), fParList(NULL), 
+    : fCalibPattern(NULL), fGeom(NULL), fParList(NULL), 
       fIntensCharge(NULL), fIntensRelTime(NULL), fIntensBad(NULL),
       fBad(NULL), fChargeCalc(NULL), fRelTimeCalc(NULL), fPattern(0)
@@ -91 +92 @@
 //
 // The following container are searched for and execution aborted if not in MParList:
-//  - MRawEvtHeader
+//  - MCalibrationPattern
 //  - MTaskList
 //
@@ -97 +98 @@
 {
 
-  fHeader = (MRawEvtHeader*)pList->FindObject("MRawEvtHeader");
-  if (!fHeader)
+  fCalibPattern = (MCalibrationPattern*)pList->FindObject("MCalibrationPattern");
+  if (!fCalibPattern)
+    {
+      *fLog << err << "MCalibrationPattern not found... abort." << endl;
+      return kFALSE;
+    }
+
+  fRunHeader = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
+  if (!fRunHeader)
+    {
+      *fLog << err << "MRawRunHeader not found... abort." << endl;
+      return kFALSE;
+    }
+
+  fEvtHeader = (MRawEvtHeader*)pList->FindObject("MRawEvtHeader");
+  if (!fEvtHeader)
     {
       *fLog << err << "MRawEvtHeader not found... abort." << endl;
-      return kFALSE;
-    }
-
-  fRunHeader = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
-  if (!fHeader)
-    {
-      *fLog << err << "MRawRunHeader not found... abort." << endl;
       return kFALSE;
     }
@@ -226 +234 @@
 // --------------------------------------------------------------------------
 //
-// Reads the pattern from MRawEvtHeader and initializes new containers in the 
+// Reads the pattern from MCalibrationPattern and initializes new containers in the 
 // Intensity Cams, if the pattern has changed. Executes Finalize of the 
 // MCalibration*Calc classes in that case.
@@ -233 +241 @@
 {
 
-  const UInt_t pattern = fHeader->GetPulserSlotPattern();
+  const UInt_t pattern = fEvtHeader->GetPulserSlotPattern();
 
   if (fPattern == 0)
@@ -290 +298 @@
       hist->Finalize();
       hist->ResetHists();
-      hist->SetColor( fHeader->GetPulserColor());
+      hist->SetColor( fCalibPattern->GetPulserColor());
       return kTRUE;
     }
@@ -322 +330 @@
       fIntensCharge->AddToList(Form("MCalibrationChargeCam%s",namep.Data()),*fGeom);
       MCalibrationCam *cam = fIntensCharge->GetCam();
-      cam->SetPulserColor(fHeader->GetPulserColor());
+      cam->SetPulserColor(fCalibPattern->GetPulserColor());
       *fLog << inf << "New MCalibrationChargeCam with name: " << cam->GetName() << endl;
     }
@@ -335 +343 @@
       fIntensBlind->AddToList(Form("MCalibrationBlindCam%s",namep.Data()),*fGeom);
       MCalibrationCam *cam = fIntensBlind->GetCam();
-      cam->SetPulserColor(fHeader->GetPulserColor());
+      cam->SetPulserColor(fCalibPattern->GetPulserColor());
       *fLog << inf << "New MCalibrationBlindCam with name: " << cam->GetName() << endl;
     }
@@ -343 +351 @@
       fIntensRelTime->AddToList(Form("MCalibrationRelTimeCam%s",namep.Data()),*fGeom);
       MCalibrationCam *cam = fIntensRelTime->GetCam();
-      cam->SetPulserColor(fHeader->GetPulserColor());
+      cam->SetPulserColor(fCalibPattern->GetPulserColor());
       *fLog << inf << "New MCalibrationRelTimeCam with name: " << cam->GetName() << endl;
     }
@@ -354 +362 @@
 {
 
-  const Float_t strength = fHeader->GetPulserStrength();
-  const MCalibrationCam::PulserColor_t col = fHeader->GetPulserColor();
+  const Float_t strength = fCalibPattern->GetPulserStrength();
+  const MCalibrationCam::PulserColor_t col = fCalibPattern->GetPulserColor();
 
   TString result = Form("%2.1f",strength);