Changeset 8337 for trunk/MagicSoft/Mars/mbase

Timestamp:

02/28/07 13:34:10 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MTime.cc (modified) (2 diffs)
• MTime.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mbase/MTime.cc

@@ -108 +108 @@
 // --------------------------------------------------------------------------
 //
+// Constructor. Calls Set(y, m, d, h, min, s, ms, ns).
+// To check validity test for (*this)==MTime()
+//
+MTime::MTime(UShort_t y, Byte_t m, Byte_t d, Byte_t h, Byte_t min, Byte_t s, UShort_t ms, UInt_t ns)
+{
+    Set(y, m, d, h, min, s, ms, ns);
+}
+
+// --------------------------------------------------------------------------
+//
 // Return date as year(y), month(m), day(d)
 //
@@ -218 +228 @@
 {
     return (ULong_t)((GetMjd()-49718)*kDay);
+}
+
+// --------------------------------------------------------------------------
+//
+// Return a time which is expressed in seconds since 01/01/1970 0:00h
+// This is compatible with root's definition used in the constructor of
+// TDatime.
+//
+TDatime MTime::GetRootDatime() const
+{
+    return TDatime((UInt_t)((GetMjd()-40587)*kDay/1000));
 }
 

trunk/MagicSoft/Mars/mbase/MTime.h

@@ -64 +64 @@
     }
     MTime(Double_t mjd);
+    MTime(UShort_t y, Byte_t m, Byte_t d, Byte_t h=13, Byte_t min=0, Byte_t s=0, UShort_t ms=0, UInt_t ns=0);
     MTime(const MTime& t) : MParContainer(), fMjd(t.fMjd), fTime(t.fTime), fNanoSec(t.fNanoSec)
     {
         Init(NULL, NULL);
     }
+
+    //static Int_t Hour() { return 3600; }
+    //static Int_t Day()  { return 3600;*24 }
 
     void operator=(const MTime &t)
@@ -108 +112 @@
     void     GetDateOfSunrise(UShort_t &y, Byte_t &m, Byte_t &d) const;
     TTime    GetRootTime() const;
+    TDatime  GetRootDatime() const;
     Double_t GetAxisTime() const;
     Double_t GetMoonPhase() const;
@@ -143 +148 @@
     operator double() const;   //[s]
     double operator()() const; //[s]
+
+    Double_t    AsDouble() const    { return GetMjd(); }
+    //const char *AsString() const    { return GetString(); }
+    //const char *AsSQLString() const { return GetSqldateTime(); }
 
     // Calculation functions