Changeset 7489
- Timestamp:
- 02/10/06 10:22:30 (19 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r7488 r7489 18 18 19 19 -*-*- END OF LINE -*-*- 20 2006/02/10 Thomas Bretz 21 22 * mastro/MAstro.cc: 23 - allow for more year in the algorithm calculating easter 24 25 * mcamera/MCameraDC.h, mcamera/MCameraHV.h, mcamera/MCameraTD.h, 26 mcamera/MCameraTH.h: 27 - added a sanity check in GetPixelContent 28 29 * mraw/MRawRunHeader.cc: 30 - fixed output (correct kiB instead of kB) 31 32 33 20 34 2006/02/09 Thomas Bretz 21 35 -
trunk/MagicSoft/Mars/mastro/MAstro.cc
r7432 r7489 675 675 // 676 676 // für die Jahre M N 677 // 1700-1799 23 3 678 // 1800-1899 23 4 679 // 1900-2099 24 5 680 // 2100-2199 24 6 677 // 1583-1599 22 2 678 // 1600-1699 22 2 679 // 1700-1799 23 3 680 // 1800-1899 23 4 681 // 1900-1999 24 5 682 // 2000-2099 24 5 683 // 2100-2199 24 6 684 // 2200-2299 25 0 685 // 2300-2399 26 1 686 // 2400-2499 25 1 681 687 // 682 688 // Dann fällt Ostern auf den … … 741 747 Int_t MAstro::GetEasterOffset(UShort_t year) 742 748 { 743 if (year<1 700 || year>2199)749 if (year<1583 || year>2499) 744 750 { 745 751 cout << "MAstro::GetDayOfEaster - Year " << year << " not between 1700 and 2199" << endl; … … 747 753 } 748 754 749 const Int_t M = (year+2900)/200; 750 755 Int_t M=0; 751 756 Int_t N=0; 752 757 switch (year/100) 753 758 { 754 case 17: N=3; break; 755 case 18: N=4; break; 756 case 19: 757 case 20: N=5; break; 758 case 21: N=6; break; 759 case 15: 760 case 16: M=22; N=2; break; 761 case 17: M=23; N=3; break; 762 case 18: M=23; N=4; break; 763 case 19: 764 case 20: M=24; N=5; break; 765 case 21: M=24; N=6; break; 766 case 22: M=25; N=0; break; 767 case 23: M=26; N=1; break; 768 case 24: M=25; N=1; break; 759 769 } 760 770 -
trunk/MagicSoft/Mars/mcamera/MCameraDC.h
r2958 r7489 33 33 Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const 34 34 { 35 if (idx>=fArray.GetSize()) 36 return kFALSE; 37 35 38 val = fArray[idx]; 36 39 return val>0; -
trunk/MagicSoft/Mars/mcamera/MCameraHV.h
r7444 r7489 53 53 Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const 54 54 { 55 if (idx>=fHV.GetSize()) 56 return kFALSE; 57 55 58 val = fHV[idx]; 56 59 return val>0; -
trunk/MagicSoft/Mars/mcamera/MCameraTD.h
r7446 r7489 31 31 Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const 32 32 { 33 if (idx>=fTD.GetSize()) 34 return kFALSE; 35 33 36 val = fTD[idx]; 34 37 return val>0; -
trunk/MagicSoft/Mars/mcamera/MCameraTH.h
r7446 r7489 31 31 Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const 32 32 { 33 if (idx>=fTH.GetSize()) 34 return kFALSE; 35 33 36 val = fTH[idx]; 34 37 return val>0; -
trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc
r7441 r7489 356 356 *fLog << "Crates: " << fNumCrates << " x " << fNumPixInCrate << " Pixel/Crate = " << fNumCrates*fNumPixInCrate << " Pixel/Evt" << endl; 357 357 *fLog << "Num Pixels: " << GetNumNormalPixels() << " (normal) + " << GetNumSpecialPixels() << " (special) = " << GetNumConnectedPixels() << " (total)" << endl; 358 *fLog << "Samples: " << fNumSamplesHiGain << "/" << fNumSamplesLoGain << " (hi/lo) = " << (fNumSamplesLoGain+fNumSamplesHiGain) * fNumCrates * fNumPixInCrate /1024 << "k B/Evt" << endl;358 *fLog << "Samples: " << fNumSamplesHiGain << "/" << fNumSamplesLoGain << " (hi/lo) = " << (fNumSamplesLoGain+fNumSamplesHiGain) * fNumCrates * fNumPixInCrate /1024 << "kiB/Evt" << endl; 359 359 *fLog << "Evt Counter: " << fNumEvents << endl; 360 360
Note:
See TracChangeset
for help on using the changeset viewer.