Changeset 7876 for trunk/MagicSoft/Mars/manalysis

Timestamp:

08/16/06 16:11:32 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc

@@ -378 +378 @@
 // Fill the MCerPhotPed object
 //
-// This has to be done on an event by event basis because the (calibrated) pedestal 
-// fluctuations depend on whether, for each pixel, we are using the high gain or the 
-// low gain branch.
+// This has to be done on an event by event basis because the (calibrated)
+// pedestal fluctuations depend on whether, for each pixel, we are using
+// the high gain or the low gain branch.
 //
 Int_t MMcCalibrationUpdate::Process()
@@ -390 +390 @@
         MExtractedSignalPix &sigpix = (*fSignalCam)[i];
 
+        const Bool_t uselo = sigpix.IsHiGainSaturated();
+
         //
         // ped mean and rms per pixel, in ADC counts, according to signal 
         // calculation (hi or low gain and number of integrated slices):
-        //
-        const Float_t pedestmean = sigpix.IsLoGainUsed()? 
+        //
+        const Float_t pedestmean = uselo ?
           fSignalCam->GetNumUsedLoGainFADCSlices()*fHeaderFadc->GetPedestal(i) : 
           fSignalCam->GetNumUsedHiGainFADCSlices()*fHeaderFadc->GetPedestal(i);
@@ -405 +407 @@
         // counts for the RMS per slice:
         //
-        const Double_t used = (Double_t)(sigpix.IsLoGainUsed() ?
-                                         fSignalCam->GetNumUsedLoGainFADCSlices() :
-                                         fSignalCam->GetNumUsedHiGainFADCSlices());
-
-        const Float_t rms0 = sigpix.IsLoGainUsed() ?
+        const Double_t used = uselo ?
+            fSignalCam->GetNumUsedLoGainFADCSlices() :
+            fSignalCam->GetNumUsedHiGainFADCSlices();
+
+        const Float_t rms0 = uselo ?
             fHeaderFadc->GetPedestalRmsLow(i) :
             fHeaderFadc->GetPedestalRmsHigh(i);
@@ -419 +421 @@
         // in number of photons:
         //
-        MPedPhotPix &pedpix = (*fPedPhotCam)[i];
-
-        MCalibrationChargePix &calpix = (MCalibrationChargePix&)(*fCalCam)[i];
-        MCalibrationQEPix &qepix = (MCalibrationQEPix&)(*fQECam)[i];
-
-        Float_t qe       = qepix.GetAverageQE();
-
-
-        Float_t conv = (fSignalType == MCalibrateData::kPhot? 
-          calpix.GetMeanConvFADC2Phe() / qe  :
-          calpix.GetMeanConvFADC2Phe());
-
-        Float_t hi2lo    = calpix.GetConversionHiLo();
-
-        if (sigpix.IsLoGainUsed())
-            pedpix.Set(conv*hi2lo*pedestmean, conv*hi2lo*pedestrms);
-        else
-            pedpix.Set(conv*pedestmean, conv*pedestrms);
+        const MCalibrationChargePix &calpix = (MCalibrationChargePix&)(*fCalCam)[i];
+        const MCalibrationQEPix     &qepix  = (MCalibrationQEPix&)(*fQECam)[i];
+
+        const Float_t conv = fSignalType == MCalibrateData::kPhot ?
+            calpix.GetMeanConvFADC2Phe() / qepix.GetAverageQE() :
+            calpix.GetMeanConvFADC2Phe();
+
+        const Float_t hi2lo = uselo ? calpix.GetConversionHiLo() : 1;
+
+        (*fPedPhotCam)[i].Set(conv*hi2lo*pedestmean, conv*hi2lo*pedestrms);
 
     }