Changeset 5192 for trunk/MagicSoft/Mars
- Timestamp:
- 10/05/04 18:34:51 (20 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r5190 r5192 20 20 -*-*- END OF LINE -*-*- 21 21 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 22 28 2004/10/05: Thomas Bretz 23 29 … … 33 39 - added mtrigger 34 40 - added mhflux 35 36 37 41 38 42 2004/10/05: Markus Meyer and Keiichi Mase -
trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc
r5156 r5192 592 592 *fLog << (pattern >> i & 1); 593 593 *fLog << endl; 594 fPulserPattern = pattern;595 596 594 // 597 595 // Now retrieve the colour and check if not various colours have been used 598 596 // 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) 607 601 { 608 602 *fLog << err << "Multiple colours used simultaneously in calibration file. Will skip this part!" << endl; … … 610 604 } 611 605 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) 619 614 fPulserColor = MCalibrationCam::kCT1; 620 }621 615 622 616 *fLog << inf << "Found new colour ... " << flush; … … 1716 1710 } 1717 1711 1718 lowlim [i] = 1. 1; // Lowest known F-Factor of a PMT1712 lowlim [i] = 1.; // Lowest known F-Factor of a PMT 1719 1713 upplim [i] = avffactorphotons[i] + fFFactorErrLimit*TMath::Sqrt(avffactorphotvar[i]); 1720 1714 … … 1758 1752 << Form("%4.2f+-%4.2f",mean,sigma) << endl; 1759 1753 1760 lowlim [i] = 1. 1;1754 lowlim [i] = 1.; 1761 1755 upplim [i] = mean + fFFactorErrLimit*sigma; 1762 1756
Note:
See TracChangeset
for help on using the changeset viewer.