Changeset 2891 for trunk/MagicSoft/Mars/mbase/MAstro.cc

Timestamp:

01/23/04 14:47:01 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mbase/MAstro.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mbase/MAstro.cc

@@ -216 +216 @@
 Int_t MAstro::Ymd2Mjd(UShort_t y, Byte_t m, Byte_t d)
 {
-   // Month lengths in days
-   static int months[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+    // Month lengths in days
+    static int months[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
 
     // Validate month
@@ -230 +230 @@
         return -1;
 
-    // Lengthen year and month numbers to avoid overflow
+    // Precalculate some values
     const Byte_t  lm = 12-m;
-    const ULong_t lm10 = 4712 + y + lm/10;
+    const ULong_t lm10 = 4712 + y - lm/10;
 
     // Perform the conversion
-    return 1461L*lm10/4 + (306*((21-lm)%12)+5)/10 - (3*((lm10+188)/100))/4 + d - 2399904;
-}
+    return 1461L*lm10/4 + (306*((m+9)%12)+5)/10 - (3*((lm10+188)/100))/4 + d - 2399904;
+}