Changeset 7432 for trunk/MagicSoft/Mars/mbase/MTime.h

Timestamp:

11/28/05 11:15:09 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mbase/MTime.h (modified) (4 diffs)

trunk/MagicSoft/Mars/mbase/MTime.h

@@ -83 +83 @@
     Bool_t   SetSqlTimeStamp(const char *str);
     void     SetCT1Time(UInt_t mjd, UInt_t t1, UInt_t t0);
-    Bool_t   SetStringFmt(const char *time, const char *fmt);
+    Bool_t   SetStringFmt(const char *time, const char *fmt, const char *loc=0);
     Bool_t   UpdMagicTime(Byte_t h, Byte_t m, Byte_t s, UInt_t ns);
     Bool_t   SetMjd(UInt_t mjd, ULong_t ms, UInt_t ns=0);
     void     SetMjd(Double_t m);
     void     SetAxisTime(Double_t time);
+    void     SetEaster(Short_t year=0);
 
     // Getter functions
@@ -93 +94 @@
     Double_t GetGmst() const;
     TString  GetString() const;
-    TString  GetStringFmt(const char *fmt=0) const;
+    TString  GetStringFmt(const char *fmt=0, const char *loc=0) const;
     TString  GetSqlDateTime() const;
     TString  GetSqlTimeStamp() const;
@@ -112 +113 @@
     }
 
-    UInt_t Year() const  { UShort_t y; Byte_t m, d; GetDate(y,m,d); return y; }
-    UInt_t Month() const { UShort_t y; Byte_t m, d; GetDate(y,m,d); return m; }
-    UInt_t Day() const   { UShort_t y; Byte_t m, d; GetDate(y,m,d); return d; }
-    UInt_t Hour() const  { Byte_t h, m, s; GetTime(h,m,s); return h; }
-    UInt_t Min() const   { Byte_t h, m, s; GetTime(h,m,s); return m; }
-    UInt_t Sec() const   { Byte_t h, m, s; GetTime(h,m,s); return s; }
+    UInt_t Year() const    { UShort_t y; Byte_t m, d; GetDate(y,m,d); return y; }
+    UInt_t Month() const   { UShort_t y; Byte_t m, d; GetDate(y,m,d); return m; }
+    UInt_t Day() const     { UShort_t y; Byte_t m, d; GetDate(y,m,d); return d; }
+    Byte_t WeekDay() const { return TMath::Nint(TMath::Floor(GetMjd()+3))%7; } // Return Day of the week: Sun=0, Mon=1, ..., Sat=6
+    UInt_t Hour() const    { Byte_t h, m, s; GetTime(h,m,s); return h; }
+    UInt_t Min() const     { Byte_t h, m, s; GetTime(h,m,s); return m; }
+    UInt_t Sec() const     { Byte_t h, m, s; GetTime(h,m,s); return s; }
 
     Bool_t IsMidnight() const { return (Long_t)fTime==0 && fNanoSec==0; }
@@ -155 +157 @@
     bool operator!() const;
 
+    static MTime GetEaster(Short_t year=-1);
+
     ClassDef(MTime, 3)  //A generalized MARS time stamp
 };