Ignore:
Timestamp:
04/04/04 17:50:30 (21 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars/mcalib
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r3617 r3642  
    8585//
    8686MCalibrationChargePINDiode::MCalibrationChargePINDiode(const char *name, const char *title)
    87     : fFlags(0)
     87    : fCalibFlags(0)
    8888{
    8989
    … …  
    112112{
    113113
    114     SetChargeFitValid     ( kFALSE );
    115     SetTimeFitValid       ( kFALSE );
    116     SetMeanTimeInFirstBin ( kFALSE );
    117     SetMeanTimeInLastBin  ( kFALSE );
     114  SetChargeFitValid     ( kFALSE );
     115  SetTimeFitValid       ( kFALSE );
     116  SetMeanTimeInFirstBin ( kFALSE );
     117  SetMeanTimeInLastBin  ( kFALSE );
    118118   
    119   fMeanCharge                       =  -1.;
    120   fMeanChargeErr                    =  -1.;
    121   fSigmaCharge                      =  -1.;
    122   fSigmaChargeErr                   =  -1.;
    123   fChargeProb                       =  -1.;
    124119  fPed                              =  -1.;
    125120  fPedRms                           =  -1.;
    … …  
    163158void  MCalibrationChargePINDiode::SetOscillating( const Bool_t b)
    164159{
    165     b ? SETBIT(fFlags,kOscillating) : CLRBIT(fFlags,kOscillating);
    166 }
    167 
    168 // --------------------------------------------------------------------------
    169 //
    170 // Set the Excluded Bit from outside
    171 //
    172 void MCalibrationChargePINDiode::SetExcluded(Bool_t b )
    173 {
    174   b ?  SETBIT(fFlags, kExcluded) : CLRBIT(fFlags, kExcluded);
     160    b ? SETBIT(fCalibFlags,kOscillating) : CLRBIT(fCalibFlags,kOscillating);
    175161}
    176162
    … …  
    182168void MCalibrationChargePINDiode::SetExcludeQualityCheck(Bool_t b )
    183169{
    184   b ?  SETBIT(fFlags, kExcludeQualityCheck) : CLRBIT(fFlags, kExcludeQualityCheck);
     170  b ?  SETBIT(fCalibFlags, kExcludeQualityCheck) : CLRBIT(fCalibFlags, kExcludeQualityCheck);
    185171}
    186172
    … …  
    191177void MCalibrationChargePINDiode::SetChargeFitValid(Bool_t b )   
    192178{
    193   b ?  SETBIT(fFlags, kChargeFitValid) : CLRBIT(fFlags, kChargeFitValid);
     179  b ?  SETBIT(fCalibFlags, kChargeFitValid) : CLRBIT(fCalibFlags, kChargeFitValid);
    194180}
    195181
    … …  
    200186void MCalibrationChargePINDiode::SetTimeFitValid(Bool_t b )   
    201187{
    202   b ?  SETBIT(fFlags, kTimeFitValid) : CLRBIT(fFlags, kTimeFitValid);
     188  b ?  SETBIT(fCalibFlags, kTimeFitValid) : CLRBIT(fCalibFlags, kTimeFitValid);
    203189}
    204190
    205191void MCalibrationChargePINDiode::SetFluxOutsidePlexiglassAvailable (const Bool_t b)
    206192{
    207   b ?  SETBIT(fFlags, kFluxOutsidePlexiglassAvailable) : CLRBIT(fFlags, kFluxOutsidePlexiglassAvailable);
     193  b ?  SETBIT(fCalibFlags, kFluxOutsidePlexiglassAvailable) : CLRBIT(fCalibFlags, kFluxOutsidePlexiglassAvailable);
    208194}
    209195
    210196void MCalibrationChargePINDiode::SetMeanTimeInFirstBin(const Bool_t b)
    211197{
    212   b ? SETBIT(fFlags,kMeanTimeInFirstBin) : CLRBIT(fFlags,kMeanTimeInFirstBin);
     198  b ? SETBIT(fCalibFlags,kMeanTimeInFirstBin) : CLRBIT(fCalibFlags,kMeanTimeInFirstBin);
    213199}
    214200
    215201void MCalibrationChargePINDiode::SetMeanTimeInLastBin(const Bool_t b)
    216202{
    217   b ? SETBIT(fFlags,kMeanTimeInLastBin) : CLRBIT(fFlags,kMeanTimeInLastBin);
     203  b ? SETBIT(fCalibFlags,kMeanTimeInLastBin) : CLRBIT(fCalibFlags,kMeanTimeInLastBin);
    218204}
    219205
    220206Bool_t MCalibrationChargePINDiode::IsMeanTimeInFirstBin() const
    221207{
    222   return TESTBIT(fFlags,kMeanTimeInFirstBin);
     208  return TESTBIT(fCalibFlags,kMeanTimeInFirstBin);
    223209}
    224210
    225211Bool_t MCalibrationChargePINDiode::IsMeanTimeInLastBin() const
    226212{
    227   return TESTBIT(fFlags,kMeanTimeInLastBin);
    228 }
    229 
    230 Bool_t MCalibrationChargePINDiode::IsExcluded()       const
    231 {
    232    return TESTBIT(fFlags,kExcluded); 
     213  return TESTBIT(fCalibFlags,kMeanTimeInLastBin);
    233214}
    234215
    235216Bool_t MCalibrationChargePINDiode::IsChargeFitValid() const
    236217{
    237   return TESTBIT(fFlags, kChargeFitValid); 
     218  return TESTBIT(fCalibFlags, kChargeFitValid); 
    238219}
    239220
    240221Bool_t MCalibrationChargePINDiode::IsTimeFitValid()   const
    241222{
    242   return TESTBIT(fFlags, kTimeFitValid); 
     223  return TESTBIT(fCalibFlags, kTimeFitValid); 
    243224}
    244225
    … …  
    255236
    256237
    257   if (fMeanCharge < fChargeLimit*GetPedRms())
     238  if (GetMean() < fChargeLimit*GetPedRms())
    258239    {
    259240      *fLog << warn << "WARNING: Fitted Charge is smaller than "
    … …  
    262243    }
    263244 
    264   if (fMeanChargeErr < fChargeErrLimit)
     245  if (GetMeanErr() < fChargeErrLimit)
    265246    {
    266247      *fLog << warn << "WARNING: Error of Fitted Charge is smaller than "
    … …  
    269250    }
    270251     
    271   if (fMeanCharge < fChargeRelErrLimit*fMeanChargeErr)
     252  if (GetMean() < fChargeRelErrLimit*GetMeanErr())
    272253    {
    273254      *fLog << warn << "WARNING: Fitted Charge is smaller than "
    … …  
    276257    }
    277258     
    278   if (fSigmaCharge < GetPedRms())
     259  if (GetSigma() < GetPedRms())
    279260    {
    280261      *fLog << warn << "WARNING: Sigma of Fitted Charge smaller than Pedestal RMS in PINDiode " << endl;

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

    r3617 r3642  
    22#define MARS_MCalibrationChargePINDiode
    33
    4 #ifndef MARS_MParContainer
    5 #include "MParContainer.h"
     4#ifndef MARS_MCalibrationPix
     5#include "MCalibrationPix.h"
    66#endif
    77
    8 class MCalibrationChargePINDiode : public MParContainer
     8class MCalibrationChargePINDiode : public MCalibrationPix
    99{
    1010private:
    … …  
    4242  Float_t fPedRms;                // The pedestal  RMS (from MPedestalPix)
    4343
    44   Float_t fMeanCharge;            // The mean charge after the fit
    45   Float_t fMeanChargeErr;         // The error of mean charge after the fit
    46   Float_t fSigmaCharge;           // The sigma of the mean charge after the fit
    47   Float_t fSigmaChargeErr;        // The error of the sigma of the mean charge after the fit
    48   Float_t fChargeProb;            // The probability of the fit function
    49 
    5044  Float_t fRmsChargeMean;
    5145  Float_t fRmsChargeMeanErr;
    … …  
    5347  Float_t fRmsChargeSigmaErr;
    5448
    55   Byte_t  fFlags;                            // Flag for the set Bits
     49  Byte_t  fCalibFlags;                            // Flag for the set Bits
    5650
    5751  Float_t fAbsTimeMean;
    … …  
    6963  PulserColor_t fColor; 
    7064
    71   enum  { kExcluded, kExcludeQualityCheck, kOscillating,
     65  enum  { kExcludeQualityCheck, kOscillating,
    7266          kChargeFitValid, kTimeFitValid,
    7367          kMeanTimeInFirstBin, kMeanTimeInLastBin,
    … …  
    8377  // Setters
    8478  void SetColor(   const PulserColor_t color )  {  fColor = color;         }
    85 
    86   void SetMeanCharge     (   const Float_t f )    { fMeanCharge        = f;  }
    87   void SetMeanChargeErr  (   const Float_t f )    { fMeanChargeErr     = f;  }
    88   void SetSigmaCharge    (   const Float_t f )    { fSigmaCharge       = f;  }
    89   void SetSigmaChargeErr (   const Float_t f )    { fSigmaChargeErr    = f;  }
    9079
    9180  void SetRmsChargeMean    ( const Float_t f )    { fRmsChargeMean     = f;  }
    … …  
    10796
    10897  void SetOscillating     ( const Bool_t b=kTRUE);
    109   void SetExcluded           ( const Bool_t b = kTRUE );
    11098  void SetExcludeQualityCheck( const Bool_t b = kTRUE );
    11199  void SetChargeFitValid     ( const Bool_t b = kTRUE );
    … …  
    118106
    119107  // Getters
    120   Float_t GetMeanCharge()      const { return fMeanCharge;         }
    121   Float_t GetMeanChargeErr()   const { return fMeanChargeErr;      }
    122   Float_t GetSigmaCharge()     const { return fSigmaCharge;        }
    123   Float_t GetSigmaChargeErr()  const { return fSigmaChargeErr;     }
    124   Float_t GetChargeProb()      const { return fChargeProb;         }   
    125 
    126108  Float_t GetMeanFluxOutsidePlexiglass()    const { return fMeanFluxOutsidePlexiglass; }
    127109  Float_t GetMeanFluxErrOutsidePlexiglass() const { return fMeanFluxErrOutsidePlexiglass; }
    … …  
    132114
    133115
    134   Bool_t  IsExcluded()          const;
    135116  Bool_t  IsChargeFitValid()    const;
    136117  Bool_t  IsTimeFitValid()      const;

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

    r3636 r3642  
    702702      }
    703703 
     704  hist.Renorm();
    704705  //
    705706  // 4) Check for oscillations

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

    r3639 r3642  
    232232                                        "Relative Arrival Times average sector ");
    233233
     234          InitHists(GetAverageHiGainSector(j),fCam->GetAverageBadSector(j),j);
     235
    234236          GetAverageHiGainSector(j).GetHGausHist()->SetTitle("Relative Arrival Times average Sector ");
    235237          GetAverageHiGainSector(j).SetNbins(fAverageNbins);

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

    r3639 r3642  
    3131//  pixel number 1 (hardware index: 2). Times are taken from MArrivalTimePix
    3232//
     33//  Results are re-normalized to a value per time (ns) with the formulae:
     34//
     35// - Mean Rel. Time         = Mean Rel. Time        * fFADCSliceWidth
     36// - Mean Rel. Time Error   = Mean Rel. Time Error  * fFADCSliceWidth
     37// - Sigma Rel. Time        = Sigma Rel. Time       * fFADCSliceWidth
     38// - Sigma Rel. Time Error  = Sigma Rel. Time Error * fFADCSliceWidth
     39//
    3340//////////////////////////////////////////////////////////////////////////////
    3441#include "MHCalibrationRelTimePix.h"
    … …  
    4350const Axis_t  MHCalibrationRelTimePix::fgRelTimeFirst    = -13.;
    4451const Axis_t  MHCalibrationRelTimePix::fgRelTimeLast     =  13.;
     52const Float_t MHCalibrationRelTimePix::fgFADCSliceWidth  =  3.3333;
    4553// --------------------------------------------------------------------------
    4654//
    … …  
    5664// - the default x-axis title for fHGausHist ("FADC Slice")
    5765// - the default y-axis title for fHGausHist ("Nr. of events")
    58 //
    59 // Executes:
    60 // - MHGausEvents::Clear()
     66//
     67// - the default number for fFADCSliceWidth (fgFADCSliceWidth)
    6168//
    6269MHCalibrationRelTimePix::MHCalibrationRelTimePix(const char *name, const char *title)
    … …  
    6976  SetFirst ( fgRelTimeFirst );
    7077  SetLast  ( fgRelTimeLast  );
     78  SetFADCSliceWidth();
    7179
    7280  // Create a large number of bins, later we will rebin
    … …  
    7583  fHGausHist.SetXTitle("FADC Slice");
    7684  fHGausHist.SetYTitle("Nr. of events");
    77 
    78   Clear();
    7985
    8086}
    … …  
    8995}
    9096
     97// --------------------------------------------------------------------------
     98//
     99// If mean and sigma have not yet been set, returns.
     100//
     101// Results are re-normalized to a value per time (ns) with the formulae:
     102//
     103// - Mean Rel. Time         = Mean Rel. Time        * fFADCSliceWidth
     104// - Mean Rel. Time Error   = Mean Rel. Time Error  * fFADCSliceWidth
     105// - Sigma Rel. Time        = Sigma Rel. Time       * fFADCSliceWidth
     106// - Sigma Rel. Time Error  = Sigma Rel. Time Error * fFADCSliceWidth
     107//
     108void MHCalibrationRelTimePix::Renorm()
     109{
    91110
     111  if (fMean == fMeanErr == fSigma == fSigmaErr == 0.)
     112    return;
     113
     114  fMean    *= fFADCSliceWidth;
     115  fMeanErr *= fFADCSliceWidth;
     116  fSigma   *= fFADCSliceWidth;
     117  fSigmaErr*= fFADCSliceWidth;
     118 
     119}
Note: See TracChangeset for help on using the changeset viewer.