Changeset 3663 for trunk/MagicSoft/Mars


Ignore:
Timestamp:
04/06/04 11:48:49 (21 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r3662 r3663  
    1818
    1919                                                 -*-*- END OF LINE -*-*-
     20
     21 2004/04/06: Markus Gaug
     22 
     23   * mcalib/MCalibrationChargePix.[h,cc]
     24     - change names of the GetLoGain*() functions to
     25       GetConvertedLoGain*() for better clarity
     26
    2027
    2128 2004/04/05: Markus Gaug
  • trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc

    r3658 r3663  
    6565//  all error variables contain Variances in order to save the CPU-intensive square rooting
    6666//
     67//  Low-Gain variables are stored internally unconverted, i.e. directly from the summed
     68//  FADC slices extraction results, but can be retrieved converted to High-Gain amplifications
     69//  by calls to: GetConvertedLoGainMean() or GetConvertedLoGainSigma()
     70//
    6771// See also: MCalibrationChargeCam, MCalibrationChargeCalc,
    6872//           MHCalibrationChargeCam, MHCalibrationChargePix
     
    325329// --------------------------------------------------------------------------
    326330//
    327 // Get the Low Gain Mean:
     331// Get the Low Gain Mean converted to High Gain amplification:
    328332// Returns fLoGainMean multiplied with fConversionHiLo
    329333//
    330 Float_t MCalibrationChargePix::GetLoGainMean()  const
     334Float_t MCalibrationChargePix::GetConvertedLoGainMean()  const
    331335{
    332336  return fLoGainMean * fConversionHiLo;
     
    335339// --------------------------------------------------------------------------
    336340//
    337 // Get the Error of the Low Gain Mean:
     341// Get the Error of the converted Low Gain Mean:
    338342//
    339343// Returns -1 if the variable fLoGainMean or fLoGainMeanVar are smaller than 0.
    340344//
    341345// Returns the square root of the quadratic sum of the relative variances of
    342 // the fLoGainMean and fConversionHiLo, mulitplied with GetLoGainMean()
    343 //
    344 Float_t MCalibrationChargePix::GetLoGainMeanErr()  const
     346// the fLoGainMean and fConversionHiLo, mulitplied with GetConvertedLoGainMean()
     347//
     348Float_t MCalibrationChargePix::GetConvertedLoGainMeanErr()  const
    345349{
    346350 
     
    354358                                 /( fLoGainMean * fLoGainMean );
    355359
    356   return TMath::Sqrt(chargeRelVar+GetConversionHiLoRelVar()) * GetLoGainMean();
    357 }
    358 
    359 // --------------------------------------------------------------------------
    360 //
    361 // Get the Low Gain Sigma:
     360  return TMath::Sqrt(chargeRelVar+GetConversionHiLoRelVar()) * GetConvertedLoGainMean();
     361}
     362
     363// --------------------------------------------------------------------------
     364//
     365// Get the Low Gain Sigma converted to High Gain amplification:
    362366// Returns fLoGainSigma multiplied with fConversionHiLo
    363367//
    364 Float_t MCalibrationChargePix::GetLoGainSigma()  const
     368Float_t MCalibrationChargePix::GetConvertedLoGainSigma()  const
    365369{
    366370  return fLoGainSigma * fConversionHiLo;
     
    369373// --------------------------------------------------------------------------
    370374//
    371 // Get the Error of the Low Gain Sigma:
     375// Get the Error of the converted Low Gain Sigma:
    372376//
    373377// Returns -1 if the variable fLoGainSigma or fLoGainSigmaVar are smaller than 0.
    374378//
    375379// Returns the square root of the quadratic sum of the relative variances of
    376 // the fLoGainSigma and fConversionHiLo, mulitplied with GetLoGainSigma()
    377 //
    378 Float_t MCalibrationChargePix::GetLoGainSigmaErr()  const
     380// the fLoGainSigma and fConversionHiLo, mulitplied with GetConvertedLoGainSigma()
     381//
     382Float_t MCalibrationChargePix::GetConvertedLoGainSigmaErr()  const
    379383{
    380384
     
    388392                                /( fLoGainSigma * fLoGainSigma );
    389393
    390   return TMath::Sqrt(sigmaRelVar+GetConversionHiLoRelVar()) * GetLoGainSigma();
     394  return TMath::Sqrt(sigmaRelVar+GetConversionHiLoRelVar()) * GetConvertedLoGainSigma();
    391395}
    392396
  • trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.h

    r3651 r3663  
    101101  Float_t GetConversionPINDiodeMethodErr()     const;
    102102  Float_t GetConversionCombinedMethodErr()     const;
    103   Float_t GetLoGainMean                 ()     const;
    104   Float_t GetLoGainMeanErr              ()     const;
    105   Float_t GetLoGainSigma                ()     const;
    106   Float_t GetLoGainSigmaErr             ()     const;
     103  Float_t GetConvertedLoGainMean        ()     const;
     104  Float_t GetConvertedLoGainMeanErr     ()     const;
     105  Float_t GetConvertedLoGainSigma       ()     const;
     106  Float_t GetConvertedLoGainSigmaErr    ()     const;
    107107  Float_t GetMeanConversionBlindPixelMethod()  const { return fMeanConversionBlindPixelMethod  ; }
    108108  Float_t GetMeanConversionCombinedMethod()    const { return fMeanConversionCombinedMethod ;    }
Note: See TracChangeset for help on using the changeset viewer.