Changeset 5192 for trunk/MagicSoft/Mars


Ignore:
Timestamp:
10/05/04 18:34:51 (20 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r5190 r5192  
    2020                                                 -*-*- END OF LINE -*-*-
    2121
     22 2004/10/05: Markus Gaug
     23   
     24  * mcalib/MCalibrationChargeCalc.cc
     25    - fixed small bug for the case that multiple colours are found, but
     26      no intensity calibration is used.
     27
    2228 2004/10/05: Thomas Bretz
    2329
     
    3339     - added mtrigger
    3440     - added mhflux
    35 
    36 
    3741
    3842 2004/10/05: Markus Meyer and Keiichi Mase
  • trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

    r5156 r5192  
    592592    *fLog << (pattern >> i & 1);
    593593  *fLog  << endl;
    594   fPulserPattern = pattern;
    595  
    596594  //
    597595  // Now retrieve the colour and check if not various colours have been used
    598596  //
    599   fPulserColor = MCalibrationCam::kNONE;
    600  
    601   if (fPulserPattern & kAnyGreen)
    602       fPulserColor = MCalibrationCam::kGREEN;
    603 
    604   if ((fPulserPattern & kAnyBlue ||
    605        fPulserPattern & kAnyUV   ||
    606        fPulserPattern & kCT1Pulser) && fPulserColor != MCalibrationCam::kNONE)
     597  if ((pattern & kAnyBlue   ||
     598       pattern & kAnyUV    ||
     599       pattern & kAnyGreen ||
     600       pattern & kCT1Pulser) && fPulserColor != MCalibrationCam::kNONE)
    607601  {
    608602      *fLog << err << "Multiple colours used simultaneously in calibration file. Will skip this part!" << endl;
     
    610604  }
    611605
    612   if (fPulserColor == MCalibrationCam::kNONE)
    613   {
    614       if (fPulserPattern & kAnyBlue)
    615           fPulserColor = MCalibrationCam::kBLUE;
    616       if (fPulserPattern & kAnyUV)
    617           fPulserColor = MCalibrationCam::kUV;
    618       if (fPulserPattern & kCT1Pulser)
     606  fPulserColor   = MCalibrationCam::kNONE;
     607  fPulserPattern = pattern;
     608 
     609  if (fPulserPattern & kAnyBlue)
     610    fPulserColor = MCalibrationCam::kBLUE;
     611  if (fPulserPattern & kAnyUV)
     612    fPulserColor = MCalibrationCam::kUV;
     613  if (fPulserPattern & kCT1Pulser)
    619614          fPulserColor = MCalibrationCam::kCT1;
    620   }
    621615
    622616  *fLog << inf << "Found new colour ... " << flush;
     
    17161710        }
    17171711
    1718       lowlim  [i] = 1.1;   // Lowest known F-Factor of a PMT
     1712      lowlim  [i] = 1.;   // Lowest known F-Factor of a PMT
    17191713      upplim  [i] = avffactorphotons[i] + fFFactorErrLimit*TMath::Sqrt(avffactorphotvar[i]);
    17201714
     
    17581752            << Form("%4.2f+-%4.2f",mean,sigma) << endl;
    17591753
    1760       lowlim  [i] = 1.1;
     1754      lowlim  [i] = 1.;
    17611755      upplim  [i] = mean  + fFFactorErrLimit*sigma;
    17621756
Note: See TracChangeset for help on using the changeset viewer.