Changeset 8917

Timestamp:

06/03/08 12:29:27 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mbase/MStatusDisplay.cc (modified) (2 diffs)
• mbase/MStatusDisplay.h (modified) (1 diff)
• mcalib/MCalibrationChargePix.cc (modified) (6 diffs)
• mcalib/MCalibrationChargePix.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -68 +68 @@
 #include <TEnv.h>                 // TEnv
 #include <TLine.h>                // TLine
+#include <TMath.h>
 #include <TText.h>                // TText
 #include <TFile.h>                // gFile
@@ -685 +686 @@
 //
 MStatusDisplay::MStatusDisplay(Int_t w, Int_t h, Long_t t)
-: TGMainFrame(NULL, 1, 1), fName("MStatusDisplay"), fLog(&gLog), fBar(NULL), fTab(NULL), fTimer(this, t, kTRUE), fStatus(kLoopNone), fLogIdx(-1), fLogTimer(this, 250, kTRUE), fLogBox(NULL), fIsLocked(0)
+: TGMainFrame((TGWindow*)((gClient?gClient:new TGClient),NULL), 1, 1), fName("MStatusDisplay"), fLog(&gLog), fBar(NULL), fTab(NULL), fTimer(this, t, kTRUE), fStatus(kLoopNone), fLogIdx(-1), fLogTimer(this, 250, kTRUE), fLogBox(NULL), fIsLocked(0)
 {
     // p==NULL means: Take gClient->GetRoot() if not in batch mode

trunk/MagicSoft/Mars/mbase/MStatusDisplay.h

@@ -225 +225 @@
      Int_t  SaveAs(TString name)        { return SaveAs(-1, name); }
      Int_t  PrintPS() { return PrintPS(-1); }
+     
+     void SaveAs(const char *c, const Option_t *o) const { TGObject::SaveAs(c, o); }
 
      Int_t  SaveAsPS(Int_t num, TString name="",  const TString addon="") { return SaveAsVGF(num, name, addon, "ps"); }

trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc

@@ -18 +18 @@
 !   Author(s): Markus Gaug   02/2004 <mailto:markus@ifae.es>
 !
-!   Copyright: MAGIC Software Development, 2000-2004
+!   Copyright: MAGIC Software Development, 2000-2008
 !
 \* ======================================================================== */
@@ -65 +65 @@
 //  FADC slices extraction results, but can be retrieved converted to High-Gain amplifications 
 //  by calls to: GetConvertedMean() or GetConvertedSigma()
+//
+// Inline Functions:
+// -----------------
+//
+// GetPedRms(): Get the pedestals RMS: Test bit kHiGainSaturation:
+//  If yes, return square root of fLoGainPedRmsSquare (if greater than 0,
+//  otherwise -1.), If no,  return fPedRms
+//
+// GetConvertedMean(): Get the Low Gain Mean Charge converted to High Gain
+//  amplification: Returns fLoGainMean multiplied with fConversionHiLo if
+//  IsHiGainSaturation(), else return fHiGainMean
+//
+// GetConvertedSigma(): Get the Low Gain Sigma converted to High Gain
+//  amplification: Returns fLoGainSigma multiplied with fConversionHiLo
+//  if IsHiGainSaturation() else return fHiGainSigma
+//
+// GetConvertedRSigmaSquare(): Get the reduced Sigma Square:
+//  If fRSigmaSquare is smaller than 0 (i.e. has not yet been set), return -1.
+//  Test bit kHiGainSaturation:
+//  If yes, return fRSigmaSquare, multiplied with fConversionHiLo^2,
+//  If no , return fRSigmaSquare
+//
+// GetPheFFactorMethodRelVar(): Get the relative variance on the number of
+//  photo-electrons (F-Factor Method): If fPheFFactorMethodVar is smaller
+//  than 0 (i.e. has not yet been set), return -1. If fPheFFactorMethod
+//  is 0, return -1. Else returns fPheFFactorMethodVar / fPheFFactorMethod^2
+//
+// GetMeanConvFADC2PheErr(): Get the error on the mean conversion factor
+//  (FFactor  Method): If fMeanConvFADC2PheVar is smaller than 0 (i.e. has
+//  not yet been set), return -1. Else returns the square root of
+//  fMeanConvFADC2PheVar
+//
 // 
 // See also: MCalibrationChargeCam, MCalibrationChargeCalc,
@@ -88 +120 @@
 /////////////////////////////////////////////////////////////////////////////
 #include "MCalibrationChargePix.h"
+
+#include <TMath.h>
 
 #include "MLog.h"
@@ -264 +298 @@
 }
 
