Changeset 9090

Timestamp:

08/05/08 11:57:53 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/macros/fillstar.C (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2008/08/05 Thomas Bretz
+
+   * datacenter/macros/fillstar.C:
+     - fixed the case of invalid effective on times
+     - fixed the regular expression to find the MSequence in old files
+
+
 
  2008/08/05 Daniela Dorner

trunk/MagicSoft/Mars/datacenter/macros/fillstar.C

@@ -162 +162 @@
         effon = h->GetEntries()/100;
 
-    Float_t mrate  = num/effon;
-    TString muonrate = Form("%6.2f", mrate<0?0:mrate);
+    Float_t mrate = num/effon;
+
+    TString muonrate  = mrate<0 || effon==0 ? "NULL" : Form("%6.2f", mrate);
     TString effontime = Form("%.1f", effon);
 
     Int_t numsparks = (int)hsparks->GetEntries();
     Int_t numevents = (int)h->GetEntries() - numsparks;
-    Int_t datarate  = TMath::Nint(numevents/effon);
-
+
+    TString datarate  = effon==0 ? "NULL" : Form("%d", numevents/effon);
     TString sparkrate = Form("%5.2f", numsparks/effon);
-
-    if (sparkrate.Contains("inf"))
-        sparkrate="0.00";
+    if (sparkrate.Contains("inf") || sparkrate.Contains("nan"))
+        sparkrate="NULL";
 
     MHEffectiveOnTime *ontm = (MHEffectiveOnTime*)arr.FindObjectInCanvas("MHEffectiveOnTime", "MHEffectiveOnTime", "EffOnTime");
@@ -223 +223 @@
 
     MSequence seq;
-    if (seq.Read("sequence[0-9]{8}|MSequence")<=0)
+    if (seq.Read("sequence[0-9]{8}[.]txt|MSequence")<=0)
     {
         cout << "ERROR - Could not find sequence in file: " << fname << endl;
@@ -267 +267 @@
                         " fMuonRate=%s,"
                         " fPSF=%s,"
-                        " fDataRate=%d,"
+                        " fDataRate=%s,"
                         " fSparkRate=%s,"
                         " fMaxHumidity=%s,"
@@ -287 +287 @@
                         num, effontime.Data(), totontime.Data(),
                         muonrate.Data(), PSF.Data(),
-                        datarate, sparkrate.Data(), maxhum.Data(),
+                        datarate.Data(), sparkrate.Data(), maxhum.Data(),
                         avghum.Data(), avgtemp.Data(), avgwind.Data(),
                         avgsky.Data(), avgclouds.Data(), rmsclouds.Data(),