Changeset 3510


Ignore:
Timestamp:
03/15/04 17:49:49 (21 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r3509 r3510  
    3838     no reasonable results in the calibration without bothering that
    3939     too many pixels fall out. Enjoy!
     40
     41   - In that procedure, the classes passed _internally_ from calculation
     42     of sigmas to calculation of variances which saves all the useless
     43     square rooting.
    4044
    4145

  • trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.h

    r3496 r3510  
    2626  static const Float_t fgTimeErrLimit;           // The limit (in units of FADC slices) for acceptance of the fitted time sigma
    2727
    28   Float_t fChargeLimit;                     // The limit (in units of PedRMS) for acceptance of the fitted mean charge
    29   Float_t fChargeErrLimit;                  // The limit (in units of PedRMS) for acceptance of the fitted charge sigma
    30   Float_t fChargeRelErrLimit;               // The limit (in units of Error of fitted charge) for acceptance of the fitted mean 
    31  
    32   Float_t fTimeLimit;                       // The limit (in units of FADC slices) for acceptance of the fitted time
    33   Float_t fTimeErrLimit;                    // The limit (in units of FADC slices) for acceptance of the fitted time sigma
    34 
    35   Float_t fElectronicPedRms;                // The pure electronic component of the RMS
    36   Float_t fElectronicPedRmsErr;             // The error of the pure electronic component of the RMS
    37 
    38   Int_t   fPixId;                           // the pixel Id
    39 
    40   UInt_t  fFlags;                           // Flag for the set bits
    41  
    42   Float_t fHiGainMeanCharge;                // The mean reduced charge after the fit
    43   Float_t fHiGainMeanChargeErr;             // The error of reduced mean charge after the fit
    44   Float_t fHiGainSigmaCharge;               // The sigma of the mean charge after the fit
    45   Float_t fHiGainSigmaChargeErr;            // The error of the sigma of the mean charge after the fit
    46   Float_t fHiGainChargeProb;                // The probability of the fit function
    47 
    48   Float_t fLoGainMeanCharge;                // The mean reduced charge after the fit
    49   Float_t fLoGainMeanChargeErr;             // The error of reduced mean charge after the fit
    50   Float_t fLoGainSigmaCharge;               // The sigma of the mean charge after the fit
    51   Float_t fLoGainSigmaChargeErr;            // The error of the sigma of the mean charge after the fit
    52   Float_t fLoGainChargeProb;                // The probability of the fit function
    53 
    54   Float_t fRSigmaCharge;                    // The reduced squares of sigmas after the fit
    55   Float_t fRSigmaChargeErr;                 // The reduced squares of sigmas after the fit 
    56 
    57   Float_t fPed;                             // The mean pedestal (from MPedestalPix) times number of FADC slices
    58   Float_t fPedErr;                          // The error of the pedestal
    59   Float_t fPedRms;                          // The pedestal  RMS (from MPedestalPix) times sqrt of number of FADC slices
    60 
    61   Float_t fLoGainPedRms;                    // The pedestal  RMS of the low gain
    62   Float_t fLoGainPedRmsErr;                 // The pedestal  RMS Error of the low gain
    63 
    64   Float_t fAbsTimeMean;                     // The mean absolute arrival time
    65   Float_t fAbsTimeRms;                      // The rms of the mean absolute arrival time
    66  
    67   Byte_t  fTimeFirstHiGain;                 // The first used FADC slice
    68   Byte_t  fTimeLastHiGain;                  // The last used FADC slice
    69  
    70   Byte_t  fTimeFirstLoGain;                 // The first used FADC slice
    71   Byte_t  fTimeLastLoGain;                  // The last used FADC slice
    72  
    73   Float_t fPheFFactorMethod;                // The number of Phe's calculated (F-factor method)
    74   Float_t fPheFFactorMethodErr;             // The error on the number of Phe's calculated (F-factor method)
     28  static const Float_t fgPheFFactorMethodLimit;  // The default minimum number of Photo-electrons for a pixel to be accepted.
     29 
     30  Float_t fChargeLimit;             // The limit (in units of PedRMS) for acceptance of the fitted mean charge
     31  Float_t fChargeVarLimit;          // The limit (in units of PedRMS) for acceptance of the fitted charge sigma square
     32  Float_t fChargeRelVarLimit;       // The limit (in units of Variance of fitted charge) for acceptance of the fitted mean 
     33 
     34  Float_t fTimeLimit;               // The limit (in units of FADC slices) for acceptance of the fitted time
     35  Float_t fTimeVarLimit;            // The limit (in units of FADC slices) for acceptance of the fitted time sigma
     36
     37  Float_t fElectronicPedRms;        // The pure electronic component of the RMS
     38  Float_t fElectronicPedRmsVar;     // The error of the pure electronic component of the RMS
     39
     40  Float_t fPheFFactorMethodLimit;   // The minimum number of Photo-electrons for a pixel to be accepted.
     41 
     42  Int_t   fPixId;                   // the pixel Id
     43
     44  UInt_t  fFlags;                   // Flag for the set bits
     45 
     46  Float_t fHiGainMeanCharge;        // The mean reduced charge after the fit
     47  Float_t fHiGainMeanChargeVar;     // The error of reduced mean charge after the fit
     48  Float_t fHiGainSigmaCharge;       // The sigma of the mean charge after the fit
     49  Float_t fHiGainSigmaChargeVar;    // The error of the sigma of the mean charge after the fit
     50  Float_t fHiGainChargeProb;        // The probability of the fit function
     51
     52  Float_t fLoGainMeanCharge;        // The mean reduced charge after the fit
     53  Float_t fLoGainMeanChargeVar;     // The error of reduced mean charge after the fit
     54  Float_t fLoGainSigmaCharge;       // The sigma of the mean charge after the fit
     55  Float_t fLoGainSigmaChargeVar;    // The error of the sigma of the mean charge after the fit
     56  Float_t fLoGainChargeProb;        // The probability of the fit function
     57
     58  Float_t fRSigmaCharge;            // The reduced squares of sigmas after the fit
     59  Float_t fRSigmaChargeVar;         // The reduced squares of sigmas after the fit 
     60
     61  Float_t fPed;                     // The mean pedestal (from MPedestalPix) times number of FADC slices
     62  Float_t fPedVar;                  // The error of the pedestal
     63  Float_t fPedRms;                  // The pedestal  RMS (from MPedestalPix) times sqrt of number of FADC slices
     64
     65  Float_t fLoGainPedRms;            // The pedestal  RMS of the low gain
     66  Float_t fLoGainPedRmsVar;         // The pedestal  RMS Variance of the low gain
     67
     68  Float_t fAbsTimeMean;             // The mean absolute arrival time
     69  Float_t fAbsTimeRms;              // The rms of the mean absolute arrival time
     70 
     71  Byte_t  fTimeFirstHiGain;         // The first used FADC slice
     72  Byte_t  fTimeLastHiGain;          // The last used FADC slice
     73 
     74  Byte_t  fTimeFirstLoGain;         // The first used FADC slice
     75  Byte_t  fTimeLastLoGain;          // The last used FADC slice
     76 
     77  Float_t fPheFFactorMethod;        // The number of Phe's calculated (F-factor method)
     78  Float_t fPheFFactorMethodVar;     // The error on the number of Phe's calculated (F-factor method)
    7579
    7680  Float_t fMeanConversionFFactorMethod;     // The conversion factor to Phe's (F-factor method)
    … …  
    7983  Float_t fMeanConversionCombinedMethod;    // The conversion factor to Ph's (all methods combined)
    8084
    81   Float_t fConversionFFactorMethodErr;      // The error of the conversion factor to Phe's (F-factor method)
    82   Float_t fConversionBlindPixelMethodErr;   // The error of the conversion factor to Ph's (Blind Pixel method)
    83   Float_t fConversionPINDiodeMethodErr;     // The error of the conversion factor to Ph's (PIN Diode method)
    84   Float_t fConversionCombinedMethodErr;     // The error of the conversion factor to Ph's (all methods combined)
     85  Float_t fConversionFFactorMethodVar;      // The error of the conversion factor to Phe's (F-factor method)
     86  Float_t fConversionBlindPixelMethodVar;   // The error of the conversion factor to Ph's (Blind Pixel method)
     87  Float_t fConversionPINDiodeMethodVar;     // The error of the conversion factor to Ph's (PIN Diode method)
     88  Float_t fConversionCombinedMethodVar;     // The error of the conversion factor to Ph's (all methods combined)
    8589
    8690  Float_t fSigmaConversionFFactorMethod;    // The sigma of conversion factor to Phe's (F-factor method)
    … …  
    9498  Float_t fTotalFFactorCombinedMethod;      // The total F-Factor to Ph's (all methods combined)
    9599 
    96   Float_t fTotalFFactorErrFFactorMethod;         // The error of the total F-Factor to Ph's (F-factor method)
    97   Float_t fTotalFFactorErrBlindPixelMethod;      // The error of the total F-Factor to Ph's (Blind Pixel method)
    98   Float_t fTotalFFactorErrPINDiodeMethod;        // The error of the total F-Factor to Ph's (PIN Diode method)
    99   Float_t fTotalFFactorErrCombinedMethod;        // The error of the total F-Factor to Ph's (all methods combined)
    100  
    101   Float_t fTotalFFactor;                         // The F-Factor of the total readout system (Sigma(out)/mean(out)*Mean(in)/sigma(in)
    102   Float_t fTotalFFactorErr;                      // The error on the F-Factor of the total readout system
    103  
    104   Float_t fConversionHiLo;                       // The conversion factor between Hi Gain and Lo Gain 
    105   Float_t fConversionHiLoErr;                    // The error of the conversion factor between Hi Gain and Lo Gain 
     100  Float_t fTotalFFactorFFactorMethodVar;    // The variance of the total F-Factor to Ph's (F-factor method)
     101  Float_t fTotalFFactorBlindPixelMethodVar; // The variance of the total F-Factor to Ph's (Blind Pixel method)
     102  Float_t fTotalFFactorPINDiodeMethodVar;   // The variance of the total F-Factor to Ph's (PIN Diode method)
     103  Float_t fTotalFFactorCombinedMethodVar;   // The variance of the total F-Factor to Ph's (all methods combined)
     104 
     105  Float_t fTotalFFactor;                    // The F-Factor of the total readout system (Sigma(out)/mean(out)*Mean(in)/sigma(in)
     106  Float_t fTotalFFactorVar;                 // The variance on the F-Factor of the total readout system
     107 
     108  Float_t fConversionHiLo;                  // The conversion factor between Hi Gain and Lo Gain 
     109  Float_t fConversionHiLoVar;               // The error of the conversion factor between Hi Gain and Lo Gain 
    106110
    107111  Float_t fNumLoGainSamples;
    … …  
    130134
    131135  void SetConversionHiLo(     const Float_t c = gkConversionHiLo)       { fConversionHiLo      = c;    }
    132   void SetConversionHiLoErr(  const Float_t e = gkConversionHiLoErr)    { fConversionHiLoErr   = e;    }
     136  void SetConversionHiLoErr(  const Float_t e = gkConversionHiLoErr)    { fConversionHiLoVar   = e*e;    }
    133137  void SetChargeLimit    (   const Float_t f=fgChargeLimit       ) { fChargeLimit       = f; }
    134   void SetChargeErrLimit (   const Float_t f=fgChargeErrLimit    ) { fChargeErrLimit    = f; }
    135   void SetChargeRelErrLimit( const Float_t f=fgChargeRelErrLimit ) { fChargeRelErrLimit = f; }
     138  void SetChargeErrLimit (   const Float_t f=fgChargeErrLimit    ) { fChargeVarLimit    = f*f; }
     139  void SetChargeRelErrLimit( const Float_t f=fgChargeRelErrLimit ) { fChargeRelVarLimit = f*f; }
    136140
    137141  void SetTimeLimit      (   const Float_t f=fgTimeLimit         ) { fTimeLimit       = f;   }
    138   void SetTimeErrLimit   (   const Float_t f=fgTimeErrLimit      ) { fTimeErrLimit    = f;   }
    139 
     142  void SetTimeErrLimit   (   const Float_t f=fgTimeErrLimit      ) { fTimeVarLimit    = f*f;   }
     143
     144  void SetPheFFactorMethodLimit ( const Float_t f=fgPheFFactorMethodLimit  ) { fPheFFactorMethodLimit  = f;   }
     145 
    140146  // Charges
    141147  void SetHiGainMeanCharge      ( const Float_t f ) { fHiGainMeanCharge      = f; }
    142   void SetHiGainMeanChargeErr   ( const Float_t f ) { fHiGainMeanChargeErr   = f; }
     148  void SetHiGainMeanChargeErr   ( const Float_t f ) { fHiGainMeanChargeVar   = f*f; }
    143149  void SetHiGainChargeProb      ( const Float_t f ) { fHiGainChargeProb      = f; }
    144150  void SetHiGainSigmaCharge     ( const Float_t f ) { fHiGainSigmaCharge     = f; }
    145   void SetHiGainSigmaChargeErr  ( const Float_t f ) { fHiGainSigmaChargeErr  = f; }
     151  void SetHiGainSigmaChargeErr  ( const Float_t f ) { fHiGainSigmaChargeVar  = f*f; }
    146152
    147153  void SetLoGainMeanCharge      ( const Float_t f ) { fLoGainMeanCharge      = f; }
    148   void SetLoGainMeanChargeErr   ( const Float_t f ) { fLoGainMeanChargeErr   = f; }
     154  void SetLoGainMeanChargeErr   ( const Float_t f ) { fLoGainMeanChargeVar   = f*f; }
    149155  void SetLoGainChargeProb      ( const Float_t f ) { fLoGainChargeProb      = f; }
    150156  void SetLoGainSigmaCharge     ( const Float_t f ) { fLoGainSigmaCharge     = f; }
    151   void SetLoGainSigmaChargeErr  ( const Float_t f ) { fLoGainSigmaChargeErr  = f; }
     157  void SetLoGainSigmaChargeErr  ( const Float_t f ) { fLoGainSigmaChargeVar  = f*f; }
    152158
    153159  void SetMeanCharge            ( const Float_t f );               
    … …  
    175181  void SetTotalFFactorPINDiodeMethod   ( const Float_t f)  { fTotalFFactorPINDiodeMethod = f; }
    176182 
    177   void SetTotalFFactorErrFFactorMethod   ( const Float_t f)  { fTotalFFactorErrFFactorMethod = f; }
    178   void SetTotalFFactorErrBlindPixelMethod ( const Float_t f)  { fTotalFFactorErrBlindPixelMethod = f; }
    179   void SetTotalFFactorErrPINDiodeMethod   ( const Float_t f)  { fTotalFFactorErrPINDiodeMethod = f; }
     183  void SetTotalFFactorFFactorMethodErr   ( const Float_t f)  { fTotalFFactorFFactorMethodVar = f*f; }
     184  void SetTotalFFactorBlindPixelMethodErr ( const Float_t f)  { fTotalFFactorBlindPixelMethodVar = f*f; }
     185  void SetTotalFFactorPINDiodeMethodErr   ( const Float_t f)  { fTotalFFactorPINDiodeMethodVar = f*f; }
    180186 
    181187  // Bit Setters
    … …  
    195201  // Charges
    196202  Float_t GetHiGainMeanCharge()          const { return fHiGainMeanCharge;      }
    197   Float_t GetHiGainMeanChargeErr()       const { return fHiGainMeanChargeErr;   }
     203  Float_t GetHiGainMeanChargeErr()       const;
    198204  Float_t GetHiGainChargeProb()          const { return fHiGainChargeProb;      }   
    199205  Float_t GetHiGainSigmaCharge()         const { return fHiGainSigmaCharge;     }
    200   Float_t GetHiGainSigmaChargeErr()      const { return fHiGainSigmaChargeErr;  }
    201 
    202   Float_t GetLoGainMeanCharge()          const { return fLoGainMeanCharge;      }
    203   Float_t GetLoGainMeanChargeErr()       const { return fLoGainMeanChargeErr;   }
     206  Float_t GetHiGainSigmaChargeErr()      const;
     207
     208  Float_t GetLoGainMeanCharge()          const;
     209  Float_t GetLoGainMeanChargeErr()       const;
    204210  Float_t GetLoGainChargeProb()          const { return fLoGainChargeProb;      }   
    205   Float_t GetLoGainSigmaCharge()         const { return fLoGainSigmaCharge;     }
    206   Float_t GetLoGainSigmaChargeErr()      const { return fLoGainSigmaChargeErr;  }
     211  Float_t GetLoGainSigmaCharge()         const;
     212  Float_t GetLoGainSigmaChargeErr()      const;
    207213
    208214  Float_t GetMeanCharge()                const;
    … …  
    212218  Float_t GetSigmaChargeErr()            const;
    213219
    214   Float_t GetRSigmaCharge()              const { return fRSigmaCharge;    }
    215   Float_t GetRSigmaChargeErr()           const { return fRSigmaChargeErr; } 
     220  Float_t GetRSigmaCharge()              const;
     221  Float_t GetRSigmaChargeErr()           const;
    216222
    217223  Float_t GetHiGainNumPickup()           const { return fHiGainNumPickup; }
    … …  
    222228 
    223229  // Conversion Factors
    224   Float_t GetConversionHiLo()      const  { return fConversionHiLo;    }
    225   Float_t GetConversionHiLoErr()   const  { return fConversionHiLoErr; }
     230  Float_t GetConversionHiLo()            const  { return fConversionHiLo;    }
     231  Float_t GetConversionHiLoErr()         const;
    226232
    227233  Float_t GetMeanConversionBlindPixelMethod()  const { return fMeanConversionBlindPixelMethod  ; }
    228   Float_t GetConversionBlindPixelMethodErr()   const { return fConversionBlindPixelMethodErr ;   }
     234  Float_t GetConversionBlindPixelMethodErr()   const;
    229235  Float_t GetSigmaConversionBlindPixelMethod() const { return fSigmaConversionBlindPixelMethod ; }
    230236
    231237  Float_t GetMeanConversionFFactorMethod()     const { return fMeanConversionFFactorMethod;      }
    232   Float_t GetConversionFFactorMethodErr()      const { return fConversionFFactorMethodErr;       }
     238  Float_t GetConversionFFactorMethodErr()      const;
    233239  Float_t GetSigmaConversionFFactorMethod()    const { return fSigmaConversionFFactorMethod;     }
    234240
    235241  Float_t GetMeanConversionPINDiodeMethod()    const { return fMeanConversionPINDiodeMethod ;    }
    236   Float_t GetConversionPINDiodeMethodErr()     const { return fConversionPINDiodeMethodErr ;     }
     242  Float_t GetConversionPINDiodeMethodErr()     const;
    237243  Float_t GetSigmaConversionPINDiodeMethod()   const { return fSigmaConversionPINDiodeMethod ;   }
    238244
    239245  Float_t GetMeanConversionCombinedMethod()    const { return fMeanConversionCombinedMethod ;    }
    240   Float_t GetConversionCombinedMethodErr()     const { return fConversionCombinedMethodErr ;     }
     246  Float_t GetConversionCombinedMethodErr()     const;
    241247  Float_t GetSigmaConversionCombinedMethod()   const { return fSigmaConversionCombinedMethod ;   }
    242248
    243249  Float_t GetPheFFactorMethod()                const { return fPheFFactorMethod;                 }   
    244   Float_t GetPheFFactorMethodErr()             const { return fPheFFactorMethodErr;              }
     250  Float_t GetPheFFactorMethodErr()             const;
    245251
    246252  Int_t   GetPixId()                           const { return fPixId;                            }
    247253
    248254  Float_t GetPed()                             const { return fPed;                              }
    249   Float_t GetPedErr()                          const { return fPedErr;                           }
     255  Float_t GetPedErr()                          const;
    250256  Float_t GetPedRms()                          const;
    251257  Float_t GetPedRmsErr()                       const;
    252258
    253259  Float_t GetTotalFFactorFFactorMethod()       const { return fTotalFFactorFFactorMethod;        }
    254   Float_t GetTotalFFactorErrFFactorMethod()    const { return fTotalFFactorErrFFactorMethod;     }
     260  Float_t GetTotalFFactorFFactorMethodErr()    const;
    255261 
    256262  Float_t GetTotalFFactorBlindPixelMethod()    const { return fTotalFFactorBlindPixelMethod;     }
    257   Float_t GetTotalFFactorErrBlindPixelMethod() const { return fTotalFFactorErrBlindPixelMethod;  }
     263  Float_t GetTotalFFactorBlindPixelMethodErr() const;
    258264 
    259265  Float_t GetTotalFFactorPINDiodeMethod()      const { return fTotalFFactorPINDiodeMethod;       }
    260   Float_t GetTotalFFactorErrPINDiodeMethod()   const { return fTotalFFactorErrPINDiodeMethod;    }
     266  Float_t GetTotalFFactorPINDiodeMethodErr()   const;
    261267
    262268  Float_t GetTotalFFactorCombinedMethod()      const { return fTotalFFactorCombinedMethod;       }
    263   Float_t GetTotalFFactorErrCombinedMethod()   const { return fTotalFFactorErrCombinedMethod;    }
     269  Float_t GetTotalFFactorCombinedMethodErr()   const;
    264270 
    265271  Bool_t IsExcluded()                          const;
Note: See TracChangeset for help on using the changeset viewer.