Changeset 8001


Ignore:
Timestamp:
10/02/06 09:17:46 (18 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r8000 r8001  
    2020 2006/10/02 Thomas Bretz
    2121
    22    * callisto.rc:
     22   * callisto.rc, callisto_Dec04Jan05.rc:
    2323     - fixed some names of some resources (all commented out anyhow)
    2424
  • trunk/MagicSoft/Mars/callisto_Dec04Jan05.rc

    r7733 r8001  
    266266#MJCalibration.MCalibrationChargeCalc.PheErrUpperLimit:   5.5
    267267
    268 #MJCalibration.MHCalibrationChargeCam.Debug:        no
    269 #MJCalibration.MHCalibrationChargeCam.LoGain:       yes
    270 #MJCalibration.MHCalibrationChargeCam.Oscillations: yes
    271 #MJCalibration.MHCalibrationChargeCam.SizeCheck:    yes
    272 #MJCalibration.MHCalibrationChargeCam.Averageing:   yes
    273 #MJCalibration.MHCalibrationChargeCam.HiGainNbins:  500
    274 #MJCalibration.MHCalibrationChargeCam.HiGainFirst:  -100.125
    275 #MJCalibration.MHCalibrationChargeCam.HiGainLast:   1899.875
    276 #MJCalibration.MHCalibrationChargeCam.LoGainNbins:   500
    277 #MJCalibration.MHCalibrationChargeCam.LoGainFirst:  -100.25
    278 #MJCalibration.MHCalibrationChargeCam.LoGainLast:   899.75
    279 #MJCalibration.MHCalibrationChargeCam.TimeLowerLimit: 1.
    280 #MJCalibration.MHCalibrationChargeCam.TimeUpperLimit: 3.
     268#MJCalibration.MHCalibrationChargeCam.Debug:           no
     269#MJCalibration.MHCalibrationChargeCam.LoGain:          yes
     270#MJCalibration.MHCalibrationChargeCam.Oscillations:    yes
     271#MJCalibration.MHCalibrationChargeCam.SizeCheck:       yes
     272#MJCalibration.MHCalibrationChargeCam.Averageing:      yes
     273#MJCalibration.MHCalibrationChargeCam.HiGainNbins:     500
     274#MJCalibration.MHCalibrationChargeCam.HiGainFirst:     -100.125
     275#MJCalibration.MHCalibrationChargeCam.HiGainLast:      1899.875
     276#MJCalibration.MHCalibrationChargeCam.LoGainNbins:     500
     277#MJCalibration.MHCalibrationChargeCam.LoGainFirst:     -100.25
     278#MJCalibration.MHCalibrationChargeCam.LoGainLast:      899.75
     279#MJCalibration.MHCalibrationChargeCam.TimeLowerLimit:  1.
     280#MJCalibration.MHCalibrationChargeCam.TimeUpperLimit:  3.
    281281#MJCalibration.MHCalibrationChargeCam.NumHiGainSaturationLimit: 0.02
    282282#MJCalibration.MHCalibrationChargeCam.NumLoGainSaturationLimit: 0.005
    283 MJCalibration.MHCalibrationChargeCam.ProbLimit:     1.0E-18
    284 #MJCalibration.MHCalibrationChargeCam.OverflowLimit: 0.005
     283MJCalibration.MHCalibrationChargeCam.ProbLimit:        1.0E-18
     284#MJCalibration.MHCalibrationChargeCam.OverflowLimit:   0.005
    285285#MJCalibration.MHCalibrationChargeCam.PulserFrequency: 500
    286286
    287 #MJCalibration.MHCalibrationRelTimeCam.Debug:        no
    288 #MJCalibration.MHCalibrationRelTimeCam.LoGain:       no
    289 #MJCalibration.MHCalibrationRelTimeCam.Oscillations:  yes
    290 #MJCalibration.MHCalibrationRelTimeCam.SizeCheck:    yes
    291 #MJCalibration.MHCalibrationRelTimeCam.Averageing:   yes
    292 #MJCalibration.MHCalibrationRelTimeCam.HiGainNbins:  210
    293 #MJCalibration.MHCalibrationRelTimeCam.HiGainFirst:  -5.
    294 #MJCalibration.MHCalibrationRelTimeCam.HiGainLast:   10.
     287#MJCalibration.MHCalibrationRelTimeCam.Debug:           no
     288#MJCalibration.MHCalibrationRelTimeCam.LoGain:          no
     289#MJCalibration.MHCalibrationRelTimeCam.Oscillations:    yes
     290#MJCalibration.MHCalibrationRelTimeCam.SizeCheck:       yes
     291#MJCalibration.MHCalibrationRelTimeCam.Averageing:      yes
     292#MJCalibration.MHCalibrationRelTimeCam.Nbins:           300
     293#MJCalibration.MHCalibrationRelTimeCam.First:           -4.975
     294#MJCalibration.MHCalibrationRelTimeCam.Last:            10.025
    295295#MJCalibration.MHCalibrationRelTimeCam.NumHiGainSaturationLimit: 0.25
    296 #MJCalibration.MHCalibrationRelTimeCam.ProbLimit:    0.00001
    297 #MJCalibration.MHCalibrationRelTimeCam.OverflowLimit: 0.005
     296#MJCalibration.MHCalibrationRelTimeCam.ProbLimit:       0.00001
     297#MJCalibration.MHCalibrationRelTimeCam.OverflowLimit:   0.005
    298298#MJCalibration.MHCalibrationRelTimeCam.PulserFrequency: 500
    299299
     
    437437# Setup interlaced calibration events histogramming
    438438# -------------------------------------------------------------------------
    439 #MJCalibrateSignal.MHCalibrationChargeCam.Debug:        no
    440 #MJCalibrateSignal.MHCalibrationChargeCam.LoGain:       yes
    441 MJCalibrateSignal.MHCalibrationChargeCam.Oscillations:  no
    442 #MJCalibrateSignal.MHCalibrationChargeCam.SizeCheck:    yes
    443 #MJCalibrateSignal.MHCalibrationChargeCam.Averageing:   yes
    444 #MJCalibrateSignal.MHCalibrationChargeCam.HiGainNbins:  500
    445 #MJCalibrateSignal.MHCalibrationChargeCam.HiGainFirst:  -100.5
    446 #MJCalibrateSignal.MHCalibrationChargeCam.HiGainLast:   1899.5
    447 MJCalibrateSignal.MHCalibrationChargeCam.LoGainNbins:   250
    448 MJCalibrateSignal.MHCalibrationChargeCam.LoGainFirst:   -98
    449 MJCalibrateSignal.MHCalibrationChargeCam.LoGainLast:    902
    450 #MJCalibrateSignal.MHCalibrationChargeCam.TimeLowerLimit: 1.
    451 #MJCalibrateSignal.MHCalibrationChargeCam.TimeUpperLimit: 3.
     439#MJCalibrateSignal.MHCalibrationChargeCam.Debug:           no
     440#MJCalibrateSignal.MHCalibrationChargeCam.LoGain:          yes
     441MJCalibrateSignal.MHCalibrationChargeCam.Oscillations:    no
     442#MJCalibrateSignal.MHCalibrationChargeCam.SizeCheck:       yes
     443#MJCalibrateSignal.MHCalibrationChargeCam.Averageing:      yes
     444#MJCalibrateSignal.MHCalibrationChargeCam.HiGainNbins:     500
     445#MJCalibrateSignal.MHCalibrationChargeCam.HiGainFirst:     -100.5
     446#MJCalibrateSignal.MHCalibrationChargeCam.HiGainLast:      1899.5
     447MJCalibrateSignal.MHCalibrationChargeCam.LoGainNbins:     250
     448MJCalibrateSignal.MHCalibrationChargeCam.LoGainFirst:     -98
     449MJCalibrateSignal.MHCalibrationChargeCam.LoGainLast:      902
     450#MJCalibrateSignal.MHCalibrationChargeCam.TimeLowerLimit:  1.
     451#MJCalibrateSignal.MHCalibrationChargeCam.TimeUpperLimit:  3.
    452452#MJCalibrateSignal.MHCalibrationChargeCam.NumHiGainSaturationLimit: 0.02
    453453#MJCalibrateSignal.MHCalibrationChargeCam.NumLoGainSaturationLimit: 0.005
    454 #MJCalibrateSignal.MHCalibrationChargeCam.ProbLimit:    0.0001
    455 #MJCalibrateSignal.MHCalibrationChargeCam.OverflowLimit: 0.005
     454#MJCalibrateSignal.MHCalibrationChargeCam.ProbLimit:       0.0001
     455#MJCalibrateSignal.MHCalibrationChargeCam.OverflowLimit:   0.005
    456456MJCalibrateSignal.MHCalibrationChargeCam.PulserFrequency: 50
    457457
     
    459459# Setup relative time interlaced calibration
    460460# -------------------------------------------------------------------------
    461 #MJCalibrateSignal.MHCalibrationRelTimeCam.Debug:        no
    462 #MJCalibrateSignal.MHCalibrationRelTimeCam.LoGain:       no
    463 MJCalibrateSignal.MHCalibrationRelTimeCam.Oscillations:  no
    464 #MJCalibrateSignal.MHCalibrationRelTimeCam.SizeCheck:    yes
    465 #MJCalibrateSignal.MHCalibrationRelTimeCam.Averageing:   yes
    466 #MJCalibrateSignal.MHCalibrationRelTimeCam.HiGainNbins:  210
    467 #MJCalibrateSignal.MHCalibrationRelTimeCam.HiGainFirst:  -5.
    468 #MJCalibrateSignal.MHCalibrationRelTimeCam.HiGainLast:   10.
     461#MJCalibrateSignal.MHCalibrationRelTimeCam.Debug:           no
     462#MJCalibrateSignal.MHCalibrationRelTimeCam.LoGain:          no
     463MJCalibrateSignal.MHCalibrationRelTimeCam.Oscillations:    no
     464#MJCalibrateSignal.MHCalibrationRelTimeCam.SizeCheck:       yes
     465#MJCalibrateSignal.MHCalibrationRelTimeCam.Averageing:      yes
     466#MJCalibrateSignal.MHCalibrationRelTimeCam.Nbins:           300
     467#MJCalibrateSignal.MHCalibrationRelTimeCam.First:           -4.975
     468#MJCalibrateSignal.MHCalibrationRelTimeCam.Last:            10.025
    469469#MJCalibrateSignal.MHCalibrationRelTimeCam.NumHiGainSaturationLimit: 0.25
    470 #MJCalibrateSignal.MHCalibrationRelTimeCam.ProbLimit:    0.00001
    471 #MJCalibrateSignal.MHCalibrationRelTimeCam.OverflowLimit: 0.005
     470#MJCalibrateSignal.MHCalibrationRelTimeCam.ProbLimit:       0.00001
     471#MJCalibrateSignal.MHCalibrationRelTimeCam.OverflowLimit:   0.005
    472472MJCalibrateSignal.MHCalibrationRelTimeCam.PulserFrequency: 50
    473473
  • trunk/MagicSoft/Mars/mdata/MDataElement.cc

    r3572 r8001  
    5959    : fMatrixName(member), fNumCol(col), fMatrix(NULL)
    6060{
     61    if (fNumCol>=0)
     62        return;
     63
     64    const Int_t pos = fMatrixName.First('[');
     65    if (pos<=0)
     66        return;
     67
     68    fNumCol     = atoi(fMatrixName.Data()+pos+1);
     69    fMatrixName = fMatrixName(0, pos);
    6170}
    6271
  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc

    r7876 r8001  
    686686}
    687687
    688 void MHCalibrationRelTimeCam::CheckOverflow( MHCalibrationPix &pix )
    689 {
    690 
    691   if (pix.IsExcluded())
    692     return;
    693 
    694   TH1F *hist = pix.GetHGausHist();
    695  
    696   Stat_t overflow = hist->GetBinContent(hist->GetNbinsX()+1);
    697   if (overflow > fOverflowLimit*hist->GetEntries())
    698     {
    699       *fLog << warn << "HiGain Hist-overflow " << overflow
    700             << " times in " << pix.GetName() << " (w/o saturation!) " << endl;
    701     }
    702  
    703   overflow = hist->GetBinContent(0);
    704   if (overflow > fOverflowLimit*hist->GetEntries())
    705     {
    706       *fLog << warn << "HiGain Hist-underflow " << overflow
    707             << " times in " << pix.GetName() << " (w/o saturation!) " << endl;
     688void MHCalibrationRelTimeCam::CheckOverflow( MHCalibrationPix &pix ) const
     689{
     690    if (pix.IsExcluded())
     691        return;
     692
     693    const TH1F &hist = *pix.GetHGausHist();
     694
     695    const Int_t   n   = hist.GetNbinsX();
     696    const Float_t max = fOverflowLimit*hist.GetEntries();
     697
     698    const Stat_t overflow = hist.GetBinContent(n+1);
     699    if (overflow > max)
     700    {
     701        *fLog << warn << overflow << " overflows above " << hist.GetBinLowEdge(n);
     702        *fLog << " in " << pix.GetName() << " (w/o saturation!) " << endl;
     703    }
     704 
     705    const Stat_t underflow = hist.GetBinContent(0);
     706    if (underflow > max)
     707    {
     708        *fLog << warn << underflow << " underflows below " << hist.GetBinLowEdge(1);
     709        *fLog << " in " << pix.GetName() << " (w/o saturation!) " << endl;
    708710    }
    709711}
  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.h

    r6131 r8001  
    5555  void   FinalizeBadPixels();
    5656
    57   void   CheckOverflow( MHCalibrationPix &pix);
     57  void   CheckOverflow(MHCalibrationPix &pix) const;
    5858  void   DrawDataCheckPixel(MHCalibrationPix &pix, const Float_t refline);
    5959  void   DisplayRefLines( const TH1F *hist, const Float_t refline) const;
Note: See TracChangeset for help on using the changeset viewer.