-
-// Inline Functions:
-// -----------------
-//
-// GetConversionHiLoErr:
-//   Get the conversion Error Hi-Gain to Low-Gain:
-//   If fConversionHiLoVar is smaller than 0 (i.e. has not yet
-//   been set), return -1.
+// --------------------------------------------------------------------------
+//
+//  Get the conversion Error Hi-Gain to Low-Gain:
+//  If fConversionHiLoVar is smaller than 0 (i.e. has not yet
+//  been set), return -1.
 //  
-// GetPedRms(): Get the pedestals RMS: Test bit kHiGainSaturation:
-//  If yes, return square root of fLoGainPedRmsSquare (if greater than 0,
-//  otherwise -1.), If no,  return fPedRms
-//
-// GetConvertedMean(): Get the Low Gain Mean Charge converted to High Gain
-//  amplification: Returns fLoGainMean multiplied with fConversionHiLo if
-//  IsHiGainSaturation(), else return fHiGainMean
-//
-// GetConvertedMeanErr(): Get the Error of the converted Low Gain Mean:
-//  Returns -1 if the variable fLoGainMean or fLoGainMeanVar are smaller than 0.
-//  Returns the square root of the quadratic sum of the relative variances of
-//  the fLoGainMean and fConversionHiLo, mulitplied with GetConvertedMean()
-//  in case of HiGain Saturation,
-//  else return GetMeanErr()
-//
-// GetConvertedSigma(): Get the Low Gain Sigma converted to High Gain
-//  amplification: Returns fLoGainSigma multiplied with fConversionHiLo
-//  if IsHiGainSaturation() else return fHiGainSigma
-//
-// GetConvertedSigmaErr(): Get the Error of the converted Sigma:
-//  Returns -1 if the variable fLoGainSigma or fLoGainSigmaVar are smaller than 0.
-//  if IsHiGainSaturatio()
-//  returns the square root of the quadratic sum of the relative variances of
-//  the fLoGainSigma and fConversionHiLo, mulitplied with GetConvertedSigma()
-//  else returns GetSigmaErr()
-//
-// GetConvertedRSigma(): Get the converted reduced Sigma:
-//  If fRSigmaSquare is smaller than 0 (i.e. has not yet been set), return -1.
-//  Test bit kHiGainSaturation:
-//  If yes, return square root of fRSigmaSquare, multiplied with fConversionHiLo,
-//  If no , return square root of fRSigmaSquare
-//
-// GetRSigma(): Get the reduced Sigma:
-//  If fRSigmaSquare is smaller than 0 (i.e. has not yet been set), return -1.
-//
-// GetConvertedRSigmaSquare(): Get the reduced Sigma Square:
-//  If fRSigmaSquare is smaller than 0 (i.e. has not yet been set), return -1.
-//  Test bit kHiGainSaturation:
-//  If yes, return fRSigmaSquare, multiplied with fConversionHiLo^2,
-//  If no , return fRSigmaSquare
+Float_t MCalibrationChargePix::GetConversionHiLoErr() const
+{
+    return fConversionHiLoVar<0 ? -1 : TMath::Sqrt(fConversionHiLoVar);
+}
+
+// --------------------------------------------------------------------------
+//
+// Get the Error of the converted Low Gain Mean: Returns -1 if the
+// variable fLoGainMean or fLoGainMeanVar are smaller than 0. Returns the
+// square root of the quadratic sum of the relative variances of the
+// fLoGainMean and fConversionHiLo, mulitplied with GetConvertedMean() in
+// case of HiGain Saturation, else return GetMeanErr()
+//
+Float_t MCalibrationChargePix::GetConvertedMeanErr() const
+{
+    if (!IsHiGainSaturation())
+        return GetMeanErr();
+
+    const Float_t logainrelvar = GetLoGainMeanRelVar();
+    return logainrelvar<0 ? -1 : TMath::Sqrt(logainrelvar + GetConversionHiLoRelVar()) * GetConvertedMean();
+}
+
+// --------------------------------------------------------------------------
+//
+// Get the Error of the converted Sigma: Returns -1 if the variable
+// fLoGainSigma or fLoGainSigmaVar are smaller than 0. if
+// IsHiGainSaturatio() returns the square root of the quadratic sum of the
+// relative variances of the fLoGainSigma and fConversionHiLo, mulitplied
+// with GetConvertedSigma() else returns GetSigmaErr()
+//
+Float_t MCalibrationChargePix::GetConvertedSigmaErr() const
+{
+    if (!IsHiGainSaturation())
+        return GetSigmaErr();
+
+    if (fLoGainSigmaVar<0 || fLoGainSigma<0)
+        return -1.;
+
+    const Float_t sigmaRelVar = fLoGainSigmaVar/(fLoGainSigma*fLoGainSigma);
+    return TMath::Sqrt(sigmaRelVar+GetConversionHiLoRelVar()) * GetConvertedSigma();
+}
+
+// --------------------------------------------------------------------------
+//
+// Get the converted reduced Sigma: If fRSigmaSquare is smaller than 0
+// (i.e. has not yet been set), return -1. Test bit kHiGainSaturation: If
+// yes, return square root of fRSigmaSquare, multiplied with
+// fConversionHiLo, If no , return square root of fRSigmaSquare
+//
+Float_t MCalibrationChargePix::GetConvertedRSigma() const
+{
+    if (fRSigmaSquare < 0)
+        return -1;
+
+    const Float_t rsigma = TMath::Sqrt(fRSigmaSquare);
+    return IsHiGainSaturation() ? rsigma*fConversionHiLo : rsigma ;
+}
+
+// --------------------------------------------------------------------------
+//
+Float_t MCalibrationChargePix::GetMeanConvFADC2PheErr() const
+{
+    return fMeanConvFADC2PheStatVar<0 ? -1 : TMath::Sqrt(fMeanConvFADC2PheStatVar);
+}
+
+// --------------------------------------------------------------------------
+//
+Float_t MCalibrationChargePix::GetMeanConvFADC2PheSystErr() const
+{
+    return fMeanConvFADC2PheSystVar<0 ? -1 : TMath::Sqrt(fMeanConvFADC2PheSystVar);
+}
+
+// --------------------------------------------------------------------------
+//
+Float_t MCalibrationChargePix::GetMeanConvFADC2PheTotErr() const
+{
+    if (fMeanConvFADC2PheSystVar<0 || fMeanConvFADC2PheStatVar<0)
+        return -1.;
+
+    return TMath::Sqrt(fMeanConvFADC2PheSystVar+fMeanConvFADC2PheStatVar);
+}
+
+// --------------------------------------------------------------------------
+//
+//  Get the error on the mean total F-Factor of the signal readout
+//  (F-Factor Method): If fMeanFFactorFADC2PhotVar is smaller than 0
+//  (i.e. has not yet been set), return -1. Else returns the square
+//  root of fMeanFFactorFADC2PhotVar
+//
+Float_t MCalibrationChargePix::GetMeanFFactorFADC2PhotErr() const
+{
+    return fMeanFFactorFADC2PhotVar<0 ? -1. : TMath::Sqrt(fMeanFFactorFADC2PhotVar);
+}
+
+// --------------------------------------------------------------------------
+//
+// Get the relative variance of the conversion factor between higain and logain:
+// - If fConversionHiLo    is 0,              return -1.
+// - If fConversionHiLoVar is smaller than 0, return -1.
+// - Else returns: fConversionHiLoVar / fConversionHiLo^2
+//
+const Float_t MCalibrationChargePix::GetConversionHiLoRelVar() const 
+{
+
+  if (fConversionHiLoVar < 0.)
+    return -1.;
+
+  if (fConversionHiLo == 0.)
+    return -1.;
+
+  return fConversionHiLoVar / (fConversionHiLo * fConversionHiLo);
+}
+
+// --------------------------------------------------------------------------
+//
+// Get the relative variance of the electronics pedestal RMS
+// - returns rel. variance of gkElectronicPedRms
+//
+const Float_t MCalibrationChargePix::GetElectronicPedRmsRelVar() const 
+{
+  return gkElectronicPedRmsErr * gkElectronicPedRmsErr / gkElectronicPedRms / gkElectronicPedRms;
+}
+ 
+
+// --------------------------------------------------------------------------
+//
+// Get the relative variance of the conversion factor between higain and logain:
+// - If gkFFactor    is 0,              return -1.
+// - If gkFFactorErr is smaller than 0, return -1.
+// - Else returns: gkFFactorErr^2 / gkFFactor*^2
+//
+const Float_t MCalibrationChargePix::GetFFactorRelVar() const 
+{
+
+  if (gkFFactorErr < 0.)
+    return -1.;
+
+  if (gkFFactor == 0.)
+    return -1.;
+
+  return gkFFactorErr * gkFFactorErr / (gkFFactor * gkFFactor);
+}
+
+// --------------------------------------------------------------------------
+//
+Float_t MCalibrationChargePix::GetPedErr() const
+{
+    return TMath::Sqrt(fPedVar);
+}
+
+// --------------------------------------------------------------------------
+//
+Float_t MCalibrationChargePix::GetPedRms() const
+{
+    if (!IsHiGainSaturation())
+        return fPedRms;
+
+    return fLoGainPedRmsSquare<0 ? -1 : TMath::Sqrt(fLoGainPedRmsSquare);
+}
+
+// --------------------------------------------------------------------------
+//
+// Get the Error of the pedestals RMS: 
+// - Test bit kHiGainSaturation: 
+//   If yes, return square root of (0.25*fLoGainPedRmsSquareVar/ fLoGainPedRmsSquare) (if greater than 0, otherwise -1.)
+//   If no , return square root of (fPedVar) (if greater than 0, otherwise -1.), divided by 2. 
+//
+Float_t MCalibrationChargePix::GetPedRmsErr()  const
+{
+  if (IsHiGainSaturation())
+      return fLoGainPedRmsSquareVar < 0. ? -1. :TMath::Sqrt(0.25*fLoGainPedRmsSquareVar/fLoGainPedRmsSquare);
+  else
+      return fPedVar < 0. ? -1. : TMath::Sqrt(fPedVar)/2.;
+}
+
+// --------------------------------------------------------------------------
 //
 // GetPheFFactorMethodErr(): Get the error on the number of photo-electrons
