Changeset 7489 for trunk/MagicSoft/Mars/mastro

Timestamp:

02/10/06 10:22:30 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mastro/MAstro.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mastro/MAstro.cc

@@ -675 +675 @@
 //
 // für die Jahre        M       N
-// 1700-1799    23      3
-// 1800-1899    23      4
-// 1900-2099    24      5
-// 2100-2199    24      6
+//  1583-1599          22       2
+//  1600-1699          22       2
+//  1700-1799          23       3
+//  1800-1899          23       4
+//  1900-1999          24       5
+//  2000-2099          24       5
+//  2100-2199          24       6
+//  2200-2299          25       0
+//  2300-2399          26       1
+//  2400-2499          25       1
 //
 // Dann fällt Ostern auf den
@@ -741 +747 @@
 Int_t MAstro::GetEasterOffset(UShort_t year)
 {
-    if (year<1700 || year>2199)
+    if (year<1583 || year>2499)
     {
         cout << "MAstro::GetDayOfEaster - Year " << year << " not between 1700 and 2199" << endl;
@@ -747 +753 @@
     }
 
-    const Int_t M = (year+2900)/200;
-
+    Int_t M=0;
     Int_t N=0;
     switch (year/100)
     {
-    case 17: N=3; break;
-    case 18: N=4; break;
-    case 19:
-    case 20: N=5; break;
-    case 21: N=6; break;
+    case 15: 
+    case 16: M=22; N=2; break;
+    case 17: M=23; N=3; break;
+    case 18: M=23; N=4; break;
+    case 19: 
+    case 20: M=24; N=5; break;
+    case 21: M=24; N=6; break;
+    case 22: M=25; N=0; break;
+    case 23: M=26; N=1; break;
+    case 24: M=25; N=1; break;
     }