Changeset 2251 for trunk/MagicSoft/Mars/manalysis

Timestamp:

06/30/03 10:55:30 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MCerPhotAnal2.h (added)
• MCerPhotCalc.cc (modified) (3 diffs)
• MCerPhotCalc.h (modified) (1 diff)
• MPedestalSum.cc (added)

trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc

@@ -117 +117 @@
 
     // Calculate quadratic sum of weights:
-    fSumWeights = 0;
+    Doubla_t sum = 0;
+
     fSumQuadWeights = 0;
     for (Int_t i=0; i<fWeight.GetSize(); i++)
-    {
-        fSumWeights += fWeight[i];
+        sum += fWeight[i];
+
+    for (Int_t i=0; i<fWeight.GetSize(); i++)
+    {
+        fWeight[i] /= sum;
         fSumQuadWeights += fWeight[i]*fWeight[i];
     }
-
-    fSumQuadWeights = sqrt(fSumQuadWeights);
 
     return kTRUE;
@@ -180 +182 @@
 
         const Double_t offset = fEnableFix ? ped.GetPedestal()-0.5 : ped.GetPedestal();
-        ped.Set(offset*fSumWeights, ped.GetPedestalRms()*fSumQuadWeights);
+        ped.Set(offset, ped.GetPedestalRms()*sqrt(fSumQuadWeights));
     }
 
@@ -195 +197 @@
     //fCerPhotEvt->InitSize(fRawEvt->GetNumPixels());
 
-    if (fIsMcFile)
-        ScalePedestals();
+//    if (fIsMcFile)
+//        ScalePedestals();
 
     MRawEvtPixelIter pixel(fRawEvt);

trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.h

@@ -34 +34 @@
 
     TArrayF         fWeight;  // Weights for adding up the ADC slices
-    Float_t         fSumWeights;
     Float_t         fSumQuadWeights;