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

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc

@@ -79 +79 @@
       fIntensCharge(NULL), fIntensBlind(NULL), fIntensRelTime(NULL), fIntensBad(NULL),
       fChargeCalc(NULL), fRelTimeCalc(NULL), fCalibrate(NULL),
-      fNumEvents(0), fNumCam(0)
+      fNumEvents(0), fNumCam(0), fUpdateWithFFactorMethod(kFALSE)
 {
 
@@ -249 +249 @@
     fRelTimeCalc->Finalize();
   if (fCalibrate)
-    fCalibrate->UpdateConversionFactors((MCalibrationChargeCam*)fIntensCharge->GetCam());
+      fCalibrate->UpdateConversionFactors(fUpdateWithFFactorMethod ? NULL :
+                                          (MCalibrationChargeCam*)fIntensCharge->GetCam());
 
   ReInitialize();
@@ -324 +325 @@
 Int_t MCalibCalcFromPast::PostProcess()
 {
-  *fLog << "Number of Calibration Cams: " << fNumCam << endl;
+  *fLog << inf << "Number of Calibration Cams: " << fNumCam << endl;
   return kTRUE;
   
 }
 
+// --------------------------------------------------------------------------
+//
+// Read the setup from a TEnv, eg:
+//   MCalibCalcFromPast.UpdateWithFFactorMethod: Off, On
+//
+Int_t MCalibCalcFromPast::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
+{
+    Bool_t rc = kFALSE;
+    if (IsEnvDefined(env, prefix, "UpdateWithFFactorMethod", print))
+    {
+        rc = kTRUE;
+        SetUpdateWithFFactorMethod(GetEnvValue(env, prefix, "UpdateWithFFactorMethod", fUpdateWithFFactorMethod));
+    }
+
+    return rc;
+}