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

Timestamp:

05/10/05 12:13:12 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc

@@ -22 +22 @@
 !
 \* ======================================================================== */
+
 //////////////////////////////////////////////////////////////////////////////
 //
@@ -81 +82 @@
     : fCalibPattern(NULL), fGeom(NULL), fParList(NULL), 
       fIntensCharge(NULL), fIntensRelTime(NULL), fIntensBad(NULL),
-      fBad(NULL), fChargeCalc(NULL), fRelTimeCalc(NULL)
+      fBad(NULL), fChargeCalc(NULL), fRelTimeCalc(NULL), fHistCopy(kFALSE)
 {
 
@@ -285 +286 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Reads the pattern from MCalibrationPattern and initializes new containers in the 
+// Intensity Cams, if the pattern has changed. Executes Finalize of the 
+// MCalibration*Calc classes in that case.
+//
+Int_t MCalibColorSteer::PostProcess()
+{
+    //
+    // Finalize Possible calibration histogram classes...
+    //
+    *fLog << inf << "Finalize calibration histograms..." << flush;
+    if (Finalize("MHCalibrationChargeCam"))      *fLog << inf << "MHCalibrationChargeCam..." << flush;
+    if (Finalize("MHCalibrationChargeBlindCam")) *fLog << inf << "MHCalibrationChargeBlindCam..." << flush;
+    if (Finalize("MHCalibrationRelTimeCam"))     *fLog << inf << "MHCalibrationRelTimeCam..." << flush;
+    if (Finalize("MHCalibrationTestCam"))        *fLog << inf << "MHCalibrationChargeCam..." << flush;
+    if (Finalize("MHCalibrationTestTimeCam"))    *fLog << inf << "MHCalibrationChargeCam..." << flush;
+    *fLog << inf << "done." << endl;
+
+    return kTRUE;
+}
 
 // --------------------------------------------------------------------------
@@ -300 +322 @@
 
   hist->Finalize();
+  CopyHist(name);
   hist->ResetHists();
   hist->SetColor( fCalibPattern->GetPulserColor());
@@ -331 +354 @@
       MCalibrationChargeCam *cam    = (MCalibrationChargeCam*)fIntensCharge->GetCam();
       cam->SetPulserColor(fCalibPattern->GetPulserColor());
-      if (!cam->CopyHiLoConversionFactors(*oldcam))
-        return kFALSE;
+      if (!cam->MergeHiLoConversionFactors(*oldcam))
+          return kFALSE;
       *fLog << inf << "New MCalibrationChargeCam with name: " << cam->GetName() << endl;
     }
@@ -388 +411 @@
   return result;
 }
+
+// --------------------------------------------------------------------------
+//
+// Copies the histogram classes into the intensity cams
+//
+void MCalibColorSteer::CopyHist(const char* name)
+{
+  MHCalibrationCam *hcam = (MHCalibrationCam*)fParList->FindObject(name);
+  TString n(name);
+  if (n.Contains("ChargeCam"))
+    {
+      if (fIntensCharge)
+          fIntensCharge->AddHist((MHCalibrationCam*)hcam->Clone());
+    }
+  if (n.Contains("Blind"))
+    if (fIntensBlind)
+          fIntensBlind->AddHist((MHCalibrationCam*)hcam->Clone());
+
+  if (n.Contains("RelTime"))
+    if (fIntensRelTime)
+          fIntensRelTime->AddHist((MHCalibrationCam*)hcam->Clone());
+}
+
+// --------------------------------------------------------------------------