@@ -319 +486 @@
 //  fPheFFactorMethodVar
 //
-// GetMeanFFactorFADC2PhotErr(): Get the error on the mean total F-Factor
-//  of the signal readout (F-Factor Method): If fMeanFFactorFADC2PhotVar
-//  is smaller than 0 (i.e. has not yet been set), return -1. Else returns
-//  the square root of fMeanFFactorFADC2PhotVar
-//
-// GetPheFFactorMethodRelVar(): Get the relative variance on the number of
-//  photo-electrons (F-Factor Method): If fPheFFactorMethodVar is smaller
-//  than 0 (i.e. has not yet been set), return -1. If fPheFFactorMethod
-//  is 0, return -1. Else returns fPheFFactorMethodVar / fPheFFactorMethod^2
-//
-// GetMeanConvFADC2PheErr(): Get the error on the mean conversion factor
-//  (FFactor  Method): If fMeanConvFADC2PheVar is smaller than 0 (i.e. has
-//  not yet been set), return -1. Else returns the square root of
-//  fMeanConvFADC2PheVar
-
-// --------------------------------------------------------------------------
-//
-// Get the relative variance of the conversion factor between higain and logain:
-// - If fConversionHiLo    is 0,              return -1.
-// - If fConversionHiLoVar is smaller than 0, return -1.
-// - Else returns: fConversionHiLoVar / fConversionHiLo^2
-//
-const Float_t MCalibrationChargePix::GetConversionHiLoRelVar() const 
-{
-
-  if (fConversionHiLoVar < 0.)
-    return -1.;
-
-  if (fConversionHiLo == 0.)
-    return -1.;
-
-  return fConversionHiLoVar / (fConversionHiLo * fConversionHiLo);
-}
-
-// --------------------------------------------------------------------------
-//
-// Get the relative variance of the electronics pedestal RMS
-// - returns rel. variance of gkElectronicPedRms
-//
-const Float_t MCalibrationChargePix::GetElectronicPedRmsRelVar() const 
-{
-  return gkElectronicPedRmsErr * gkElectronicPedRmsErr / gkElectronicPedRms / gkElectronicPedRms;
-}
- 
-
-// --------------------------------------------------------------------------
-//
-// Get the relative variance of the conversion factor between higain and logain:
-// - If gkFFactor    is 0,              return -1.
-// - If gkFFactorErr is smaller than 0, return -1.
-// - Else returns: gkFFactorErr^2 / gkFFactor*^2
-//
-const Float_t MCalibrationChargePix::GetFFactorRelVar() const 
-{
-
-  if (gkFFactorErr < 0.)
-    return -1.;
-
-  if (gkFFactor == 0.)
-    return -1.;
-
-  return gkFFactorErr * gkFFactorErr / (gkFFactor * gkFFactor);
-}
- 
-
-
-// --------------------------------------------------------------------------
-//
-// Get the Error of the pedestals RMS: 
-// - Test bit kHiGainSaturation: 
-//   If yes, return square root of (0.25*fLoGainPedRmsSquareVar/ fLoGainPedRmsSquare) (if greater than 0, otherwise -1.)
-//   If no , return square root of (fPedVar) (if greater than 0, otherwise -1.), divided by 2. 
-//
-Float_t  MCalibrationChargePix::GetPedRmsErr()  const
-{
-  if (IsHiGainSaturation())
-    if (fLoGainPedRmsSquareVar < 0.)
-      return -1.;
-    else
-      return TMath::Sqrt(0.25*fLoGainPedRmsSquareVar/fLoGainPedRmsSquare);
-  else
-    if (fPedVar < 0.)
-      return -1.;
-    else
-      return TMath::Sqrt(fPedVar)/2.;
-}
-
+Float_t MCalibrationChargePix::GetPheFFactorMethodErr() const
+{
+    return fPheFFactorMethodStatVar<0 ? -1 : TMath::Sqrt(fPheFFactorMethodStatVar);
+}
+
+// --------------------------------------------------------------------------
+//
+Float_t MCalibrationChargePix::GetPheFFactorMethodSystErr() const
+{
+    return fPheFFactorMethodSystVar<0 ? -1 : TMath::Sqrt(fPheFFactorMethodSystVar);
+}
+
+// --------------------------------------------------------------------------
+//
+Float_t MCalibrationChargePix::GetPheFFactorMethodTotErr() const
+{
+    if (fPheFFactorMethodStatVar<0 || fPheFFactorMethodSystVar<0)
+        return -1.;
+
+    return TMath::Sqrt(fPheFFactorMethodStatVar+fPheFFactorMethodSystVar);
+}
 
 // --------------------------------------------------------------------------
