Changeset 4563 for trunk/MagicSoft/Mars/mbase

Timestamp:

08/10/04 16:03:01 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MTime.cc (modified) (2 diffs)
• MTime.h (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MTime.cc

@@ -113 +113 @@
 // --------------------------------------------------------------------------
 //
+// Return date as year(y), month(m), day(d). If the time is afternoon
+// (>=13:00:00) the date of the next day is returned.
+//
+void MTime::GetDateOfSunrise(UShort_t &y, Byte_t &m, Byte_t &d) const
+{
+    MAstro::Mjd2Ymd(fMjd, y, m, d);
+}
+
+// --------------------------------------------------------------------------
+//
 // Return the time in the range [0h, 24h) = [0h0m0.000s - 23h59m59.999s]
 //
@@ -227 +237 @@
 void MTime::Set(const struct timeval &tv)
 {
-    const UInt_t mjd = 1000*tv.tv_sec/kDay + 40587;
+    const UInt_t mjd = (UInt_t)TMath::Floor(1000.*tv.tv_sec/kDay) + 40587;
+
     const Long_t tm  = tv.tv_sec%(24*3600)*1000 + tv.tv_usec/1000;
     const UInt_t ms  = tv.tv_usec%1000;

trunk/MagicSoft/Mars/mbase/MTime.h

@@ -92 +92 @@
     TString  GetFileName() const;
     void     GetDate(UShort_t &y, Byte_t &m, Byte_t &d) const;
+    void     GetDateOfSunrise(UShort_t &y, Byte_t &m, Byte_t &d) const;
     TTime    GetRootTime() const;
     Double_t GetAxisTime() const;