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

Timestamp:

04/20/07 12:48:09 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc

@@ -59 +59 @@
 #include "MCalibrationIntensityChargeCam.h"
 #include "MCalibrationIntensityBlindCam.h"
-#include "MCalibrationIntensityQECam.h"
 #include "MCalibrationIntensityRelTimeCam.h"
 
 #include "MCalibrationPattern.h"
+#include "MCalibrationQECam.h"
 #include "MCalibrationChargeCam.h"
 #include "MCalibrationChargeCalc.h"
@@ -156 +156 @@
   if (pList->FindObject(AddSerialNumber("MHCalibrationChargeCam")))
   {
-
-    fIntensCharge = (MCalibrationIntensityChargeCam*)pList->FindCreateObj("MCalibrationIntensityChargeCam");
-    fIntensQE     = (MCalibrationIntensityQECam*)    pList->FindCreateObj("MCalibrationIntensityQECam");
-
-    fChargeCalc   = (MCalibrationChargeCalc*)tlist->FindObject("MCalibrationChargeCalc");
-
-    *fLog << inf << "Found MHCalibrationChargeCam ... " << flush;
-
-    if (!fIntensCharge)
+      *fLog << inf << "Found MHCalibrationChargeCam ... " << flush;
+
+      fIntensCharge = (MCalibrationIntensityChargeCam*)pList->FindCreateObj("MCalibrationIntensityChargeCam");
+      if (!fIntensCharge)
+          return kFALSE;
+
+      fQECam = (MCalibrationQECam*)pList->FindCreateObj("MCalibrationQECam");
+      if (!fQECam)
+          return kFALSE;
+
+      fChargeCalc = (MCalibrationChargeCalc*)tlist->FindObject("MCalibrationChargeCalc");
+      if (!fChargeCalc)
       {
-        *fLog << err << "Could not find nor create MCalibrationIntensityChargeCam abort... " << endl;
-        return kFALSE;
-      }
-    
-    if (!fIntensQE)
-      {
-        *fLog << err << "Could not find nor create MCalibrationIntensityQECam abort... " << endl;
-        return kFALSE;
-      }
-    
-    if (!fChargeCalc)
-      {
-        *fLog << err << "Could not find MCalibrationChargeCalc abort... " << endl;
-        return kFALSE;
+          *fLog << err << "Could not find MCalibrationChargeCalc abort... " << endl;
+          return kFALSE;
       }
   }
-      
+
   // 
   // Look for the MFillH name "FillRelTimeCam". In case yes, initialize the 
@@ -327 +318 @@
 
   fBad->Clear(); // FIXME:::::: MERGE PreExcl!!!!
+  fQECam->Clear();
 
   if (fIntensCharge)
@@ -337 +329 @@
           return kFALSE;
       *fLog << inf << "New MCalibrationChargeCam with name: " << cam->GetName() << endl;
-    }
-  if (fIntensQE)
-    {
-      fIntensQE->AddToList(Form("MCalibrationQECam%s",namep.Data()),*fGeom);
-      *fLog << inf << "New MCalibrationQECam with: " << namep << endl;
     }