@@ -439 +540 @@
 // --------------------------------------------------------------------------
 //
+// Get the reduced Sigma:
+// If fRSigmaSquare is smaller than 0 (i.e. has not yet been set),
+// return -1.
+//
+Float_t MCalibrationChargePix::GetRSigma() const
+{
+    return fRSigmaSquare<0 ? -1 : TMath::Sqrt(fRSigmaSquare);
+}
+
+// --------------------------------------------------------------------------
+//
 // Get the error of the reduced Sigma: 
 // - If fRSigmaSquareVar is smaller than 0 (i.e. has not yet been set), return -1.

trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.h

@@ -96 +96 @@
   Float_t GetAbsTimeMean        () const { return fAbsTimeMean;    }
   Float_t GetAbsTimeRms         () const { return fAbsTimeRms;     }
+
   Float_t GetConversionHiLo     () const { return fConversionHiLo; }
-  Float_t GetConversionHiLoErr  () const { return fConversionHiLoVar<0 ? -1 : TMath::Sqrt(fConversionHiLoVar);  }
+  Float_t GetConversionHiLoErr  () const;
   Float_t GetConversionHiLoSigma() const { return fConversionHiLoSigma; }
+
   Float_t GetConvertedMean      () const { return IsHiGainSaturation() ? fLoGainMean * fConversionHiLo : fHiGainMean; }
