Changeset 3663 for trunk

Timestamp:

04/06/04 11:48:49 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationChargePix.cc (modified) (6 diffs)
• mcalib/MCalibrationChargePix.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/04/06: Markus Gaug
+ 
+   * mcalib/MCalibrationChargePix.[h,cc]
+     - change names of the GetLoGain*() functions to 
+       GetConvertedLoGain*() for better clarity
+
 
  2004/04/05: Markus Gaug

trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc

@@ -65 +65 @@
 //  all error variables contain Variances in order to save the CPU-intensive square rooting 
 // 
+//  Low-Gain variables are stored internally unconverted, i.e. directly from the summed 
+//  FADC slices extraction results, but can be retrieved converted to High-Gain amplifications 
+//  by calls to: GetConvertedLoGainMean() or GetConvertedLoGainSigma()
+// 
 // See also: MCalibrationChargeCam, MCalibrationChargeCalc,
 //           MHCalibrationChargeCam, MHCalibrationChargePix
@@ -325 +329 @@
 // --------------------------------------------------------------------------
 //
-// Get the Low Gain Mean: 
+// Get the Low Gain Mean converted to High Gain amplification: 
 // Returns fLoGainMean multiplied with fConversionHiLo
 //
-Float_t MCalibrationChargePix::GetLoGainMean()  const 
+Float_t MCalibrationChargePix::GetConvertedLoGainMean()  const 
 {
   return fLoGainMean * fConversionHiLo;
@@ -335 +339 @@
 // --------------------------------------------------------------------------
 //
-// Get the Error of the Low Gain Mean: 
+// 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 GetLoGainMean()
-//
-Float_t MCalibrationChargePix::GetLoGainMeanErr()  const
+// the fLoGainMean and fConversionHiLo, mulitplied with GetConvertedLoGainMean()
+//
+Float_t MCalibrationChargePix::GetConvertedLoGainMeanErr()  const
 {
   
@@ -354 +358 @@
                                  /( fLoGainMean * fLoGainMean );
 
-  return TMath::Sqrt(chargeRelVar+GetConversionHiLoRelVar()) * GetLoGainMean();
-}
-
-// --------------------------------------------------------------------------
-//
-// Get the Low Gain Sigma: 
+  return TMath::Sqrt(chargeRelVar+GetConversionHiLoRelVar()) * GetConvertedLoGainMean();
+}
+
+// --------------------------------------------------------------------------
+//
+// Get the Low Gain Sigma converted to High Gain amplification: 
 // Returns fLoGainSigma multiplied with fConversionHiLo
 //
-Float_t MCalibrationChargePix::GetLoGainSigma()  const 
+Float_t MCalibrationChargePix::GetConvertedLoGainSigma()  const 
 {
   return fLoGainSigma * fConversionHiLo;
@@ -369 +373 @@
 // --------------------------------------------------------------------------
 //
-// Get the Error of the Low Gain Sigma: 
+// Get the Error of the converted Low Gain Sigma: 
 //
 // Returns -1 if the variable fLoGainSigma or fLoGainSigmaVar are smaller than 0.
 //
 // Returns the square root of the quadratic sum of the relative variances of 
-// the fLoGainSigma and fConversionHiLo, mulitplied with GetLoGainSigma()
-//
-Float_t MCalibrationChargePix::GetLoGainSigmaErr()  const
+// the fLoGainSigma and fConversionHiLo, mulitplied with GetConvertedLoGainSigma()
+//
+Float_t MCalibrationChargePix::GetConvertedLoGainSigmaErr()  const
 {
 
@@ -388 +392 @@
                                 /( fLoGainSigma * fLoGainSigma );
 
-  return TMath::Sqrt(sigmaRelVar+GetConversionHiLoRelVar()) * GetLoGainSigma();
+  return TMath::Sqrt(sigmaRelVar+GetConversionHiLoRelVar()) * GetConvertedLoGainSigma();
 }
 

trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.h

@@ -101 +101 @@
   Float_t GetConversionPINDiodeMethodErr()     const;
   Float_t GetConversionCombinedMethodErr()     const;
-  Float_t GetLoGainMean                 ()     const;
-  Float_t GetLoGainMeanErr              ()     const;
-  Float_t GetLoGainSigma                ()     const;
-  Float_t GetLoGainSigmaErr             ()     const;
+  Float_t GetConvertedLoGainMean        ()     const;
+  Float_t GetConvertedLoGainMeanErr     ()     const;
+  Float_t GetConvertedLoGainSigma       ()     const;
+  Float_t GetConvertedLoGainSigmaErr    ()     const;
   Float_t GetMeanConversionBlindPixelMethod()  const { return fMeanConversionBlindPixelMethod  ; }
   Float_t GetMeanConversionCombinedMethod()    const { return fMeanConversionCombinedMethod ;    }