Changeset 7005 for trunk/MagicSoft/Mars/mcalib

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibCalcFromPast.cc (modified) (3 diffs)
• MCalibCalcFromPast.h (modified) (3 diffs)
• MCalibColorSteer.cc (modified) (6 diffs)
• MCalibColorSteer.h (modified) (2 diffs)
• MCalibrationChargeCam.cc (modified) (1 diff)
• MCalibrationChargeCam.h (modified) (1 diff)
• MCalibrationIntensityCam.cc (modified) (10 diffs)
• MCalibrationIntensityCam.h (modified) (5 diffs)
• MMcCalibrationCalc.cc (modified) (2 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;
+}

trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.h

@@ -41 +41 @@
   UInt_t fNumEvents;           //! Event counter only for calibration events
   UInt_t fNumCam;              //! Number of currently used Calibration Cam
-  
+
+  Bool_t fUpdateWithFFactorMethod; // Update the interlaced calib events with the full F-Factor method
+
   Int_t  PreProcess(MParList *pList);
   Int_t  Process();
@@ -48 +50 @@
   Bool_t ReInitialize();
   Bool_t Finalize(const char* name);
+
+  Int_t  ReadEnv(const TEnv &env, TString prefix, Bool_t print);
 
 public:
@@ -61 +65 @@
   void SetChargeCalc   ( MCalibrationChargeCalc  *c )  { fChargeCalc  = c; }
   void SetRelTimeCalc  ( MCalibrationRelTimeCalc *c )  { fRelTimeCalc = c; }
+
+  void SetUpdateWithFFactorMethod(const Bool_t b=kTRUE){ fUpdateWithFFactorMethod = b; }
   
   ClassDef(MCalibCalcFromPast, 1) // Task to steer the processing of interlace calibration events

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());
+}
+
+// --------------------------------------------------------------------------

trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.h

@@ -27 +27 @@
 {
 private:
-
-
   MCalibrationPattern             *fCalibPattern;    //!
   MRawRunHeader                   *fRunHeader;       //!
@@ -45 +43 @@
   MCalibrationCam::PulserColor_t   fColor;
   Float_t                          fStrength;
+
+  Bool_t                           fHistCopy;        // Decide whether MHCalibrationCams will get copied
   
   Int_t  PreProcess(MParList *pList);
   Int_t  Process();
+  Int_t  PostProcess();
   
   Bool_t ReInitialize();
   Bool_t Finalize(const char* name);
+
+  void    CopyHist(const char* name);
   TString GetNamePattern();
   
 public:
+    MCalibColorSteer(const char *name=NULL, const char *title=NULL);
 
-    MCalibColorSteer(const char *name=NULL, const char *title=NULL);
-    ~MCalibColorSteer() {}
+    void SetHistCopy(const Bool_t b=kTRUE) { fHistCopy = b; }
 
     ClassDef(MCalibColorSteer, 1) // Task to steer the processing of multiple calibration colours

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc

@@ -252 +252 @@
 // Copy High-gain vs. low-gain conversion factors from cam to this.
 //
-Bool_t MCalibrationChargeCam::CopyHiLoConversionFactors(const MCalibrationChargeCam &cam) const
+Bool_t MCalibrationChargeCam::MergeHiLoConversionFactors(const MCalibrationChargeCam &cam) const
 {
 

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.h

@@ -59 +59 @@
                                               const UInt_t sec=0, MBadPixelsCam *bad=NULL);
 
-  Bool_t CopyHiLoConversionFactors(const MCalibrationChargeCam &cam) const;
+  Bool_t MergeHiLoConversionFactors(const MCalibrationChargeCam &cam) const;
   
   // Prints

trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityCam.cc

@@ -30 +30 @@
 // Contains TOrdCollections for the following objects:
 // - fCams:  Array of classes derived from MCalibrationCam, one entry 
-//           per calibration camera result. Has to be created
+//           per calibration camera result.
+// - fHists: Array of classes derived from MHCalibrationPix, one entry
+//           per calibration camera result and area index
 //
 // See also: MCalibrationIntensityChargeCam, MCalibrationIntensityQECam,
@@ -39 +41 @@
 //           MCalibrationChargeBlindPix, MCalibrationChargePINDiode
 //
+// ClassVersion 2:
+//  + fHists
 //
 /////////////////////////////////////////////////////////////////////////////
@@ -45 +49 @@
 #include <TOrdCollection.h>
 
+#include "MLog.h"
+#include "MLogManip.h"
+
 #include "MGeomCam.h"
+#include "MHCalibrationCam.h"
 
 ClassImp(MCalibrationIntensityCam);
@@ -57 +65 @@
 // Set the following pointer to NULL:
 // - fCams
+// - fHists
 //
 MCalibrationIntensityCam::MCalibrationIntensityCam(const char *name, const char *title)
@@ -66 +75 @@
   fCams = new TOrdCollection;
   fCams->SetOwner();
-  
+
+  fHists = new TOrdCollection;
+  fHists->SetOwner();
 }
 
