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

Timestamp:

04/20/05 11:59:48 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc

@@ -51 +51 @@
 
 #include "MHCalibrationCam.h"
-#include "MCalibrationCam.h"
+#include "MCalibrationChargeCam.h"
 #include "MCalibrationBlindCam.h"
 
@@ -61 +61 @@
 #include "MBadPixelsIntensityCam.h"
 
+#include "MCalibrationChargeCam.h"
 #include "MCalibrationChargeCalc.h"
 #include "MCalibrationRelTimeCalc.h"
 
 #include "MRawRunHeader.h"
-#include "MRawEvtHeader.h"
 #include "MCalibrationPattern.h"
 
@@ -81 +81 @@
     : fCalibPattern(NULL), fGeom(NULL), fParList(NULL), 
       fIntensCharge(NULL), fIntensRelTime(NULL), fIntensBad(NULL),
-      fBad(NULL), fChargeCalc(NULL), fRelTimeCalc(NULL), fPattern(0)
+      fBad(NULL), fChargeCalc(NULL), fRelTimeCalc(NULL)
 {
 
@@ -109 +109 @@
     {
       *fLog << err << "MRawRunHeader not found... abort." << endl;
-      return kFALSE;
-    }
-
-  fEvtHeader = (MRawEvtHeader*)pList->FindObject("MRawEvtHeader");
-  if (!fEvtHeader)
-    {
-      *fLog << err << "MRawEvtHeader not found... abort." << endl;
       return kFALSE;
     }
@@ -228 +221 @@
       }
   }
+  
+  fColor = MCalibrationCam::kNONE;
+  fStrength = 0.;
       
   return kTRUE;
@@ -241 +237 @@
 {
 
-  const UInt_t pattern = fEvtHeader->GetPulserSlotPattern();
-
-  if (fPattern == 0)
-    {
-      fPattern = pattern;
+  const MCalibrationCam::PulserColor_t col = fCalibPattern->GetPulserColor();
+  const Float_t strength                   = fCalibPattern->GetPulserStrength();
+
+  if (fColor ==MCalibrationCam::kNONE)
+    {
+      fColor = col;
+      fStrength = strength;
       return kTRUE;
     }
 
-  if (pattern == 0 || pattern == fPattern)
+  const Float_t strdiff = TMath::Abs(fStrength-strength);
+
+  if (col  == MCalibrationCam::kNONE || (col == fColor && strdiff < 0.05))
     return kTRUE;
 
-  *fLog << inf << GetDescriptor() << " : old pattern: " << fPattern << flush;
-
-  fPattern = pattern;
-  
-  *fLog << " : new pattern: " << pattern << flush;
+  *fLog << inf << GetDescriptor() << " : Color - old=" << fColor << flush;
+  fColor = col;
+  *fLog << " / new=" << fColor << endl;
+
+  *fLog << inf << GetDescriptor() << " : Strength - old=" << fStrength << flush;
+  fStrength = strength;
+  *fLog << " / new=" << fStrength << endl;
 
   //
@@ -325 +327 @@
   if (fIntensCharge)
     {
+      MCalibrationChargeCam *oldcam = (MCalibrationChargeCam*)fIntensCharge->GetCam();
       fIntensCharge->AddToList(Form("MCalibrationChargeCam%s",namep.Data()),*fGeom);
-      MCalibrationCam *cam = fIntensCharge->GetCam();
+      MCalibrationChargeCam *cam    = (MCalibrationChargeCam*)fIntensCharge->GetCam();
       cam->SetPulserColor(fCalibPattern->GetPulserColor());
+      if (!cam->CopyHiLoConversionFactors(*oldcam))
+        return kFALSE;
       *fLog << inf << "New MCalibrationChargeCam with name: " << cam->GetName() << endl;
     }