Changeset 4889 for trunk/MagicSoft/Mars/mbase

Timestamp:

09/08/04 18:49:00 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

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

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -56 +56 @@
 
 #include <ctype.h>        // isdigit
-#include <fstream>        // ofstream, AsciiWrite
+#include <fstream>        // ofstream
 
 #include <TEnv.h>         // Env::Lookup
@@ -296 +296 @@
 //  container, overload this function.
 //
-void MParContainer::AsciiRead(ifstream &fin)
+void MParContainer::AsciiRead(istream &fin)
 {
     *fLog << warn << "To use the the ascii input of " << GetName();

trunk/MagicSoft/Mars/mbase/MParContainer.h

@@ -112 +112 @@
     Bool_t WriteDataMember(ostream &out, const TList *list) const;
 
-    virtual void AsciiRead(ifstream &fin);
+    virtual void AsciiRead(istream &fin);
     virtual Bool_t AsciiWrite(ostream &out) const;
 

trunk/MagicSoft/Mars/mbase/MTime.cc

@@ -170 +170 @@
 // local time (while here we return UTC) such, that you may encounter
 // strange offsets. You can get rid of this by calling:
-//    TAxis::SetTimeFormat("[your-format] %F1995-01-01 00:00:00");
-//
-// Be carefull: It seems that root takes sommer and winter time into account!
-//              In some circumstances you may need
-//    TAxis::SetTimeFormat("[your-format] %F1995-01-00 23:00:00");
+//    TAxis::SetTimeFormat("[your-format] %F1995-01-01 00:00:00 GMT");
 //
 Double_t MTime::GetAxisTime() const
@@ -573 +569 @@
     fTime -= 11*kHour;
 }
+
+void MTime::Minus1ns()
+{
+    if (fNanoSec>0)
+    {
+        fNanoSec--;
+        return;
+    }
+
+    fTime -= 1;
+    fNanoSec = 999999;
+
+    if ((Long_t)fTime>=-(Long_t)kDay*11)
+        return;
+
+    fTime = 13*kDay-1;
+    fMjd--;
+}   
+
 /*
 MTime MTime::operator-(const MTime &tm1)
@@ -688 +703 @@
     SetMjd(mean);
 }
+
+void MTime::AsciiRead(istream &fin)
+{
+    fin >> *this;
+}
+
+Bool_t MTime::AsciiWrite(ostream &out) const
+{
+    out << *this;
+    return out;
+}

trunk/MagicSoft/Mars/mbase/MTime.h

@@ -118 +118 @@
     istream &ReadBinary(istream &fin);
 
+    void AsciiRead(istream &fin);
+    Bool_t AsciiWrite(ostream &out) const;
+
     // Conversion functions
     operator double() const;   //[s]
@@ -124 +127 @@
     // Calculation functions
     void AddMilliSeconds(UInt_t ms);
+    void Minus1ns();
     void SetMean(const MTime &t0, const MTime &t1);
     void SetMean(Double_t t0, Double_t t1);