-  Float_t GetConvertedMeanErr   () const
-  {
-      if (!IsHiGainSaturation())
-          return GetMeanErr();
-      const Float_t logainrelvar = GetLoGainMeanRelVar();
-      return logainrelvar<0 ? -1 : TMath::Sqrt(logainrelvar + GetConversionHiLoRelVar()) * GetConvertedMean();
-  }
+  Float_t GetConvertedMeanErr   () const;
+
   Float_t GetConvertedSigma() const { return IsHiGainSaturation() ? fLoGainSigma * fConversionHiLo : fHiGainSigma; }
-  Float_t GetConvertedSigmaErr() const
-  {
-    if (!IsHiGainSaturation())
-        return GetSigmaErr();
+  Float_t GetConvertedSigmaErr() const;
 
-    if (fLoGainSigmaVar<0 || fLoGainSigma<0)
-        return -1.;
-
-    const Float_t sigmaRelVar = fLoGainSigmaVar/(fLoGainSigma*fLoGainSigma);
-    return TMath::Sqrt(sigmaRelVar+GetConversionHiLoRelVar()) * GetConvertedSigma();
-  }
-  Float_t GetConvertedRSigma() const
-  {
-      if (fRSigmaSquare < 0)
-          return -1;
-      const Float_t rsigma = TMath::Sqrt(fRSigmaSquare);
-      return IsHiGainSaturation() ? rsigma*fConversionHiLo : rsigma ;
-  }
+  Float_t GetConvertedRSigma() const;
   Float_t GetConvertedRSigmaErr() const;
   Float_t GetConvertedRSigmaSquare() const
