Changeset 9027 for trunk/MagicSoft/Mars

Timestamp:

07/22/08 16:28:14 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mbase/MTime.cc (modified) (1 diff)
• mjobs/MJCalibrateSignal.cc (modified) (3 diffs)
• mjobs/MJStar.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MTime.cc

@@ -781 +781 @@
 
     // recalculate tm_yday and tm_wday
-    if (mktime(&time)<0)
-        return "";
+    mktime(&time);
+
+    // We get errors for example for 1910-01-01
+    //    if (mktime(&time)<0)
+    //        return "";
 
     char ret[128];

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -411 +411 @@
 
     MH3 hpat("MRawRunHeader.GetFileID", "MTriggerPattern.GetUnprescaled");
-    hpat.SetWeight("1./TMath::Max(MRawRunHeader.GetRunLength,1)");
+    if (fSequence.IsMonteCarlo())
+        hpat.SetWeight("100./MMcRunHeader.fNumSimulatedShowers");
+    else
+        hpat.SetWeight("1./TMath::Max(MRawRunHeader.GetRunLength,1)");
     hpat.SetName("TrigPat");
     hpat.SetTitle("Rate of the trigger pattern [Hz];File Id;Trigger Pattern;Rate [Hz]");
@@ -756 +759 @@
     // Build tasklist
 
-    MTaskList tlist2;
+    MTaskList tlist2("PedEvents");
 
     tlist2.AddToList(&caldec);
@@ -768 +771 @@
     // Pedestal extraction
 
-    MTaskList tlist3;
+    MTaskList tlist3("CalEvents");
     tlist3.SetFilter(&fped);         // Deny events with cal-trigger
 

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -277 +277 @@
     // Plot the trigger pattern rates vs. run-number
     MH3 hrate("MRawRunHeader.GetFileID", "MTriggerPattern.GetUnprescaled");
-    hrate.SetWeight("1./TMath::Max(MRawRunHeader.GetRunLength,1)");
+    if (fSequence.IsMonteCarlo())
+        hrate.SetWeight("100./MMcRunHeader.fNumSimulatedShowers");
+    else
+        hrate.SetWeight("1./TMath::Max(MRawRunHeader.GetRunLength,1)");
     hrate.SetName("Rate");
     hrate.SetTitle("Event rate after cleaning [Hz];File Id;Trigger Type;");