Changeset 3353 for trunk/MagicSoft/Mars/mcalib

Timestamp:

02/28/04 04:37:49 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -352 +352 @@
   Float_t avouterprms = 0;
   Float_t avouternum  = 0;
+
   for (Int_t pixid=0; pixid<fPedestals->GetSize(); pixid++)
     {
 
       MCalibrationChargePix &pix = (*fCam)[pixid];
-
-      //
-      // Check if the pixel has been excluded from the fits
-      //
-      if (pix.IsExcluded())
-        continue;
 
       //
@@ -370 +365 @@
       const Float_t num    = TMath::Sqrt((Float_t)fPedestals->GetTotalEntries());
 
+      if (ped == -1.) 
+          pix.SetExcluded();
+      
+      //
+      // Check if the pixel has been excluded from the fits
+      //
+      if (pix.IsExcluded())
+        continue;
+
       if (fGeom->GetPixRatio(pixid) == 1.)
       {
           avinnerped  += ped;
           avinnerprms += prms;
-          avinnernum  += num;
+          avinnernum++;
       }
       else
@@ -380 +384 @@
           avouterped  += ped;
           avouterprms += prms;
-          avouternum  += num;
+          avouternum++;
       }
       //