Changeset 2461 for trunk/MagicSoft/Mars/mbase

Timestamp:

11/03/03 18:08:26 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

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

trunk/MagicSoft/Mars/mbase/MTime.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
+!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2001
+!   Copyright: MAGIC Software Development, 2000-2003
 !
 !
@@ -24 +24 @@
 
 /////////////////////////////////////////////////////////////////////////////
-//                                                                         //
-// MTime                                                                   //
-//                                                                         //
-// A generalized MARS time stamp                                           //
-//                                                                         //
+//
+// MTime
+//
+// A generalized MARS time stamp
+//
+//
+// Version 1:
+// ----------
+//  - first version
+//
+// Version 2:
+// ----------
+//  - removed fTimeStamp[2]
+//
 /////////////////////////////////////////////////////////////////////////////
-
 #include "MTime.h"
 
@@ -43 +51 @@
 void MTime::Print(Option_t *) const
 {
-    fLog->setf(ios::showbase);
-    *fLog << "MTime Information:  " << hex 
-        << " " << setfill('0') << setw(2) << fTimeStamp[0]
-        << " " << setfill('0') << setw(2) << fTimeStamp[1] << endl << endl;
+    *fLog << GetDescriptor() << ": " << dec;
+    *fLog << setfill('0') << setw(2) << (int)fHour << ":";
+    *fLog << setfill('0') << setw(2) << (int)fMin  << ":";
+    *fLog << setfill('0') << setw(2) << (int)fSec  << ".";
+    *fLog << setfill('0') << setw(9) << fNanoSec << endl;
 } 
-

trunk/MagicSoft/Mars/mbase/MTime.h

@@ -17 +17 @@
 {
 private:
-    UInt_t   fTimeStamp[2]; // type of raw event which should be processed by this task
+    //UInt_t   fTimeStamp[2]; // type of raw event which should be processed by this task
     UInt_t   fDuration;     // time of validity
 
@@ -31 +31 @@
         fTitle = title;
 
-        SetTime(0, 0);
+        SetTime((ULong_t)0);
     }
 
-    MTime(UInt_t t1, UInt_t t0) 
-    {
-        SetTime(t1, t0);
-    }
-
-    MTime(MTime& t)
-    {
-        fTimeStamp[0] = t.fTimeStamp[0];
-        fTimeStamp[1] = t.fTimeStamp[1];
-        fDuration = t.fDuration;
-    }
+    MTime(MTime& t) { *this = t; }
 
     void operator=(MTime &t)
     {
-        fTimeStamp[0] = t.fTimeStamp[0];
-        fTimeStamp[1] = t.fTimeStamp[1];
         fDuration = t.fDuration;
+        fHour     = t.fHour;
+        fMin      = t.fMin;
+        fSec      = t.fSec;
+        fNanoSec  = t.fNanoSec;
     }
 
-    ~MTime() {}
-
     void Print(Option_t *t=NULL) const;
-
-    void SetTime(UInt_t t1, UInt_t t0)
-    {
-        fTimeStamp[0] = t1;
-        fTimeStamp[1] = t0;
-    }
 
     void SetCT1Time(UInt_t t1, UInt_t t0)
@@ -117 +101 @@
     }
 
-    UInt_t GetTimeLo()
-    {
-        return fTimeStamp[0];
-    }
-    UInt_t GetTimeHi()
-    {
-        return fTimeStamp[1];
-    }
-
     UInt_t GetDuration()
     {
@@ -140 +115 @@
     }
 
-    ClassDef(MTime, 1)  //A generalized MARS time stamp
+    ClassDef(MTime, 2)  //A generalized MARS time stamp
 };