Changeset 3620 for trunk


Ignore:
Timestamp:
03/31/04 14:08:36 (21 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r3619 r3620  
    3737   * mcalib/MHCalibrationChargeBlindPix.[h,cc]
    3838   * mcalib/MHCalibrationChargePINDiode.[h,cc]
     39   * mcalib/MHCalibrationRelTimePix.[h,cc]
    3940     - updated and enlarged documentation
    4041

  • trunk/MagicSoft/Mars/mcalib/MCalibrationChargeBlindPix.cc

    r3315 r3620  
    2525/////////////////////////////////////////////////////////////////////////////
    2626//                                                                         //
    27 // MCalibrationChargeBlindPix                                                    //
     27// MCalibrationChargeBlindPix                                              //
    2828//                                                                         //
    2929// This is the storage container to hold informations about the calibration//

  • trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePINDiode.cc

    r3618 r3620  
    180180// Fills the following histograms:
    181181// - MHGausEvents::FillHistAndArray(signal)
    182 // - FillAbsTime(time);
     182// - MHCalibrationChargePix::FillAbsTime(time);
    183183// - FillRmsCharge(rms);
    184184//

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

    r3317 r3620  
    4545
    4646using namespace std;
    47 const Float_t MHCalibrationRelTimeCam::fgTimeSliceWidth = 3.3;
     47const Float_t MHCalibrationRelTimeCam::fgTimeSliceWidth  = 3.3;
     48const Int_t   MHCalibrationRelTimeCam::fgPulserFrequency = 500;
    4849// --------------------------------------------------------------------------
    4950//
    … …  
    6667
    6768  SetTimeSliceWidth();
     69  SetPulserFrequency();
    6870}
    6971
    … …  
    167169          hist.ChangeHistId(i);
    168170          hist.InitBins();
     171          hist.SetEventFrequency(fPulserFrequency);
    169172        }
    170173    }

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

    r3177 r3620  
    1919private:
    2020
    21   static const Float_t fgTimeSliceWidth;          // Default FADC slice time width for MAGIC
    22   Float_t              fTimeSliceWidth;          //  FADC slice time width
     21  static const Float_t fgTimeSliceWidth;       // Default for fTimeSliceWidth
     22  static const Int_t   fgPulserFrequency;      // Default for fPulserFrequency
     23
     24  Float_t fTimeSliceWidth;                    // FADC slice time width
     25  Int_t   fPulserFrequency;                   // The pulser frequency
    2326 
    2427  TObjArray  *fArray;       //-> List of MHCalibrationRelTimePix's
    … …  
    3942
    4043  // Setters
    41   void SetTimeSliceWidth(const Float_t width=fgTimeSliceWidth)  {  fTimeSliceWidth = width; }
     44  void SetTimeSliceWidth( const Float_t width=fgTimeSliceWidth)  {  fTimeSliceWidth = width; }
     45  void SetPulserFrequency( const Int_t  f=fgPulserFrequency)     { fPulserFrequency = f;     }
    4246 
    4347  TObject *Clone(const char *) const;

  • trunk/MagicSoft/Mars/mcalib/MHCalibrationRelTimePix.cc

    r3177 r3620  
    2727//  MHCalibrationRelTimePix
    2828//
    29 //  Histogram class for the relative arrival time analysis.
     29//  Histogram class for the relative arrival time calibration.
    3030//  Holds the histogrammed arrival times,
    3131//  derives from MHGausEvents, perform Fourier analysis
    … …  
    4343const Axis_t  MHCalibrationRelTimePix::fgChargeFirst    = -13.;
    4444const Axis_t  MHCalibrationRelTimePix::fgChargeLast     =  13.;
    45 
    46 const Int_t   MHCalibrationRelTimePix::fgPulserFrequency = 200;
    4745// --------------------------------------------------------------------------
    4846//
    … …  
    6765  fHGausHist.Sumw2();
    6866
    69   SetPulserFrequency();
    7067}
    7168
    … …  
    103100
    104101
    105 void  MHCalibrationRelTimePix::SetPulserFrequency(Float_t f)
    106 {
    107   SetEventFrequency(f);
    108 }
    109 
    110 
    111102void  MHCalibrationRelTimePix::BypassFit()
    112103{

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

    r3177 r3620  
    1111private:
    1212
    13   static const Int_t   fgPulserFrequency;
     13  static const Int_t   fgChargeNbins;      // Default for fChargeNBins  (now set to: 900   )
     14  static const Axis_t  fgChargeFirst;      // Default for fChargeFirst  (now set to: -13.5 )
     15  static const Axis_t  fgChargeLast;       // Default for fChargeLast   (now set to:  13.5 )
    1416
    15   static const Int_t   fgChargeNbins;
    16   static const Axis_t  fgChargeFirst;
    17   static const Axis_t  fgChargeLast;
     17  Int_t   fChargeNbins;                   // Number of  bins used for the fHGausHist
     18  Axis_t  fChargeFirst;                   // Lower bound bin used for the fHGausHist
     19  Axis_t  fChargeLast;                    // Upper bound bin used for the fHGausHist
    1820
    19   Int_t   fChargeNbins;
    20   Axis_t  fChargeFirst;
    21   Axis_t  fChargeLast;
    22 
    23   Int_t fPixId;                  // Pixel Nr
     21  Int_t fPixId;                           // The pixel ID
    2422
    2523public:
    … …  
    3634  void SetChargeLast( const Axis_t last =fgChargeLast)     { fChargeLast  = last; }
    3735
    38   void SetPulserFrequency(Float_t f=fgPulserFrequency);
    39 
    4036  // Fits
    4137  void BypassFit();
    … …  
    4541  void Renorm(const Float_t slicewidth);
    4642 
    47   //  TObject *DrawClone(Option_t *opt="") const;
    48  
    49   ClassDef(MHCalibrationRelTimePix, 1)     // Histograms for each calibrated pixel
     43  ClassDef(MHCalibrationRelTimePix, 1)     // Histogram class for Relative Time Calibration pixel
    5044};
    5145
Note: See TracChangeset for help on using the changeset viewer.