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

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc

@@ -59 +59 @@
 #include "MCalibrationIntensityChargeCam.h"
 #include "MCalibrationIntensityBlindCam.h"
-#include "MCalibrationIntensityQECam.h"
 //#include "MCalibrationIntensityRelTimeCam.h"
 
 #include "MBadPixelsCam.h"
 
+#include "MCalibrationQECam.h"
+#include "MCalibrationQEPix.h"
 #include "MCalibrationChargePix.h"
 #include "MCalibrationChargeCalc.h"
@@ -126 +127 @@
 
   // 
-  // Look for the MBadPixels Intensity Cam
+  // Look for the MBadPixels Cam
   //
   fBadPixels = (MBadPixelsCam*)pList->FindObject("MBadPixelsCam");
@@ -132 +133 @@
   {
       *fLog << err << "MBadPixelsCam not found... abort." << endl;
+      return kFALSE;
+  }
+
+  //
+  // Look for the MBadPixels Intensity Cam
+  //
+  fQECam = (MCalibrationQECam*)pList->FindObject("MCalibrationQECam");
+  if (!fQECam)
+  {
+      *fLog << err << "MCalibrationQECam not found... abort." << endl;
       return kFALSE;
   }
@@ -160 +171 @@
 
     fIntensCharge = (MCalibrationIntensityChargeCam*)pList->FindCreateObj("MCalibrationIntensityChargeCam");
-    fIntensQE     = (MCalibrationIntensityQECam*)    pList->FindCreateObj("MCalibrationIntensityQECam");
-
     if (!fIntensCharge)
         return kFALSE;
-    if (!fIntensQE)
-        return kFALSE;
 
     MCalibrationChargeCam *chargeinit = (MCalibrationChargeCam*)pList->FindObject("MCalibrationChargeCam");
-    MCalibrationQECam     *qeinit     = (MCalibrationQECam*)    pList->FindObject("MCalibrationQECam");
 
     if (chargeinit)
@@ -174 +180 @@
     else
       *fLog << "Could not find initial MCalibrationChargeCam, cannot initialize intensity cam" << endl;
-
-    if (qeinit)
-      fIntensQE->SetCam(qeinit,0);
-    else
-      *fLog << "Could not find initial MCalibrationQECam, cannot initialize intensity cam" << endl;
 
     if (!fChargeCalc)
@@ -386 +387 @@
   *fLog << "MBadPixelsCam...";
   fBadPixels->Clear();  // FIXME:::::: MERGE PreExcl!!!!
+  // IS IT REALLY NECESSARY?
+
+  *fLog << "MCalibrationQECam...";
+  fQECam->Clear();
+  fQECam->SetRunNumber(runnumber);
+  // IS IT REALLY NECESSARY?
+
+  // IF SIMPLE ENOUGH, REMOVE THE FUNCTION!
 
   if (fIntensCharge)
@@ -404 +413 @@
   }
 
-  if (fIntensQE)
-  {
-      *fLog << "MCalibrationQECam...";
-      MCalibrationCam *cold = fIntensQE->GetCam();
-      fIntensQE->AddToList(Form("MCalibrationQECam%04d",fNumCam),*fGeom);
-      fIntensQE->GetCam()->SetRunNumber(runnumber);
-      if (cold)
-          fIntensQE->DeleteOldCam(cold);
-  }
   if (fIntensBlind)
   {