Changeset 2325 for trunk/MagicSoft/Mars/manalysis

Timestamp:

09/07/03 17:37:19 (22 years ago)

Author:

moralejo

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc

@@ -151 +151 @@
         return kTRUE;
 
-    ScalePedestals();
-
     MMcRunHeader *mcrunheader = (MMcRunHeader*)pList->FindObject("MMcRunHeader");
     if (!mcrunheader)
@@ -161 +159 @@
 
     fEnableFix = kFALSE;
+
     if (mcrunheader->GetCamVersion() <= 40)
         fEnableFix = kTRUE;
 
+    ScalePedestals();
+
     return kTRUE;
 }
@@ -175 +176 @@
         MPedestalPix &ped = (*fPedestals)[idx];
 
+        // This converts the pedestal info contained in ped  from the pedestal 
+        // of each FADC slice to the pedesal of the pixel signal (depends on
+        // how many FADC slices are added up).
+
         const Double_t offset = fEnableFix ? ped.GetPedestal()-0.5 : ped.GetPedestal();
-        ped.Set(offset, ped.GetPedestalRms()*sqrt(fSumQuadWeights));
+
+        ped.Set(offset*fSumQuadWeights*fSumQuadWeights,
+                ped.GetPedestalRms()*fSumQuadWeights);
     }