Changeset 3609 for trunk


Ignore:
Timestamp:
03/30/04 11:24:20 (21 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r3608 r3609  
    4141   * mcalib/MHGausEvents.[h,cc]
    4242     - fixed axes for event and fourier spectrum Draw
     43
     44   * mcalib/MHCalibrationChargePix.[h,cc]
     45   * mcalib/MHCalibrationChargeCam.[h,cc]
     46     - moved definition of pulser frequency to MHCalibrationChargeCam
    4347
    4448

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

    r3601 r3609  
    9696using namespace std;
    9797
    98 const Float_t MHCalibrationChargeCam::fgNumHiGainSaturationLimit = 0.005;
     98const Float_t MHCalibrationChargeCam::fgNumHiGainSaturationLimit = 0.01;
    9999const Float_t MHCalibrationChargeCam::fgNumLoGainSaturationLimit = 0.005;
    100 //
     100const Int_t   MHCalibrationChargeCam::fgPulserFrequency          = 500;
    101101//
    102102//
    … …  
    147147    SetNumHiGainSaturationLimit();
    148148    SetNumLoGainSaturationLimit();
     149    SetPulserFrequency();
    149150
    150151    fNumInnerPixels = 0;
    … …  
    352353          (*this)[i].Init();
    353354          (*this)[i].ChangeHistId(i);
     355          (*this)[i].SetEventFrequency(fPulserFrequency);
    354356      }
    355357  }
    … …  
    371373          (*this)(i).Init();
    372374          (*this)(i).ChangeHistId(i);
    373       }
     375          (*this)(i).SetEventFrequency(fPulserFrequency);
     376      }
     377     
    374378  }
    375379
     380  fAverageHiGainInnerPix->SetEventFrequency(fPulserFrequency);
     381  fAverageLoGainInnerPix->SetEventFrequency(fPulserFrequency);
     382  fAverageHiGainOuterPix->SetEventFrequency(fPulserFrequency);
     383  fAverageLoGainOuterPix->SetEventFrequency(fPulserFrequency);
     384
    376385
    377386  *fLog << inf << GetDescriptor() << ": " << fNumExcluded << " excluded Pixels " << endl;
    378 
    379387  return kTRUE;
    380388}
    … …  
    505513    }
    506514
    507   fAverageHiGainInnerPix-> FillAbsTime(sumhiinnertot/fNumInnerPixels);
    508   fAverageLoGainInnerPix-> FillAbsTime(sumloinnertot/fNumInnerPixels);
    509   fAverageHiGainOuterPix-> FillAbsTime(sumhioutertot/fNumOuterPixels);
    510   fAverageLoGainOuterPix-> FillAbsTime(sumlooutertot/fNumOuterPixels);
     515  fAverageHiGainInnerPix->FillAbsTime(sumhiinnertot/fNumInnerPixels);
     516  fAverageLoGainInnerPix->FillAbsTime(sumloinnertot/fNumInnerPixels);
     517  fAverageHiGainOuterPix->FillAbsTime(sumhioutertot/fNumOuterPixels);
     518  fAverageLoGainOuterPix->FillAbsTime(sumlooutertot/fNumOuterPixels);
    511519
    512520  return kTRUE;

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

    r3551 r3609  
    2828  static const Float_t fgNumHiGainSaturationLimit;   // The default number of fNumHiGainSaturationLimit
    2929  static const Float_t fgNumLoGainSaturationLimit;   // The default number of fNumLoGainSaturationLimit
     30  static const Int_t   fgPulserFrequency;            // The default pulser frequency
     31 
     32  Float_t fNumHiGainSaturationLimit;  // Rel. number sat. higain FADC slices upon which the pixel is called saturated
     33  Float_t fNumLoGainSaturationLimit;  // Rel. number sat. logain FADC slices upon which the pixel is called saturated
     34  Int_t   fPulserFrequency;           // The pulser frequency
     35 
     36  TObjArray *fHiGainArray;                              //-> Array of MHCalibrationChargePix with hists
     37  TObjArray *fLoGainArray;                              //-> Array of MHCalibrationChargePix with hists
     38  MHCalibrationChargeHiGainPix *fAverageHiGainInnerPix; //-> HiGain Average of all inner pixels
     39  MHCalibrationChargeLoGainPix *fAverageLoGainInnerPix; //-> LoGain Average of all inner pixels
     40  MHCalibrationChargeHiGainPix *fAverageHiGainOuterPix; //-> HiGain Average of all outer pixels
     41  MHCalibrationChargeLoGainPix *fAverageLoGainOuterPix; //-> LoGain Average of all outer pixels
    3042
    31   Float_t fNumHiGainSaturationLimit;      // The rel. number of saturated higain FADC slices in the whole run upon which the pixel is called saturated
    32   Float_t fNumLoGainSaturationLimit;      // The rel. number of saturated logain FADC slices in the whole run upon which the pixel is called saturated
    33  
    34   TObjArray *fHiGainArray;                           //-> Array of MHCalibrationChargePix with hists
    35   TObjArray *fLoGainArray;                           //-> Array of MHCalibrationChargePix with hists
    36   MHCalibrationChargeHiGainPix *fAverageHiGainInnerPix;   //-> One MHCalibrationChargeHiGainPix with the average of all inner pixels
    37   MHCalibrationChargeLoGainPix *fAverageLoGainInnerPix;   //-> One MHCalibrationChargeLoGainPix with the average of all inner pixels
    38   MHCalibrationChargeHiGainPix *fAverageHiGainOuterPix;   //-> One MHCalibrationChargeHiGainPix with the average of all outer pixels
    39   MHCalibrationChargeLoGainPix *fAverageLoGainOuterPix;   //-> One MHCalibrationChargeLoGainPix with the average of all outer pixels
    40 
    41   MCalibrationChargeCam  *fCam;                      //!  Class holding the results
    42   MRawEvtData            *fRawEvt;                   //!  Raw event data (time slices)
    43   MGeomCam               *fGeom;                     //!  MAGIC geometry
    44   MBadPixelsCam          *fBadPixels;                //!  Bad Pixels
     43  MCalibrationChargeCam  *fCam;                         //!  Cam holding the results
     44  MRawEvtData            *fRawEvt;                      //!  Raw event data (time slices)
     45  MGeomCam               *fGeom;                        //!  MAGIC geometry
     46  MBadPixelsCam          *fBadPixels;                   //!  Bad Pixels
    4547
    4648  Int_t fNumInnerPixels;
    … …  
    8082  void SetNumHiGainSaturationLimit( const Float_t lim=fgNumHiGainSaturationLimit) { fNumHiGainSaturationLimit = lim; }
    8183  void SetNumLoGainSaturationLimit( const Float_t lim=fgNumLoGainSaturationLimit) { fNumLoGainSaturationLimit = lim; }
    82 
     84  void SetPulserFrequency        ( const Int_t   f=fgPulserFrequency)          { fPulserFrequency = f;            }
     85 
    8386  Float_t GetNumHiGainSaturationLimit()                       const  { return fNumHiGainSaturationLimit; }
    8487  Float_t GetNumLoGainSaturationLimit()                       const  { return fNumLoGainSaturationLimit; }

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

    r3551 r3609  
    5858
    5959const Float_t MHCalibrationChargePix::fgPickupLimit     = 5.;
    60 const Int_t   MHCalibrationChargePix::fgPulserFrequency = 500;
    6160// --------------------------------------------------------------------------
    6261//
    … …  
    9594  Clear();
    9695 
    97   SetPulserFrequency();
    9896}
    9997
    … …  
    138136  fName  = Form("%s%d", fName.Data(), id);
    139137  fTitle = Form("%s%d", fTitle.Data(), id);
    140 }
    141 
    142 void  MHCalibrationChargePix::SetPulserFrequency(Float_t f)
    143 {
    144   SetEventFrequency(f);
    145138}
    146139

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

    r3428 r3609  
    2323
    2424protected:
    25 
    26   static const Int_t   fgPulserFrequency;
    2725
    2826  Int_t    fPixId;
    … …  
    6765  virtual void SetPickupLimit( const Float_t  lim =fgPickupLimit)    { fPickupLimit  = lim; }
    6866
    69   void SetPulserFrequency(Float_t f=fgPulserFrequency);
    70 
    7167  void SetSaturated      ( const Float_t f    )                   { fSaturated += f; }
    7268  void SetExcluded       ( const Bool_t b=kTRUE );

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

    r3608 r3609  
    100100//
    101101MHGausEvents::MHGausEvents(const char *name, const char *title)
    102     : fHPowerProbability(NULL),
     102    : fEventFrequency(0), fHPowerProbability(NULL),
    103103      fPowerSpectrum(NULL),
    104104      fGraphEvents(NULL), fGraphPowerSpectrum(NULL),
    … …  
    113113 
    114114  SetPowerProbabilityBins();
    115   SetEventFrequency();
    116115  SetProbLimit();
    117116  SetNDFLimit();

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

    r3608 r3609  
    6363
    6464  void DrawEvents();                                  // Draw a graph of the array fEvents
    65   void DrawPowerSpectrum(TVirtualPad &pad, Int_t i);  // Draw a graph of the array fPowerSpectrum and the hist fHPowerProbability
     65  void DrawPowerSpectrum(TVirtualPad &pad, Int_t i);     // Draw a graph of the array fPowerSpectrum and the hist fHPowerProbability
    6666 
    6767  Float_t *CreateEventXaxis(Int_t n);              //   Create an x-axis for the Event TGraphs
    … …  
    7777
    7878  // Setters
    79   void  SetEventFrequency(const Float_t f=0)  { fEventFrequency = f; }
     79  void  SetEventFrequency(const Float_t f)   { fEventFrequency = f; }
    8080
    8181  void  SetMean    ( const Double_t d )   { fMean     = d;   }
Note: See TracChangeset for help on using the changeset viewer.