Changeset 5054 for trunk/MagicSoft/Mars/mcalib

Timestamp:

09/15/04 23:38:37 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibColorSteer.cc (modified) (5 diffs)
• MCalibColorSteer.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc

@@ -52 +52 @@
 
 #include "MCalibrationIntensityChargeCam.h"
+#include "MCalibrationIntensityBlindCam.h"
 #include "MCalibrationIntensityQECam.h"
 #include "MCalibrationIntensityRelTimeCam.h"
@@ -119 +120 @@
   fIntensBad = (MBadPixelsIntensityCam*)pList->FindCreateObj("MBadPixelsIntensityCam");
 
+  *fLog << inf << GetDescriptor() 
+        << ": Found MBadPixelsIntensityCam ... " << endl;
+  // 
+  // Look for the MCalibrationIntensityBlindCam
+  //
+  fIntensBlind = (MCalibrationIntensityBlindCam*)pList->FindCreateObj("MCalibrationIntensityBlindCam");
+
+  *fLog << inf << GetDescriptor() 
+        << ": Found MCalibrationIntensityBlindCam ... " << endl;
+
   // 
   // Look for the MFillH name "FillChargeCam". In case yes, initialize the 
@@ -129 +140 @@
     fIntensQE     = (MCalibrationIntensityQECam*)    pList->FindCreateObj("MCalibrationIntensityQECam");
     fChargeCalc   = (MCalibrationChargeCalc*)        pList->FindObject("MCalibrationChargeCalc");
+
+    *fLog << inf << GetDescriptor() 
+          << ": Found MHCalibrationChargeCam ... " << endl;
 
     if (!fIntensCharge)
@@ -159 +173 @@
     fRelTimeCalc   = (MCalibrationRelTimeCalc*)        pList->FindObject(AddSerialNumber("MCalibrationRelTimeCalc"));
 
+    *fLog << inf << GetDescriptor() 
+          << ": Found MHCalibrationRelTimeCam ... " << endl;
+
     if (!fIntensRelTime)
       {
@@ -201 +218 @@
   *fLog << inf << GetDescriptor() << " : Finalize calibration histograms..." << flush;
   if (Finalize("MHCalibrationChargeCam"))   *fLog << "MHCalibrationChargeCam";
+  if (Finalize("MHCalibrationChargeBlindCam"))    *fLog << "MHCalibrationChargeBlindCam";
   if (Finalize("MHCalibrationRelTimeCam"))  *fLog << "MHCalibrationRelTimeCam";  
   if (Finalize("MHCalibrationTestCam"))     *fLog << "MHCalibrationChargeCam";  

trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.h

@@ -12 +12 @@
 class MCalibrationRelTimeCalc;
 class MCalibrationIntensityChargeCam;
+class MCalibrationIntensityBlindCam;
 class MCalibrationIntensityQECam;
 class MCalibrationIntensityRelTimeCam;
@@ -23 +24 @@
   MParList                        *fParList;         //!
   MCalibrationIntensityChargeCam  *fIntensCharge;    //!
+  MCalibrationIntensityBlindCam   *fIntensBlind;     //!  
   MCalibrationIntensityQECam      *fIntensQE;        //!
   MCalibrationIntensityRelTimeCam *fIntensRelTime;   //!