Changeset 4752 for trunk/MagicSoft/Mars/mcalib

Timestamp:

08/27/04 11:36:24 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrateData.cc (modified) (6 diffs)
• MCalibrateData.h (modified) (1 diff)

trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc

@@ -265 +265 @@
     }
 
+    // Sizes might have changed
+    if (fPedestalFlag && (Int_t)fPedestal->GetSize() != fSignals->GetSize())
+    {
+        *fLog << err << "Size mismatch of MPedestalCam and MCalibrationCam... abort." << endl;
+        return kFALSE;
+    }
+
     if(fCalibrationMode == kBlindPixel && !fQEs->IsBlindPixelMethodValid())
     {
@@ -315 +322 @@
 
     if (TestPedestalFlag(kRun))
-        if (!CalibratePedestal())
-          return kFALSE;
+        Calibrate(kFALSE, kTRUE);
 
     return kTRUE;
@@ -323 +329 @@
 // --------------------------------------------------------------------------
 //
-// Calibrate the Pedestal values
-// 
-Bool_t MCalibrateData::CalibratePedestal()
-{
-    //
-    // Fill MPedPhot container using the informations from
-    // MPedestalCam, MExtractedSignalCam and MCalibrationCam
-    //
-    const Float_t slices     = fSignals->GetNumUsedHiGainFADCSlices();
-    const Float_t sqrtslices = TMath::Sqrt(slices);
-
-    // is pixid equal to pixidx ?
-    if ((Int_t)fPedestal->GetSize() != fSignals->GetSize())
-    {
-        *fLog << err << "Sizes of MPedestalCam and MCalibrationCam are different" << endl;
-        return kFALSE;
-    }
-
-    const Int_t n = fPedestal->GetSize();
-    for (Int_t pixid=0; pixid<n; pixid++)
-    {
-        const MPedestalPix &ped = (*fPedestal)[pixid];
-
-        // pedestals/(used FADC slices)   in [ADC] counts
-        const Float_t pedes  = ped.GetPedestal()    * slices;
-        const Float_t pedrms = ped.GetPedestalRms() * sqrtslices;
-
-        //
-        // get phe/ADC conversion factor
-        //
-        Float_t hiloconv;
-        Float_t hiloconverr;
-        Float_t calibConv;
-        Float_t calibConvVar;
-        Float_t calibFFactor;
-        if (!GetConversionFactor(pixid, hiloconv, hiloconverr,
-                                 calibConv, calibConvVar, calibFFactor))
-            continue;
-
-        //
-        // pedestals/(used FADC slices)   in [number of photons]
-        //
-        const Float_t pedphot    = pedes  * calibConv;
-        const Float_t pedphotrms = pedrms * calibConv;
-
-        (*fPedPhot)[pixid].Set(pedphot, pedphotrms);
-    }
-
-    fPedPhot->SetReadyToSave();
-
-    return kTRUE;
-}
-
-// --------------------------------------------------------------------------
-//
 // Get conversion factor and its error from MCalibrationCam
 //
 Bool_t MCalibrateData::GetConversionFactor(UInt_t pixidx, Float_t &hiloconv, Float_t &hiloconverr,
-                                           Float_t &calibConv, Float_t &calibConvVar, Float_t &calibFFactor)
+                                           Float_t &calibConv, Float_t &calibConvVar,
+                                           Float_t &calibFFactor) const
 {
     //
@@ -486 +438 @@
 }
 
