Changeset 3173 for trunk


Ignore:
Timestamp:
02/16/04 00:23:02 (21 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r3171 r3173  
    1414   * mcalib/MExtractedSignalPINDiode.[h,cc]
    1515     - new container for the extracted signal of the PIN Diode
     16
     17   * mcalib/MCalibrationCalc.[h,cc]
     18     - remove the PIN Diode signal extraction
    1619
    1720   * manalysis/MHPedestalPix.[h,cc]
  • trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h

    r3154 r3173  
    1414#pragma link C++ class MCalibrationCalc+;
    1515
     16#pragma link C++ class MHCalibrationPINDiode+;
    1617#pragma link C++ class MHCalibrationBlindPixel+;
    17 #pragma link C++ class MHCalibrationPINDiode+;
    1818#pragma link C++ class MHCalibrationPixel+;
    1919
    2020#pragma link C++ class MMcCalibrationCalc++;
    2121
     22#pragma link C++ class MExtractPINDiode++;
     23#pragma link C++ class MExtractedSignalPINDiode++;
     24
    2225#pragma link C++ class MHGausEvents++;
    2326
  • trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.h

    r3123 r3173  
    3838private:
    3939
    40   static const UInt_t fBlindPixelId;            // ID of the blind pixel
    41   static const UInt_t fPINDiodeId;              // ID of the PIN Diode
     40  static const UInt_t fgBlindPixelId;           // ID of the blind pixel
     41  static const UInt_t fgPINDiodeId;             // ID of the PIN Diode
    4242  static const Byte_t fgSaturationLimit;        // Saturation of Hi Gain
    4343  static const Int_t  fgBlindPixelFirst;        // First FADC slice blind pixel
     
    7272
    7373  enum  { kUseBlindPixelFit,
    74           kUsePinDiodeFit,
    7574          kUseQualityChecks,
    7675          kHiLoGainCalibration,
     
    101100  void SkipBlindPixelFit(Bool_t b=kTRUE)
    102101      {b ? CLRBIT(fFlags, kUseBlindPixelFit)    : SETBIT(fFlags, kUseBlindPixelFit);}
    103   void SkipPinDiodeFit(Bool_t b=kTRUE)
    104       {b ? CLRBIT(fFlags, kUsePinDiodeFit)      : SETBIT(fFlags, kUsePinDiodeFit);}
    105102  void SkipQualityChecks(Bool_t b=kTRUE)
    106103      {b ? CLRBIT(fFlags, kUseQualityChecks)    : SETBIT(fFlags, kUseQualityChecks);}
     
    119116  // Getters
    120117  MCalibrationBlindPix *GetBlindPixel() const;
    121   MCalibrationPINDiode *GetPINDiode()   const;
    122118
    123119  // Exclude pixels from configuration file
  • trunk/MagicSoft/Mars/mcalib/MHCalibrationPINDiode.cc

    r3056 r3173  
    132132  Int_t nbins = 20;
    133133
    134   CutEdges(fHPINDiodeCharge,nbins);
     134  StripZeros(fHPINDiodeCharge,nbins);
    135135
    136136  fChargeFirstHiGain = fHPINDiodeCharge->GetBinLowEdge(fHPINDiodeCharge->GetXaxis()->GetFirst());
    137137  fChargeLastHiGain  = fHPINDiodeCharge->GetBinLowEdge(fHPINDiodeCharge->GetXaxis()->GetLast())
    138138                      +fHPINDiodeCharge->GetBinWidth(0);
    139   CutEdges(fHPINDiodeChargevsN,0);
     139  StripZeros(fHPINDiodeChargevsN,0);
    140140
    141141}
  • trunk/MagicSoft/Mars/mcalib/Makefile

    r3154 r3173  
    4848           MHCalibrationPixel.cc \
    4949           MMcCalibrationCalc.cc \
     50           MExtractPINDiode.cc \
     51           MExtractedSignalPINDiode.cc \
    5052           MHGausEvents.cc
    5153
Note: See TracChangeset for help on using the changeset viewer.