@@ -133 +115 @@
       return IsHiGainSaturation() ? fRSigmaSquare*fConversionHiLo*fConversionHiLo : fRSigmaSquare ;
   }
+
   Float_t GetMeanConvFADC2Phe() const { return fMeanConvFADC2Phe; }
-  Float_t GetMeanConvFADC2PheErr  () const { return fMeanConvFADC2PheStatVar<0 ? -1 : TMath::Sqrt(fMeanConvFADC2PheStatVar); }
-  Float_t GetMeanConvFADC2PheSystErr() const { return fMeanConvFADC2PheSystVar<0 ? -1 : TMath::Sqrt(fMeanConvFADC2PheSystVar); }
-  Float_t GetMeanConvFADC2PheTotErr() const
-  {
-      if (fMeanConvFADC2PheSystVar<0 || fMeanConvFADC2PheStatVar<0)
-          return -1.;
-      return TMath::Sqrt(fMeanConvFADC2PheSystVar+fMeanConvFADC2PheStatVar);
-  }
+  Float_t GetMeanConvFADC2PheErr() const;
+  Float_t GetMeanConvFADC2PheSystErr() const;
+  Float_t GetMeanConvFADC2PheTotErr() const;
+
   Float_t GetFFactorFADC2Phe        () const { return gkFFactor;   }
   Float_t GetMeanConvFADC2PheVar    () const { return fMeanConvFADC2PheStatVar; }
