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

Timestamp:

04/11/05 18:10:00 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc

@@ -218 +218 @@
 // - Sets the latest MCalibrationChargeCam as update class into MCalibrateData
 // - Initialize new MCalibration*Cams into the intensity cams.
-// 
+//
 Int_t MCalibCalcFromPast::Process()
 {
@@ -229 +229 @@
   // Finalize Possible calibration histogram classes...
   //
-  *fLog << inf << GetDescriptor() << " : Finalize calibration histograms..." << endl;
-  if (Finalize("MHCalibrationChargeCam"))      *fLog << "MHCalibrationChargeCam ready" << flush;
-  if (Finalize("MHCalibrationChargeBlindCam")) *fLog << "MHCalibrationChargeBlindCam ready" << flush;
-  if (Finalize("MHCalibrationRelTimeCam"))     *fLog << "MHCalibrationRelTimeCam ready" << flush;  
+  *fLog << inf << GetDescriptor() << ": Finalize calibration histograms: " << flush;
+
+  if (Finalize("MHCalibrationChargeCam"))      *fLog << "MHCalibrationChargeCam..." << flush;
+  if (Finalize("MHCalibrationChargeBlindCam")) *fLog << "MHCalibrationChargeBlindCam..." << flush;
+  if (Finalize("MHCalibrationRelTimeCam"))     *fLog << "MHCalibrationRelTimeCam..." << flush;
 
   //
@@ -238 +239 @@
   //
   *fLog << endl;
-  *fLog << inf << GetDescriptor() << " : Finalize calibration calculations..." << endl;
+  *fLog << inf << "Finalize calibration calculations..." << endl;
   if (fChargeCalc)
     fChargeCalc->Finalize();
@@ -247 +248 @@
 
   ReInitialize();
-
   return kTRUE;
 }
@@ -281 +281 @@
 Bool_t MCalibCalcFromPast::ReInitialize()
 {
+  fNumCam++;
+
+  *fLog << inf << "MCalibCalcFromPast::ReInitialize #" << fNumCam << " ";
+
+  if (fIntensBad)
+    {
+      fIntensBad->AddToList(Form("MBadPixelsCam%04d",fNumCam),*fGeom);
+      *fLog << "MBadPixelsCam...";
+    }
+
+  if (fIntensCharge)
+    {
+      fIntensCharge->AddToList(Form("MCalibrationChargeCam%04d",fNumCam),*fGeom);
+      *fLog << "MCalibrationChargeCam...";
+    }
+  if (fIntensQE)
+    {
+      fIntensQE->AddToList(Form("MCalibrationQECam%04d",fNumCam),*fGeom);
+      *fLog << "MCalibrationQECam...";
+    }
+  if (fIntensBlind)
+    {
+      fIntensBlind->AddToList(Form("MCalibrationBlindCam%04d",fNumCam),*fGeom);
+      *fLog << "MCalibrationBlindCam...";
+    }
 
   *fLog << endl;
-  
-  fNumCam++;
-
-  if (fIntensBad)
-    {
-      fIntensBad->AddToList(Form("MBadPixelsCam%04d",fNumCam),*fGeom);
-      *fLog << inf << "New MBadPixelsCam Nr. " << fNumCam << endl;
-    }
-
-  if (fIntensCharge)
-    {
-      fIntensCharge->AddToList(Form("MCalibrationChargeCam%04d",fNumCam),*fGeom);
-      *fLog << inf << "New MCalibrationChargeCam Nr.  " << fNumCam << endl;
-    }
-  if (fIntensQE)
-    {
-      fIntensQE->AddToList(Form("MCalibrationQECam%04d",fNumCam),*fGeom);
-      *fLog << inf << "New MCalibrationQECam Nr.  " << fNumCam << endl;
-    }
-  if (fIntensBlind)
-    {
-      fIntensBlind->AddToList(Form("MCalibrationBlindCam%04d",fNumCam),*fGeom);
-      *fLog << inf << "New MCalibrationBlindCam Nr. " << fNumCam << endl;
-    }
 
   return kTRUE;
@@ -314 +315 @@
 Int_t MCalibCalcFromPast::PostProcess()
 {
-  *fLog << inf << GetDescriptor() 
-        << ": Number of Calibration Cams: " << fNumCam << endl;
+  *fLog << "Number of Calibration Cams: " << fNumCam << endl;
   return kTRUE;