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

Timestamp:

04/20/07 14:21:12 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc

@@ -58 +58 @@
 
 #include "MCalibrationIntensityChargeCam.h"
-#include "MCalibrationIntensityBlindCam.h"
 #include "MCalibrationIntensityRelTimeCam.h"
 
 #include "MCalibrationPattern.h"
 #include "MCalibrationQECam.h"
+#include "MCalibrationBlindCam.h"
 #include "MCalibrationChargeCam.h"
 #include "MCalibrationChargeCalc.h"
@@ -141 +141 @@
 
   // 
-  // Look for the MCalibrationIntensityBlindCam
-  //
-  fIntensBlind = (MCalibrationIntensityBlindCam*)pList->FindCreateObj("MCalibrationIntensityBlindCam");
-  if (!fIntensBlind)
-  {
-      *fLog << err << "MCalibrationIntensityBlindCam not found... abort." << endl;
-      return kFALSE;
-  }
-  
+  // Look for the MCalibrationBlindCam
+  //
+  fBlindCam = (MCalibrationBlindCam*)pList->FindCreateObj("MCalibrationBlindCam");
+  if (!fBlindCam)
+      return kFALSE;
+
   // 
   // Look for the MFillH name "FillChargeCam". In case yes, initialize the 
@@ -320 +317 @@
   fQECam->Clear();
 
+  fBlindCam->Clear();
+  fBlindCam->SetPulserColor(fCalibPattern->GetPulserColor());
+
   if (fIntensCharge)
     {
@@ -331 +331 @@
     }
 
-  if (fIntensBlind)
-    {
-      fIntensBlind->AddToList(Form("MCalibrationBlindCam%s",namep.Data()),*fGeom);
-      MCalibrationCam *cam = fIntensBlind->GetCam();
-      cam->SetPulserColor(fCalibPattern->GetPulserColor());
-      *fLog << inf << "New MCalibrationBlindCam with name: " << cam->GetName() << endl;
-    }
-
   if (fIntensRelTime)
     {
@@ -392 +384 @@
           fIntensCharge->AddHist((MHCalibrationCam*)hcam->Clone());
     }
-  if (n.Contains("Blind"))
-    if (fIntensBlind)
-          fIntensBlind->AddHist((MHCalibrationCam*)hcam->Clone());
+//  if (n.Contains("Blind"))
+//    if (fIntensBlind)
+//        fIntensBlind->AddHist((MHCalibrationCam*)hcam->Clone());
 
   if (n.Contains("RelTime"))