-void MCalibrateData::CalibrateData()
-{
-    const UInt_t npix = fSignals->GetSize();
+void MCalibrateData::Calibrate(Bool_t data, Bool_t pedestal) const
+{
+    if (!data && !pedestal)
+        return;
+
+    const UInt_t  npix       = fSignals->GetSize();
+    const Float_t slices     = fSignals->GetNumUsedHiGainFADCSlices();
+    const Float_t sqrtslices = TMath::Sqrt(slices);
 
     Float_t hiloconv;
     Float_t hiloconverr;
-    Float_t calibrationConversionFactor;
-    Float_t calibrationConversionFactorErr;
+    Float_t calibConv;
+    Float_t calibConvErr;
     Float_t calibFFactor;
 
@@ -499 +456 @@
     {
         if (!GetConversionFactor(pixidx, hiloconv, hiloconverr,
-                                 calibrationConversionFactor, calibrationConversionFactorErr, calibFFactor))
+                                 calibConv, calibConvErr, calibFFactor))
             continue;
 
-        const MExtractedSignalPix &sig = (*fSignals)[pixidx];
-
-        Float_t signal = 0;
-        Float_t signalErr = 0.;
-
-        if (sig.IsLoGainUsed())
-        {
-            signal    = sig.GetExtractedSignalLoGain()*hiloconv;
-            signalErr = signal*hiloconverr;
-        }
-        else
-        {
-            if (sig.GetExtractedSignalHiGain() <= 9999.)
-                signal = sig.GetExtractedSignalHiGain();
-        }
-
-        const Float_t nphot    = signal*calibrationConversionFactor;
-        const Float_t nphotErr = calibFFactor*TMath::Sqrt(TMath::Abs(nphot));
-
-        //
-        // The following part is the commented first version of the error calculation
-        // Contact Markus Gaug for questions (or wait for the next documentation update...)
-        //
-        /*
-         nphotErr = signal    > 0 ? signalErr*signalErr / (signal * signal)  : 0.
-         + calibConv > 0 ? calibConvVar  / (calibConv * calibConv ) : 0.;
-         nphotErr  = TMath::Sqrt(nphotErr) * nphot;
-         */
-
-        MCerPhotPix *cpix = fCerPhotEvt->AddPixel(pixidx, nphot, nphotErr);
-
-        if (sig.GetNumHiGainSaturated() > 0)
-            cpix->SetPixelHGSaturated();
-
-        if (sig.GetNumLoGainSaturated() > 0)
-            cpix->SetPixelSaturated();
-    }
-
-    fCerPhotEvt->FixSize();
-    fCerPhotEvt->SetReadyToSave();
+        if (data)
+        {
+            const MExtractedSignalPix &sig = (*fSignals)[pixidx];
+
+            Float_t signal = 0;
+            Float_t signalErr = 0.;
+
+            if (sig.IsLoGainUsed())
+            {
+                signal    = sig.GetExtractedSignalLoGain()*hiloconv;
+                signalErr = signal*hiloconverr;
+            }
+            else
+            {
+                if (sig.GetExtractedSignalHiGain() <= 9999.)
+                    signal = sig.GetExtractedSignalHiGain();
+            }
+
+            const Float_t nphot    = signal*calibConv;
+            const Float_t nphotErr = calibFFactor*TMath::Sqrt(TMath::Abs(nphot));
+
+            //
+            // The following part is the commented first version of the error calculation
+            // Contact Markus Gaug for questions (or wait for the next documentation update...)
+            //
+            /*
+             nphotErr = signal    > 0 ? signalErr*signalErr / (signal * signal)  : 0.
+             + calibConv > 0 ? calibConvVar  / (calibConv * calibConv ) : 0.;
+             nphotErr  = TMath::Sqrt(nphotErr) * nphot;
+             */
+
+            MCerPhotPix *cpix = fCerPhotEvt->AddPixel(pixidx, nphot, nphotErr);
+
+            if (sig.GetNumHiGainSaturated() > 0)
+                cpix->SetPixelHGSaturated();
+
+            if (sig.GetNumLoGainSaturated() > 0)
+                cpix->SetPixelSaturated();
+        }
+        if (pedestal)
+        {
+            const MPedestalPix &ped = (*fPedestal)[pixidx];
+
+            // pedestals/(used FADC slices)   in [ADC] counts
+            const Float_t pedes  = ped.GetPedestal()    * slices;
+            const Float_t pedrms = ped.GetPedestalRms() * sqrtslices;
+
+            //
+            // pedestals/(used FADC slices)   in [number of photons]
+            //
+            const Float_t pedphot    = pedes  * calibConv;
+            const Float_t pedphotrms = pedrms * calibConv;
+
+            (*fPedPhot)[pixidx].Set(pedphot, pedphotrms);
+        }
+    }
+
+    if (pedestal)
+        fPedPhot->SetReadyToSave();
+
+    if (data)
+    {
+        fCerPhotEvt->FixSize();
+        fCerPhotEvt->SetReadyToSave();
+    }
 }
 
@@ -563 +545 @@
      */
 
-    if (fCalibrationMode!=kSkip)
-        CalibrateData();
-
-    if (TestPedestalFlag(kEvent))
-        if (!CalibratePedestal())
-            return kFALSE;
-
-  return kTRUE;
+    Calibrate(fCalibrationMode!=kSkip, TestPedestalFlag(kEvent));
+    return kTRUE;
 }
 

trunk/MagicSoft/Mars/mcalib/MCalibrateData.h

@@ -53 +53 @@
   TString  fNamePedPhotContainer;           // name of fPedPhot
 
-  Bool_t CalibratePedestal();
-  void   CalibrateData();
+  void Calibrate(Bool_t data, Bool_t pedestal) const;
   
-  Bool_t GetConversionFactor(UInt_t, Float_t &, Float_t &, Float_t &, Float_t &, Float_t &);
+  Bool_t GetConversionFactor(UInt_t, Float_t &, Float_t &, Float_t &, Float_t &, Float_t &) const;
   
   Int_t  PreProcess(MParList *pList);