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

Timestamp:

04/20/07 14:59:58 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc

@@ -34 +34 @@
 //   MParList
 //   MCalibrationIntensityChargeCam
-//   MCalibrationIntensityRelTimeCam
 //
 //  Output Containers:
 //   MCalibrationIntensityChargeCam
-//   MCalibrationIntensityRelTimeCam
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -58 +56 @@
 
 #include "MCalibrationIntensityChargeCam.h"
-#include "MCalibrationIntensityRelTimeCam.h"
 
 #include "MCalibrationPattern.h"
 #include "MCalibrationQECam.h"
 #include "MCalibrationBlindCam.h"
+
 #include "MCalibrationChargeCam.h"
 #include "MCalibrationChargeCalc.h"
+
+#include "MCalibrationRelTimeCam.h"
 #include "MCalibrationRelTimeCalc.h"
 
@@ -77 +77 @@
 MCalibColorSteer::MCalibColorSteer(const char *name, const char *title)
     : fCalibPattern(NULL), fGeom(NULL), fParList(NULL), 
-      fIntensCharge(NULL), fIntensRelTime(NULL), 
+      fIntensCharge(NULL),
       fBad(NULL), fChargeCalc(NULL), fRelTimeCalc(NULL), fHistCopy(kFALSE)
 {
@@ -178 +178 @@
   {
 
-    fIntensRelTime = (MCalibrationIntensityRelTimeCam*)pList->FindCreateObj("MCalibrationIntensityRelTimeCam");
-    fRelTimeCalc   = (MCalibrationRelTimeCalc*)tlist->FindObject(AddSerialNumber("MCalibrationRelTimeCalc"));
-
     *fLog << inf << "Found MHCalibrationRelTimeCam ... " << flush;
 
-    if (!fIntensRelTime)
-      {
-        *fLog << err << "Could not find nor create MCalibrationIntensityRelTimeCam abort... " << endl;
+    fRelTimeCam = (MCalibrationRelTimeCam*)pList->FindCreateObj("MCalibrationRelTimeCam");
+    if (!fRelTimeCam)
         return kFALSE;
-      }
-
+
+    fRelTimeCalc = (MCalibrationRelTimeCalc*)tlist->FindObject(AddSerialNumber("MCalibrationRelTimeCalc"));
     if (!fRelTimeCalc)
-      {
-        *fLog << err << "Could not find MCalibrationRelTimeCalc abort... " << endl;
         return kFALSE;
-      }
+
+    // CALL ITS PrePorcess ???
   }
   
@@ -320 +315 @@
   fBlindCam->SetPulserColor(fCalibPattern->GetPulserColor());
 
+  fRelTimeCam->Clear();
+  fRelTimeCam->SetPulserColor(fCalibPattern->GetPulserColor());
+
   if (fIntensCharge)
     {
@@ -331 +329 @@
     }
 
-  if (fIntensRelTime)
-    {
-      fIntensRelTime->AddToList(Form("MCalibrationRelTimeCam%s",namep.Data()),*fGeom);
-      MCalibrationCam *cam = fIntensRelTime->GetCam();
-      cam->SetPulserColor(fCalibPattern->GetPulserColor());
-      *fLog << inf << "New MCalibrationRelTimeCam with name: " << cam->GetName() << endl;
-    }
-
   return kTRUE;
 
@@ -388 +378 @@
 //        fIntensBlind->AddHist((MHCalibrationCam*)hcam->Clone());
 
-  if (n.Contains("RelTime"))
-    if (fIntensRelTime)
-          fIntensRelTime->AddHist((MHCalibrationCam*)hcam->Clone());
-}
-
-// --------------------------------------------------------------------------
+//  if (n.Contains("RelTime"))
+//    if (fIntensRelTime)
+//        fIntensRelTime->AddHist((MHCalibrationCam*)hcam->Clone());
+}
+
+// --------------------------------------------------------------------------