Changeset 5061 for trunk/MagicSoft

Timestamp:

09/16/04 10:05:46 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MTime.h (modified) (1 diff)
• mfilter/MFDeltaT.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -27 +27 @@
    * mhbase/MH.cc, mfilter/MFDeltaT.cc:
      - Form %5.1 when printing statistics
+
+   * mfilter/MFDeltaT.cc:
+     - enhaced filter criterias
+
+   * mbase/MTime.h:
+     - added IsMidnight
 
 

trunk/MagicSoft/Mars/mbase/MTime.h

@@ -115 +115 @@
     UInt_t Sec() const   { Byte_t h, m, s; GetTime(h,m,s); return s; }
 
+    Bool_t IsMidnight() const { return (Long_t)fTime==0 && fNanoSec==0; }
+
     // I/O functions
     istream &ReadBinary(istream &fin);

trunk/MagicSoft/Mars/mfilter/MFDeltaT.cc

@@ -78 +78 @@
     fNameTime   = time;
 
-    fErrors.Set(5);
+    fErrors.Set(6);
 
     AddToBranchList(Form("%s.*", (const char*)fNameTime));
@@ -117 +117 @@
     fResult = kFALSE;
 
-    const Double_t dt = *fTime - fLastTime;
-    fLastTime = *fTime;
-
     Int_t i=0;
 
     if (GetNumExecutions()>0)
     {
-        if (dt<0)
+        if (*fTime-fLastTime>fUpperLimit)
             i=1;
-        if (dt==0)
+        if (*fTime<fLastTime)
             i=2;
-        if (dt>fUpperLimit)
+        if (*fTime==fLastTime)
             i=3;
-        if (TMath::Floor(fTime->GetMjd())==fTime->GetMjd())
+        if (fTime->IsMidnight())
             i=4;
+        if (*fTime==MTime())
+            i=5;
     }
+
+    fLastTime = *fTime;
 
     fResult = i==0;
@@ -151 +152 @@
     *fLog << GetDescriptor() << " filter statistics:" << endl;
     *fLog << dec << setfill(' ');
-    PrintSkipped(fErrors[1], "Delta-T  < 0");
-    PrintSkipped(fErrors[2], "Delta-T == 0");
-    PrintSkipped(fErrors[3], Form("Delta-T  > %.2fs", fUpperLimit));
-    PrintSkipped(fErrors[4], "Delta-T == floor(Delta-T)");
+    PrintSkipped(fErrors[2], "Delta-T  < 0");
+    PrintSkipped(fErrors[3], "Delta-T == 0");
+    PrintSkipped(fErrors[1], Form("Delta-T  > %.2fs", fUpperLimit));
+    PrintSkipped(fErrors[4], "MTime is midnight");
+    PrintSkipped(fErrors[5], "MTime not initialized");
     *fLog << " " << (int)fErrors[0] << " (";
     *fLog << Form("5.1f", 100.*fErrors[0]/GetNumExecutions());