Changeset 7122 for trunk/MagicSoft/Mars/mcalib

Timestamp:

06/01/05 18:13:13 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibColorSet.cc (modified) (3 diffs)
• MCalibrateData.cc (modified) (6 diffs)
• MCalibrateData.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibColorSet.cc

@@ -157 +157 @@
     }
   
-  if (header->IsMonteCarloRun())
-    return kTRUE;
-
-  if (header->GetRunNumber() > gkFirstRunWithFinalBits)
-    return kTRUE;
-
   //
   // Consider the case that a pedestal run is interleaved in the calibration run sequence ... prepare
@@ -176 +170 @@
     }
  
+  //
+  // Check if the color was set explicitly from outside
+  //
   if (fIsExplicitColor)
     {
@@ -182 +179 @@
       return kTRUE;
     }
+
+  //
+  // 1) Do nothing if this is a MC run. Correct settings of all flags is assumed
+  // 2) Skip the rest if the run already contains the correct color information
+  //
+  if (header->IsMonteCarloRun() || header->GetRunNumber()>gkFirstRunWithFinalBits)
+      return kTRUE;
 
   const Int_t num = header->GetRunNumber();

trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc

@@ -107 +107 @@
 
 #include "MGeomCam.h"
+#include "MRawRunHeader.h"
 
 #include "MPedestalCam.h"
@@ -153 +154 @@
     : fGeomCam(NULL),   fBadPixels(NULL), fCalibrations(NULL), 
       fQEs(NULL), fSignals(NULL), fCerPhotEvt(NULL), fCalibConstCam(NULL),
-      fPedestalFlag(kNo), fSignalType(kPhot), fRenormFactor(1.)
+      fPedestalFlag(kNo), fSignalType(kPhot), fRenormFactor(1.), fScaleFactor(1.)
 {
 
@@ -318 +319 @@
 Bool_t MCalibrateData::ReInit(MParList *pList)
 {
+    MRawRunHeader *header = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
+    if (!header)
+    {
+        *fLog << err << "MRawRunHeader not found... abort." << endl;
+        return kFALSE;
+    }
+
     fGeomCam = (MGeomCam*)pList->FindObject(AddSerialNumber("MGeomCam"));
     if (!fGeomCam)
@@ -399 +407 @@
       break;
     }
-    
+
+    if (header->IsMonteCarloRun())
+    {
+        *fLog << "Additional scale factor: 1 (MonteCarloRun)" << endl;
+        fScaleFactor = 1;
+    }
+    else
+        *fLog << "Additional scale factor: " << fScaleFactor << endl;
+
     const Int_t npixels = fGeomCam->GetNumPixels();
 
@@ -603 +619 @@
           }
 
-        calibConv    *= fRenormFactor * calibUpdate;
-        calibFFactor *= TMath::Sqrt(fRenormFactor);
+        calibConv    *= fRenormFactor*fScaleFactor * calibUpdate;
+        calibFFactor *= TMath::Sqrt(fRenormFactor*fScaleFactor);
 
         fHiLoConv     [pixidx] = hiloconv;
@@ -861 +877 @@
     }
 
+    if (IsEnvDefined(env, prefix, "ScaleFactor", print))
+    {
+        fScaleFactor = GetEnvValue(env, prefix, "ScaleFactor", fScaleFactor);
+        rc = kTRUE;
+    }
+
     return rc;
 }

trunk/MagicSoft/Mars/mcalib/MCalibrateData.h

@@ -71 +71 @@
   
   Float_t  fRenormFactor;                // Possible renormalization factor for signals (-> phes)
+  Float_t  fScaleFactor;                 // Possible scale factor for signals
   
   TList   fNamesPedestal;                // Names of input and output pedestal conatainer
@@ -110 +111 @@
   void   SetCalibConvMinLimit( const Float_t f=gkCalibConvMinLimit ) { fCalibConvMinLimit = f; }
   void   SetCalibConvMaxLimit( const Float_t f=gkCalibConvMaxLimit ) { fCalibConvMaxLimit = f; }
-    
+
+  void   SetScaleFactor(const Float_t f=1) { fScaleFactor=1; }
+
   Bool_t UpdateConversionFactors( const MCalibrationChargeCam *updatecam=NULL);