Changeset 1552

Timestamp:

10/19/02 08:55:39 (22 years ago)

Author:

bigongia

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MCerPhotCalc.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+ 2002/10/19: Abelardo Moralejo
+
+   * manalysis/MCerPhotCalc.cc
+     -Added check of whether a pixel has all its FADC slices empty before
+      subtracting pedestal.
+
+
  2002/10/18: Thomas Bretz
 

trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc

@@ -188 +188 @@
 
         // Mean pedestal:
-        const Double_t mean = fEnableFix ? ped.GetMean()-0.5 : ped.GetMean();
+        Double_t mean = fEnableFix ? ped.GetMean()-0.5 : ped.GetMean();
 
         Byte_t *ptr = pixel.GetHiGainSamples();
 
         Float_t nphot = 0.;
-
-        for(Int_t i = 0; i<fWeight.GetSize(); i++)
+        Float_t nphoterr = 0.;
+
+        // Calculate pixel signal unless it has all FADC slices empty:
+
+        if (pixel.GetSumHiGainSamples()>0)
           {
-            BinSignal[i] =  (Float_t) ptr[i] - mean;
-            nphot       +=  BinSignal[i] * fWeight[i];
+            for(Int_t i = 0; i<fWeight.GetSize(); i++)
+              {
+                BinSignal[i] =  (Float_t) ptr[i] - mean;
+                nphot       +=  BinSignal[i] * fWeight[i];
+              }
+            nphoterr = ped.GetSigma()* fSumQuadWeights;
           }
-
-        Float_t nphoterr = ped.GetSigma()* fSumQuadWeights;
 
         fCerPhotEvt->AddPixel(pixid, nphot, nphoterr);