@@ -76 +87 @@
 MCalibrationIntensityCam::~MCalibrationIntensityCam()
 {
-  if (fCams)
     delete fCams;
+    delete fHists;
+}
+
+// --------------------------------------------------------------------------
+//
+// Add a new MHCalibrationCam to fHists
+//
+void MCalibrationIntensityCam::AddHist( const MHCalibrationCam *cam)
+{
+    const Int_t size = fHists->GetSize();
+    fHists->AddAt((TObject*)cam,size);
+
+    if (size != GetSize()-1)
+        *fLog << warn << "Histogram Cams and Calibration Cams size mismatch! " << endl;
 }
 
@@ -100 +124 @@
 void MCalibrationIntensityCam::Copy(TObject& object) const
 {
-  
-  MCalibrationIntensityCam &calib = (MCalibrationIntensityCam&)object;
-  
-  MParContainer::Copy(calib);
-  
-  calib.fOffsets = fOffsets;
-  calib.fSlopes  = fSlopes;
-  
-  const UInt_t n = GetSize();
-  if (n != 0)
+    MCalibrationIntensityCam &calib = (MCalibrationIntensityCam&)object;
+
+    MParContainer::Copy(calib);
+
+    calib.fOffsets = fOffsets;
+    calib.fSlopes  = fSlopes;
+
+    const UInt_t n = GetSize();
+    if (n != 0)
     {
-      calib.InitSize(n);
-      for (UInt_t i=0; i<n; i++)
-        GetCam(i)->Copy(*(calib.GetCam(i)));
+        calib.InitSize(n);
+        for (UInt_t i=0; i<n; i++)
+        {
+            GetCam(i)->Copy(*(calib.GetCam(i)));
+            GetHist(i)->Copy(*(calib.GetHist(i)));
+        }
     }
-  
 }
 
@@ -124 +149 @@
 void MCalibrationIntensityCam::Clear(Option_t *o)
 {
-
-  fCams->ForEach(MCalibrationCam, Clear)(); 
-
-  return;
+    fCams->ForEach(MCalibrationCam, Clear)();
+    fHists->ForEach(MHCalibrationCam, Clear)();
 }
 
@@ -136 +159 @@
 void MCalibrationIntensityCam::Print(Option_t *o) const
 {
-  fCams->ForEach(MCalibrationCam, Print)(o); 
+    fCams->ForEach(MCalibrationCam, Print)(o);
+    fHists->ForEach(MHCalibrationCam, Print)(o);
 }
 
@@ -424 +448 @@
   return size;
 }
+
+// --------------------------------------------------------------------------
+//
+// Get i-th histogram class 
+//
+MHCalibrationCam *MCalibrationIntensityCam::GetHist(Int_t i)
+{
+    return static_cast<MHCalibrationCam*>(i==-1 ? fHists->Last() : fHists->At(i));
+}
+
+// --------------------------------------------------------------------------
+//
+// Get i-th histogram class
+//
+const MHCalibrationCam *MCalibrationIntensityCam::GetHist(Int_t i) const
+{
+    return static_cast<MHCalibrationCam*>(i==-1 ? fHists->Last() : fHists->At(i));
+}
+
+// --------------------------------------------------------------------------
+//
+// Get histogram class with name 'name'
+//
+MHCalibrationCam *MCalibrationIntensityCam::GetHist(const char *name )
+{
+    return static_cast<MHCalibrationCam*>(fHists->FindObject(name));
+}
+
+// --------------------------------------------------------------------------
+//
+// Get histogram class with name 'name'
+//
+const MHCalibrationCam *MCalibrationIntensityCam::GetHist(const char *name ) const
+{
+    return static_cast<MHCalibrationCam*>(fHists->FindObject(name));
+}

trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityCam.h

@@ -18 +18 @@
 class MBadPixelsPix;
 class MGeomCam;
+class MHCalibrationCam;
+
 class MCalibrationIntensityCam : public MParContainer, public MCamEvent
 {
 private:
-  
-  MArrayD fOffsets;           //! Arrays of Higain-vs-LoGain fit result Offsets
-  MArrayD fSlopes;            //! Arrays of Higain-vs-LoGain fit result Slopes
+  MArrayD fOffsets;        //! Arrays of Higain-vs-LoGain fit result Offsets
+  MArrayD fSlopes;         //! Arrays of Higain-vs-LoGain fit result Slopes
 
 protected:  
-
-  TOrdCollection *fCams;        // Array of MCalibrationCams, one per pulse colour and intensity
+  TOrdCollection *fCams;   // Array of MCalibrationCams, one per pulse colour and intensity
+  TOrdCollection *fHists;  // Array of MHCalibrationCam's, containing the mean charges per area histograms
 
   virtual void Add(const UInt_t from, const UInt_t to);
@@ -33 +34 @@
   
 public:
-
   MCalibrationIntensityCam(const char *name=NULL, const char *title=NULL);
   ~MCalibrationIntensityCam();
@@ -40 +40 @@
   void  Copy(TObject& object) const;  
   
-  void AddToList( const char* name, const MGeomCam &geom );
+  void AddToList(const char* name, const MGeomCam &geom);
+  void AddHist(const MHCalibrationCam *cam);
 
   Int_t CountNumEntries(const MCalibrationCam::PulserColor_t col) const;  
@@ -69 +70 @@
   const MCalibrationCam *GetCam              ( const char *name ) const;
 
+        MHCalibrationCam *GetHist            ( Int_t i=-1);
+  const MHCalibrationCam *GetHist            ( Int_t i=-1) const;
+
+        MHCalibrationCam *GetHist            ( const char *name );
+  const MHCalibrationCam *GetHist            ( const char *name ) const;
+
         MCalibrationPix &operator[]          ( UInt_t i );
   const MCalibrationPix &operator[]          ( UInt_t i )  const;
@@ -91 +98 @@
                                                                 GetCam()->SetPulserColor(col);            }
 
-  ClassDef(MCalibrationIntensityCam, 1) // Base Container Intensity Calibration Results
+  ClassDef(MCalibrationIntensityCam, 2) // Base Container Intensity Calibration Results
 };
 

trunk/MagicSoft/Mars/mcalib/MMcCalibrationCalc.cc

@@ -242 +242 @@
 {
     //
-    // Exclude events with some saturated pixel
+    // Exclude events with some high-gain saturated pixel
     //
     if (fPar->GetNumSatPixelsHG()>0)
@@ -266 +266 @@
     //
  
-    const Float_t inner_photel = (Float_t) fMcEvt->GetPhotElfromShower() * innersize / size;
-    const Float_t outer_photel = (Float_t) fMcEvt->GetPhotElfromShower() - inner_photel;
-
-    const Float_t corrected_photel = inner_photel + outer_photel / fOuterPixelsLightCollection;
-
-
-    //    fHistADC2PhotEl->Fill(TMath::Log10(fMcEvt->GetPhotElfromShower()/size));
+    const Float_t corrected_photel = (Float_t) fMcEvt->GetPhotElfromShower() /
+      (fOuterPixelsLightCollection + innersize / size * (1. - fOuterPixelsLightCollection));
 
     fHistADC2PhotEl->Fill(TMath::Log10(corrected_photel/size));