- Timestamp:
- 01/16/05 22:06:14 (20 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r5864 r5865 39 39 - added possibility to update the conversion factors using the 40 40 MCalibrationChargeCam stored in fCalibUpdate. 41 41 - added Print() function 42 42 43 43 * mcalib/MCalibCalcFromPast.[h,cc] -
trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc
r5861 r5865 284 284 fCalibConsts.Reset(); 285 285 fCalibFFactors.Reset(); 286 fHiLoConv.Reset(); 287 fHiLoConvErr.Reset(); 286 288 287 289 return kTRUE; … … 436 438 { 437 439 438 *fLog << inf << GetDescriptor() 439 << ": Updating Conversion Factors... " << endl; 440 440 *fLog << inf << GetDescriptor() 441 << ": Updating Conversion Factors... " << endl; 442 443 fCalibConsts.Reset(); 444 fCalibFFactors.Reset(); 445 fHiLoConv.Reset(); 446 fHiLoConvErr.Reset(); 447 441 448 // 442 449 // For the moment, we use only a dummy zenith for the calibration: … … 597 604 } 598 605 606 // Print(); 607 599 608 return kTRUE; 600 609 } … … 624 633 const MExtractedSignalPix &sig = (*fSignals)[pixidx]; 625 634 626 Float_t signal = 0;635 Float_t signal = 0.; 627 636 Float_t signalErr = 0.; 628 637 … … 640 649 const Float_t nphot = signal * fCalibConsts [pixidx]; 641 650 const Float_t nphotErr = TMath::Sqrt(TMath::Abs(nphot)) * fCalibFFactors[pixidx]; 642 651 643 652 MCerPhotPix *cpix = fCerPhotEvt->AddPixel(pixidx, nphot, nphotErr); 644 653 … … 785 794 return rc; 786 795 } 796 797 void MCalibrateData::Print(Option_t *o) const 798 { 799 800 *fLog << all << GetDescriptor() << ":" << endl; 801 802 for (UInt_t pixidx=0; pixidx<fGeomCam->GetNumPixels(); pixidx++) 803 { 804 *fLog << all 805 << Form("%s%3i","Pixel: ",pixidx) 806 << Form("%s%4.2f"," CalibConst: ",fCalibConsts[pixidx]) 807 << Form("%s%4.2f"," F-Factor: ",fCalibFFactors[pixidx]) 808 << Form("%s%4.2f"," HiLoConv: ",fHiLoConv[pixidx]) 809 << endl; 810 } 811 } 812 813 -
trunk/MagicSoft/Mars/mcalib/MCalibrateData.h
r5859 r5865 106 106 107 107 void EnablePedestalType(PedestalType_t i) { fPedestalFlag |= i; } 108 109 void Print(Option_t *o="") const; 110 108 111 void SetPedestalFlag(PedestalType_t i=kRun) { fPedestalFlag = i; } 109 112 Bool_t TestPedestalFlag(PedestalType_t i) const { return fPedestalFlag&i ? kTRUE : kFALSE; }
Note:
See TracChangeset
for help on using the changeset viewer.