Changeset 5773 for trunk/MagicSoft


Ignore:
Timestamp:
01/10/05 17:29:37 (20 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r5768 r5773  
    4141   * msignal/MExtractor.h
    4242     - added Getter for fOffsetLoGain (was still missing)
     43
     44   * mhcalib/MHCalibrationChargeCam.[h,cc]
     45     - remove pixels with histogram overflow only if their percentage
     46       passes a certain limit (default: 0.5%). Before, every overflow
     47       lead to an unsuitable pixel.
    4348
    4449

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

    r5741 r5773  
    172172const Float_t MHCalibrationChargeCam::fgNumHiGainSaturationLimit = 0.01;
    173173const Float_t MHCalibrationChargeCam::fgNumLoGainSaturationLimit = 0.005;
     174const Float_t MHCalibrationChargeCam::fgNumOverflowLimit         = 0.005;
    174175const Float_t MHCalibrationChargeCam::fgTimeLowerLimit           = 1.;
    175176const Float_t MHCalibrationChargeCam::fgTimeUpperLimit           = 2.;
    … …  
    219220  SetNumHiGainSaturationLimit(fgNumHiGainSaturationLimit);
    220221  SetNumLoGainSaturationLimit(fgNumLoGainSaturationLimit);
     222  SetNumOverflowLimit(fgNumOverflowLimit);
     223
    221224  SetTimeLowerLimit();
    222225  SetTimeUpperLimit();
    … …  
    925928
    926929      Stat_t overflow = h->GetBinContent(h->GetNbinsX()+1);
    927       if (overflow > 0.1)
     930      if (overflow > fNumOverflowLimit*histhi.GetHGausHist()->GetEntries())
    928931        {
    929932          *fLog << warn
    930933                << "HiGain Hist-overflow " << overflow
    931                 << " times in pix: " << i << " (w/o saturation!) " << endl;
     934                << " times in: " << histhi.GetName() << " (w/o saturation!) " << endl;
    932935          bad.SetUncalibrated( MBadPixelsPix::kHiGainOverFlow );
    933936        }
    934937
    935938      overflow = h->GetBinContent(0);
    936       if (overflow > 0.1)
     939      if (overflow >  fNumOverflowLimit*histhi.GetHGausHist()->GetEntries())
    937940        {
    938941          *fLog << warn
    939942                << "HiGain Hist-underflow " << overflow
    940                 << " times in pix: " << i << " (w/o saturation!) " << endl;
     943                << " times in pix: " << histhi.GetName() << " (w/o saturation!) " << endl;
    941944          bad.SetUncalibrated( MBadPixelsPix::kHiGainOverFlow );
    942945        }
    … …  
    967970
    968971        Stat_t overflow = h->GetBinContent(h->GetNbinsX()+1);
    969         if (overflow > 0.1)
     972        if (overflow >  fNumOverflowLimit*histlo.GetHGausHist()->GetEntries())
    970973          {
    971974              *fLog << warn
    972975                  << "LoGain Hist-overflow " << overflow
    973                   << " times in pix: " << i << " (w/o saturation!) " << endl;
     976                  << " times in: " << histlo.GetName() << " (w/o saturation!) " << endl;
    974977            bad.SetUncalibrated( MBadPixelsPix::kLoGainOverFlow );
    975978          }
    976979
    977980        overflow = h->GetBinContent(0);
    978         if (overflow > 0.1)
     981        if (overflow > fNumOverflowLimit*histlo.GetHGausHist()->GetEntries())
    979982          {
    980983            *fLog << warn
    981984                  << "LoGain Hist-underflow " << overflow
    982                   << " times in pix: " << i << " (w/o saturation!) " << endl;
     985                  << " times in: " << histlo.GetName() << " (w/o saturation!) " << endl;
    983986            bad.SetUncalibrated( MBadPixelsPix::kLoGainOverFlow );
    984987          }

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

    r5686 r5773  
    4444  static const Float_t fgNumHiGainSaturationLimit;   //! The default for fNumHiGainSaturationLimit (now at: 0.01)
    4545  static const Float_t fgNumLoGainSaturationLimit;   //! The default for fNumLoGainSaturationLimit (now at: 0.005)
     46  static const Float_t fgNumOverflowLimit;           //! The default for fNumOverflowLimit         (now at: 0.005)
     47
    4648  static const Float_t fgTimeLowerLimit;             //! Default for fTimeLowerLimit    (now set to: 1.)
    4749  static const Float_t fgTimeUpperLimit;             //! Default for fTimeUpperLimit    (now set to: 2.)
    … …  
    5658  Axis_t  fLoGainLast;                               // Upper histogram limit low gain 
    5759
     60  Float_t fNumOverflowLimit;                         // Part of maximum allowed overflow events
     61 
    5862  TString fAbsHistName;                              // Histogram names abs.times
    5963  TString fAbsHistTitle;                             // Histogram titles abs. times
    … …  
    113117  void SetLoGainLast        ( const Axis_t f )       { fLoGainLast    = f; } 
    114118
     119  void SetNumOverflowLimit ( const Float_t f=fgNumOverflowLimit ) { fNumOverflowLimit = f; }
     120 
    115121  void SetTimeLowerLimit    ( const Float_t f=fgTimeLowerLimit ) { fTimeLowerLimit = f; }
    116122  void SetTimeUpperLimit    ( const Float_t f=fgTimeUpperLimit ) { fTimeUpperLimit = f; }
Note: See TracChangeset for help on using the changeset viewer.