@@ -147 +126 @@
 
   Float_t GetMeanFFactorFADC2Phot   () const { return fMeanFFactorFADC2Phot;    }
-  Float_t GetMeanFFactorFADC2PhotErr() const { return fMeanFFactorFADC2PhotVar<0 ? -1. : TMath::Sqrt(fMeanFFactorFADC2PhotVar); }
+  Float_t GetMeanFFactorFADC2PhotErr() const;
   Float_t GetMeanFFactorFADC2PhotVar() const { return fMeanFFactorFADC2PhotVar; }
-  Int_t   GetNumSaturated           () const { return fNumSaturated;            }    
-  Float_t GetPed                    () const { return fPed;                     }
-  Float_t GetPedErr                 () const { return TMath::Sqrt(fPedVar);     }
-  Float_t GetPedRms                 () const
-  {
-    if (!IsHiGainSaturation())
-        return fPedRms;
-    return fLoGainPedRmsSquare<0 ? -1 : TMath::Sqrt(fLoGainPedRmsSquare);
-  }
-  Float_t GetPedRmsErr              () const;
-  Float_t GetPheFFactorMethod       () const { return fPheFFactorMethod; }
-  Float_t GetPheFFactorMethodErr    () const { return fPheFFactorMethodStatVar<0 ? -1 : TMath::Sqrt(fPheFFactorMethodStatVar); }
-  Float_t GetPheFFactorMethodSystErr() const { return fPheFFactorMethodSystVar<0 ? -1 : TMath::Sqrt(fPheFFactorMethodSystVar); }
-  Float_t GetPheFFactorMethodTotErr () const
-  {
-      if (fPheFFactorMethodStatVar<0 || fPheFFactorMethodSystVar<0)
-          return -1.;
-      return TMath::Sqrt(fPheFFactorMethodStatVar+fPheFFactorMethodSystVar);
-  }
+
+  Int_t   GetNumSaturated           () const { return fNumSaturated;            }
+
+  Float_t GetPed() const { return fPed; }
+  Float_t GetPedErr() const;
+  Float_t GetPedRms() const;
+  Float_t GetPedRmsErr() const;
+
+  Float_t GetPheFFactorMethod() const { return fPheFFactorMethod; }
+  Float_t GetPheFFactorMethodErr() const;
+  Float_t GetPheFFactorMethodSystErr() const;
+  Float_t GetPheFFactorMethodTotErr() const;
+
   Float_t GetPheFFactorMethodVar    () const { return fPheFFactorMethodStatVar; }
   Float_t GetPheFFactorMethodSystVar() const { return fPheFFactorMethodSystVar; }
   Float_t GetPheFFactorMethodRelVar () const { return fPheFFactorMethodStatVar<=0 ? -1 : fPheFFactorMethodStatVar / (fPheFFactorMethod * fPheFFactorMethod); }
   Float_t GetPheFFactorMethodRelSystVar() const { return fPheFFactorMethodSystVar<=0 ? -1. : fPheFFactorMethodSystVar / (fPheFFactorMethod * fPheFFactorMethod); }
-  Float_t GetRSigma                 () const { return fRSigmaSquare<0 ? -1 : TMath::Sqrt(fRSigmaSquare); }
 
-  Float_t GetRSigmaErr         () const;
-  Float_t GetRSigmaRelVar      () const;
-  Float_t GetRSigmaPerCharge   () const;
+  Float_t GetRSigma() const;
+  Float_t GetRSigmaErr() const;
+  Float_t GetRSigmaRelVar() const;
+  Float_t GetRSigmaPerCharge() const;
   Float_t GetRSigmaPerChargeErr() const;