Changeset 5134

Timestamp:

09/25/04 12:53:23 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationRelTimeCalc.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -39 +39 @@
    * mcalib/MCalibrationQEPix.cc
      - changed transmission probability of plexiglass from 0.96 to 0.92
+
+   * mcalib/MCalibrationChargeCalc.[h,cc]
+   * mcalib/MCalibrationRelTimeCalc.[h,cc]
+     - added a CallPostProcess() function in order to avoid setting 
+       back the fPreProcessed flag which otherwise impedes the linearity
+       calibration to be performed
 
 

trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc

@@ -58 +58 @@
 #include "MParList.h"
 
+#include "MStatusDisplay.h"
+
 #include "MGeomCam.h"
 #include "MGeomPix.h"
@@ -199 +201 @@
   return kTRUE;
 }
+
+// -----------------------------------------------------------------------
+//
+// Analogue to the MTask::CallPostProcess, but without the manipulation 
+// of the bit fIsPreProcessed. Needed in order to call PostProcess multiple 
+// times in the intensity calibration.
+//
+Int_t MCalibrationRelTimeCalc::CallPostProcess()
+{
+
+  //  if (!fIsPreprocessed)
+  //    return kTRUE;
+
+  *fLog << all << fName << "... " << flush;
+  if (fDisplay)
+    fDisplay->SetStatusLine2(*this);
+  
+  return PostProcess();
+}
+
 
 // -----------------------------------------------------------------------