Changeset 9022 for trunk

Timestamp:

07/20/08 18:38:24 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/macros/plotdb.C (modified) (2 diffs)
• mjobs/MJStar.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -71 +71 @@
    * mjobs/MSequenceSQL.[h,cc]:
      - adapted to changes in MSequence
+
+   * datacenter/macros/stage.C
+     - added
+
+   * mjobs/MJStar.cc:
+     - changed displayed title according to the other jobs
+     - changed Setup*Runs to GetRuns
+     - unified output when finished
+     - make sure the weight for the rate tab is not 0
 
 

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

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: plotdb.C,v 1.49 2008-07-20 14:21:40 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: plotdb.C,v 1.50 2008-07-20 17:33:22 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -460 +460 @@
         else
         {
-            TString v(value);
-
-            TString as = v(TPRegexp(" +[aA][sS] +[a-zA-Z0-9]+ *$"));
+            TString  v(value);
+            TPRegexp regexp(" +[aA][sS] +[a-zA-Z0-9]+ *$");
+
+            TString as = v(regexp);
             Ssiz_t  p  = v.Index(as);
 

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -119 +119 @@
 
     if (fDisplay)
+    {
+        TString title = "--  Star: ";
+        title += fSequence.GetSequence();
+        title += "  --";
+        fDisplay->SetTitle(title, kFALSE);
+
         cont.Add(fDisplay);
+    }
 
     const TString oname = Form("star%08d.root", fSequence.GetSequence());
@@ -145 +152 @@
     *fLog << fSequence.GetFileName() << endl;
     *fLog << endl;
-
+ 
     // --------------------------------------------------------------------------------
 
     MDirIter iter;
-    if (fSequence.SetupDatRuns(iter, MSequence::kCalibrated)<=0)
+    if (fSequence.GetRuns(iter, MSequence::kCalibrated)<=0)
         return kFALSE;
 
@@ -269 +276 @@
     // Plot the trigger pattern rates vs. run-number
     MH3 hrate("MRawRunHeader.GetFileID", "MTriggerPattern.GetUnprescaled");
-    hrate.SetWeight("1./MRawRunHeader.GetRunLength");
+    hrate.SetWeight("1./TMath::Max(MRawRunHeader.GetRunLength,1)");
     hrate.SetName("Rate");
     hrate.SetTitle("Event rate after cleaning [Hz];File Id;Trigger Type;");
@@ -546 +553 @@
         return kFALSE;
 
-    *fLog << all << GetDescriptor() << ": Done." << endl;
-    *fLog << endl << endl;
+    *fLog << all << GetDescriptor() << ": Done." << endl << endl << endl;;
 
     return kTRUE;