Changeset 5060 for trunk/MagicSoft

Timestamp:

09/16/04 09:17:25 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mfilter/MFDeltaT.cc (modified) (3 diffs)
• mhbase/MH.cc (modified) (1 diff)
• mimage/MHillasCalc.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -24 +24 @@
    * mimage/MHillasCalc.[h,cc]
      - removed obsolete PrintSkipped
+
+   * mhbase/MH.cc, mfilter/MFDeltaT.cc:
+     - Form %5.1 when printing statistics
 
 

trunk/MagicSoft/Mars/mfilter/MFDeltaT.cc

@@ -78 +78 @@
     fNameTime   = time;
 
-    fErrors.Set(4);
+    fErrors.Set(5);
 
     AddToBranchList(Form("%s.*", (const char*)fNameTime));
@@ -130 +130 @@
         if (dt>fUpperLimit)
             i=3;
+        if (TMath::Floor(fTime->GetMjd())==fTime->GetMjd())
+            i=4;
     }
 
@@ -151 +153 @@
     PrintSkipped(fErrors[1], "Delta-T  < 0");
     PrintSkipped(fErrors[2], "Delta-T == 0");
-    PrintSkipped(fErrors[3], Form("Delta-T > %.2fs", fUpperLimit));
-    *fLog << " " << (int)fErrors[0] << " (" << (int)(100.*fErrors[0]/GetNumExecutions()) << "%) Evts fullfilled filter condition!" << endl;
+    PrintSkipped(fErrors[3], Form("Delta-T  > %.2fs", fUpperLimit));
+    PrintSkipped(fErrors[4], "Delta-T == floor(Delta-T)");
+    *fLog << " " << (int)fErrors[0] << " (";
+    *fLog << Form("5.1f", 100.*fErrors[0]/GetNumExecutions());
+    *fLog << "%) Evts fullfilled filter condition!" << endl;
     *fLog << endl;
 

trunk/MagicSoft/Mars/mhbase/MH.cc

@@ -1291 +1291 @@
 {
     *fLog << " " << setw(7) << n << " (";
-    *fLog << setw(3) << (int)(100.*n/GetNumExecutions());
+    *fLog << Form("%5.1f", 100.*n/GetNumExecutions());
     *fLog << "%) Evts skipped: " << str << endl;
 }

trunk/MagicSoft/Mars/mimage/MHillasCalc.cc

@@ -352 +352 @@
     *fLog << inf << endl;
     *fLog << GetDescriptor() << " execution statistics:" << endl;
-    *fLog << dec << setfill(' ');
     if (TestBit(kCalcHillas))
     {
@@ -365 +364 @@
         PrintSkipped(fErrors[6], "Arg2==0");
     }
-    *fLog << " " << (int)fErrors[0] << " (" << Form("%.1f", 100.*fErrors[0]/GetNumExecutions()) << "%) Evts survived Hillas calculation!" << endl;
+    *fLog << " " << (int)fErrors[0] << " (" << Form("%5.1f", 100.*fErrors[0]/GetNumExecutions()) << "%) Evts survived Hillas calculation!" << endl;
     *fLog << endl;