Changeset 5685 for trunk/MagicSoft


Ignore:
Timestamp:
12/22/04 22:17:26 (20 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r5679 r5685  
    3131    * mcalib/MCalibrationColorSteer.cc
    3232      - use the new functions
     33
     34    * mhcalib/MHCalibrationCam.[h,cc]
     35    * mhcalib/MHCalibrationRelTimeCam.[h,cc]
     36    * mhcalib/MHCalibrationChargeCam.[h,cc]
     37      - centralize the decision about the probability limit to be
     38        taken inside these classes.
    3339
    3440

  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc

    r5622 r5685  
    8787
    8888const Int_t   MHCalibrationCam::fgPulserFrequency = 500;
     89const Float_t MHCalibrationCam::fgProbLimit  = 0.0001;
    8990const TString MHCalibrationCam::gsHistName   = "Hist";
    9091const TString MHCalibrationCam::gsHistTitle  = "";
    … …  
    105106// Initializes:
    106107// - fPulserFrequency to fgPulserFrequency
     108// - fProbLimit to fgProbLimit
    107109//
    108110// - SetAveregeing  (kTRUE);
    … …  
    138140
    139141    SetPulserFrequency();
     142    SetProbLimit();
    140143
    141144    SetAverageing  (kTRUE);
    … …  
    706709        pix.SetFirst(fFirst);
    707710        pix.SetLast (fLast);
     711        pix.SetProbLimit(fProbLimit);
    708712       
    709713        MBadPixelsPix &bad = fIntensBad ? (*fIntensBad)[i] : (*fBadPixels)[i];
    … …  
    785789        pix.SetFirst(fFirst);
    786790        pix.SetLast (fLast);
     791        pix.SetProbLimit(fProbLimit);
    787792       
    788793        MBadPixelsPix &bad = fIntensBad ? (*fIntensBad)[i] : (*fBadPixels)[i];

  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.h

    r5137 r5685  
    4141private:
    4242
    43   static const Int_t fgPulserFrequency;  //! The default for fPulserFrequency (now set to: 500)
    44 
    45   static const TString gsHistName;       //! Default Histogram names
    46   static const TString gsHistTitle;      //! Default Histogram titles
    47   static const TString gsHistXTitle;     //! Default Histogram x-axis titles
    48   static const TString gsHistYTitle;     //! Default Histogram y-axis titles
     43  static const Int_t   fgPulserFrequency; //! The default for fPulserFrequency (now set to: 500)
     44  static const Float_t fgProbLimit;       //! The default for fProbLimit (now set to: 0.0001) 
     45
     46  static const TString gsHistName;        //! Default Histogram names
     47  static const TString gsHistTitle;       //! Default Histogram titles
     48  static const TString gsHistXTitle;      //! Default Histogram x-axis titles
     49  static const TString gsHistYTitle;      //! Default Histogram y-axis titles
    4950 
    5051protected:
    … …  
    5455  Axis_t  fLast;                         // Upper histogram limit
    5556
     57  Float_t fProbLimit;                    // Limit for acceptance of probability of Gauss-Fit
     58 
    5659  TString fHistName;                     //! Histogram names
    5760  TString fHistTitle;                    //! Histogram titles
    … …  
    9295
    9396  enum { kDebug, kLoGain, kAverageing,
    94          kOscillations, kSizeCheck };     // Possible flags
     97         kOscillations, kSizeCheck };    // Possible flags
    9598 
    9699  Byte_t     fFlags;                     // Bit-field to hold the flags
    … …  
    208211  void SetNbins                   ( const Int_t  i )       { fNbins   = i; }
    209212  void SetFirst                   ( const Axis_t f )       { fFirst   = f; }
    210   void SetLast                    ( const Axis_t f )       { fLast    = f; } 
     213  void SetLast                    ( const Axis_t f )       { fLast    = f; }
     214
     215  void SetProbLimit               ( const Float_t f=fgProbLimit) { fProbLimit = f; }   
    211216
    212217  void SetNumLoGainSaturationLimit( const Float_t lim )    { fNumLoGainSaturationLimit  = lim;   }
    … …  
    214219  void SetPulserFrequency         ( const Int_t f=fgPulserFrequency) { fPulserFrequency = f;     }
    215220 
    216   ClassDef(MHCalibrationCam, 1) // Base Histogram class for Calibration Camera
     221  ClassDef(MHCalibrationCam, 2) // Base Histogram class for Calibration Camera
    217222};
    218223

  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc

    r5609 r5685  
    129129const Axis_t  MHCalibrationRelTimeCam::fgFirst    = -5.;
    130130const Axis_t  MHCalibrationRelTimeCam::fgLast     =  5.;
     131const Float_t MHCalibrationRelTimeCam::fgProbLimit  = 0.;
    131132const TString MHCalibrationRelTimeCam::gsHistName   = "RelTime";
    132133const TString MHCalibrationRelTimeCam::gsHistTitle  = "Rel. Arr. Times";
    … …  
    161162  SetFirst(fgFirst);
    162163  SetLast (fgLast );
     164
     165  SetProbLimit(fgProbLimit);
    163166
    164167  SetHistName  (gsHistName  .Data());

  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.h

    r5609 r5685  
    2626  static const Axis_t  fgFirst;                      //! Default lower histogram limit (now set to: -13.5 )
    2727  static const Axis_t  fgLast;                       //! Default upper histogram limit (now set to:  13.5 )
    28                                                    
     28  static const Float_t fgProbLimit;                  //! The default for fProbLimit    (now set to: 0.0) 
     29 
    2930  static const TString gsHistName;                   //! Default Histogram names
    3031  static const TString gsHistTitle;                  //! Default Histogram titles
Note: See TracChangeset for help on using the changeset viewer.