Changeset 4910 for trunk/MagicSoft

Timestamp:

09/09/04 18:13:09 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

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

trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc

@@ -53 +53 @@
 #include "MCalibrationIntensityRelTimeCam.h"
 
+#include "MCalibrationChargeCalc.h"
+#include "MCalibrationRelTimeCalc.h"
+
 #include "MRawEvtHeader.h"
 
@@ -68 +71 @@
     : fHeader(NULL), fGeom(NULL), fParList(NULL), 
       fIntensCharge(NULL), fIntensRelTime(NULL), 
+      fChargeCalc(NULL), fRelTimeCalc(NULL),
       fPattern(0)
 {
@@ -114 +118 @@
     fIntensCharge = (MCalibrationIntensityChargeCam*)pList->FindCreateObj("MCalibrationIntensityChargeCam");
     fIntensQE     = (MCalibrationIntensityQECam*)    pList->FindCreateObj("MCalibrationIntensityQECam");
+    fChargeCalc   = (MCalibrationChargeCalc*)        pList->FindObject("MCalibrationChargeCalc");
 
     if (!fIntensCharge)
@@ -121 +126 @@
       }
     
-    if (fIntensQE)
+    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;
       }
@@ -134 +145 @@
   if (pList->FindObject(AddSerialNumber("FillRelTimeCam")))
   {
+
     fIntensRelTime = (MCalibrationIntensityRelTimeCam*)pList->FindCreateObj("MCalibrationIntensityRelTimeCam");
+    fRelTimeCalc   = (MCalibrationRelTimeCalc*)        pList->FindObject(AddSerialNumber("MCalibrationRelTimeCalc"));
+
     if (!fIntensRelTime)
       {
         *fLog << err << "Could not find nor create MCalibrationIntensityRelTimeCam abort... " << endl;
+        return kFALSE;
+      }
+
+    if (!fRelTimeCalc)
+      {
+        *fLog << err << "Could not find MCalibrationRelTimeCalc abort... " << endl;
         return kFALSE;
       }
@@ -160 +180 @@
     {
       fPattern = pattern;
-      //      ReInitialize();
       return kTRUE;
     }
@@ -167 +186 @@
   
   //
-  // Possible calibration histogram classes...
+  // Finalize Possible calibration histogram classes...
   //
   *fLog << inf << GetDescriptor() << " : Finalize calibration histograms..." << flush;
@@ -175 +194 @@
   if (Finalize("MHCalibrationTestTimeCam")) *fLog << "MHCalibrationChargeCam";  
 
+  //
+  // Finalize possible calibration calculation tasks
+  //
+  *fLog << inf << GetDescriptor() << " : Finalize calibration calculations..." << flush;
+  if (fChargeCalc)
+    fChargeCalc->CallPostProcess();
+  if (fRelTimeCalc)
+    fRelTimeCalc->CallPostProcess();
+
   ReInitialize();
 
@@ -197 +225 @@
 Bool_t MCalibColorSteer::ReInitialize()
 {
+
   if (fIntensCharge)
     {
@@ -215 +244 @@
           << ": No MCalibrationIntensityQECam loaded, but MHCalibrationChargeCam found " 
           << endl;
-
-
   if (fIntensRelTime)
     {

trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.h

@@ -9 +9 @@
 class MGeomCam;
 class MRawEvtHeader;
+class MCalibrationChargeCalc;
+class MCalibrationRelTimeCalc;
 class MCalibrationIntensityChargeCam;
 class MCalibrationIntensityQECam;
@@ -22 +24 @@
     MCalibrationIntensityQECam      *fIntensQE;
     MCalibrationIntensityRelTimeCam *fIntensRelTime;
-
+    MCalibrationChargeCalc          *fChargeCalc;
+    MCalibrationRelTimeCalc         *fRelTimeCalc;    
+    
     UInt_t fPattern;