Changeset 2384 for trunk/MagicSoft/Cosy/base

Timestamp:

10/15/03 17:28:35 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/base

Files:

• log.h (modified) (1 diff)
• timer.h (modified) (4 diffs)

trunk/MagicSoft/Cosy/base/log.h

@@ -1 @@
-#ifndef LOG_H
-#define LOG_H
+#ifndef COSY_Log
+#define COSY_Log
 
 #include <ostream.h>
 
+#ifndef MARS_MLog
 #include "MLog.h"
+#endif
 
 //#ifndef __CINT__

trunk/MagicSoft/Cosy/base/timer.h

@@ -10 +10 @@
     friend ostream &operator<<(ostream &out, Timer &t);
 private:
-    double fMs;
-    double fDiv;
+    double fMs;  // Microsec in units of sec as returned by gettimeofday
+    int fSecs;   // Seconds as returned by gettimeofday
 
-    int fSec;
-    int fSecs;
-    int fMin;
-    int fHor;
-    int fDay;
-    int fMon;
-    int fYea;
+    int fSec;    // Sec of time
+    int fMin;    // Min of time
+    int fHor;    // Hor of time
+    int fDay;    // Day of time
+    int fMon;    // Mon of time
+    int fYea;    // Yea of time
 
-    double fMjd;
+    double fDiv; // Division of day
+    double fMjd; // MJD
 
     char fDateStr[30];
@@ -28 +28 @@
 
 public:
-    Timer() : fMs(0), fSec(0), fSecs(0), fMin(0), fHor(0), fDay(0), fMon(0), fYea(0), fMjd(0) {}
+    Timer(int d, int m, int y, int h, int min, int s, double ms)
+        : fMs(ms), fSecs(0), fSec(s), fMin(m), fHor(h), fDay(d), fMon(m), fYea(y), fDiv(0), fMjd(0) {}
+    Timer() : fMs(0), fSecs(0), fSec(0), fMin(0), fHor(0), fDay(0), fMon(0), fYea(0), fDiv(0), fMjd(0) {}
     Timer(double t);
     Timer(struct timeval *tv);
@@ -35 +37 @@
     void SetTimer(int tv_sec, double tv_usec);
     void SetTimer(const struct timeval *tv);
+    void SetTimer(int y, int m, int d, int h, int min, int s, double ms)
+    {
+        fMs = ms;
+        fSec = s;
+        fMin = min;
+        fHor = h;
+        fDay = d;
+        fMon = m;
+        fYea = y;
+    }
 
     void GetTimeval(struct timeval *tv) const;
@@ -52 +64 @@
     int M() const { return fMin; }
     int S() const { return fSec; }
+    int MilliSec() const { return (int)(fMs*1000); }
+    double MicroSec() const { return fMs; }
 
     const char *GetTimeStr();