Changeset 3048 for trunk/MagicSoft

Timestamp:

02/06/04 19:43:15 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/manalysis/MPedestalCam.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/manalysis/MPedestalCam.cc

@@ -380 +380 @@
 {
 
+  if (GetSize() <= idx)
+    return kFALSE;
+
   if (!(*this)[idx].IsValid())
     return kFALSE;
@@ -392 +395 @@
   const Float_t rmserr   = rms/TMath::Sqrt((Float_t)fTotalEntries*2.);
 
-  const MHPedestalPixel &hist = (*this)(idx);
-
-  const Float_t mean     = hist.GetChargeMean();
-  const Float_t meanerr  = hist.GetChargeMeanErr();
-  const Float_t sigma    = hist.GetChargeSigma() ;
-  const Float_t sigmaerr = hist.GetChargeSigmaErr();
-  const Float_t prob     = hist.GetChargeProb();
+  Float_t mean     = 0.;
+  Float_t meanerr  = 0.;
+  Float_t sigma    = 0.;
+  Float_t sigmaerr = 0.;
+  Float_t prob     = 0.;
+  
+  if (type > 3) 
+    if (GetHistSize() != 0)
+      {
+        if (!(*this)(idx).IsFitOK())
+          return kFALSE;
+
+        const MHPedestalPixel &hist = (*this)(idx);
+        mean     = hist.GetChargeMean();
+        meanerr  = hist.GetChargeMeanErr();
+        sigma    = hist.GetChargeSigma() ;
+        sigmaerr = hist.GetChargeSigmaErr();
+        prob     = hist.GetChargeProb();
+      }
+    else
+      return kFALSE;
 
   switch (type)