Changeset 7259 for trunk/MagicSoft/Mars

Timestamp:

08/04/05 16:23:53 (19 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/macros/writesequencefile.C (modified) (3 diffs)
• sinope.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -24 +24 @@
      - added (script to make the links for the correct callisto.rc in 
        case when callisto_Dec04Jan05.rc is needed)
+
+   * datacenter/macros/writesequencefile.C:
+     - added writing of ZdMin and ZdMax to the sequencefile
+
+   * sinope.cc
+     - added printing of Usage() in case of missing arguments
+     - added option --outf to make it possible to give the filename 
+       (needed for automation of datacheck)
 
 

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

@@ -257 +257 @@
         return kFALSE;
 
-    TString fname(Form("%s/sequences/%04d/sequence%08d.txt", sequpath.Data(), atoi(data[0])/10000, atoi(data[0])));
+    TString fname(Form("%s/%04d/sequence%08d.txt", sequpath.Data(), atoi(data[0])/10000, atoi(data[0])));
     cout << "Creating " << fname << "..." << flush;
 
@@ -267 +267 @@
     }
 
-    fout << "Sequence:        " << data[0] << endl;
-    fout << "Period:          " << period  << endl;
-    fout << "Night:           " << date    << endl;
-    fout << "LightConditions: " << str[5] << endl;
-    fout << endl;
-    fout << "Start:           " << data[8] << endl;
-    fout << "LastRun:         " << data[1] << endl;
-    fout << "Project:         " << str[0]  << endl;
-    fout << "Source:          " << str[1]  << endl;
-    fout << "L1TriggerTable:  " << str[2]  << endl;
-    fout << "L2TriggerTable:  " << str[3]  << endl;
-    fout << "HvSettings:      " << str[4]  << endl;
-    fout << "NumEvents:       " << data[9] << endl;
+    fout << "Sequence:        " << data[0]  << endl;
+    fout << "Period:          " << period   << endl;
+    fout << "Night:           " << date     << endl;
+    fout << "LightConditions: " << str[5]   << endl;
+    fout << endl;
+    fout << "Start:           " << data[8]  << endl;
+    fout << "LastRun:         " << data[1]  << endl;
+    fout << "Project:         " << str[0]   << endl;
+    fout << "Source:          " << str[1]   << endl;
+    fout << "ZdMin:           " << data[10] << endl;
+    fout << "ZdMax:           " << data[11] << endl;
+    fout << "L1TriggerTable:  " << str[2]   << endl;
+    fout << "L2TriggerTable:  " << str[3]   << endl;
+    fout << "HvSettings:      " << str[4]   << endl;
+    fout << "NumEvents:       " << data[9]  << endl;
     fout << endl;
 
@@ -327 +329 @@
     TString query(Form("SELECT fSequenceFirst, fSequenceLast, fProjectKEY, fSourceKEY,"
                        " fL1TriggerTableKEY, fL2TriggerTableKEY, fHvSettingsKEY, "
-                       " fLightConditionsKEY, fRunStart, fNumEvents"
+                       " fLightConditionsKEY, fRunStart, fNumEvents, "
+                       " fZenithDistanceMin, fZenithDistanceMax "
                        " FROM Sequences WHERE fSequenceFirst=%d", sequno));
     TSQLResult *res = serv.Query(query);

trunk/MagicSoft/Mars/sinope.cc

@@ -109 +109 @@
 
 TString kOutpath="";
+TString kOutfile="";
 MStatusDisplay *d=0;
 
@@ -220 +221 @@
     gLog << "                             [default=standard path in datacenter]" << endl;
     gLog << "   --out=path                Path to write the all results to [def=local path]" << endl;
+    gLog << "   --outf=filename           Filename of the outputfiles [def=sinope{runnumber}.*]" << endl;
     gLog << "   --num={number}            Number of events to process (default=1000)" << endl;
     gLog << "   --print-seq               Print Sequence information" << endl;
@@ -289 +291 @@
     const TString kInpathD    = arg.GetStringAndRemove("--ind=",  "");
     /*const TString*/ kOutpath    = arg.GetStringAndRemove("--out=",  "");
+    /*const TString*/ kOutfile    = arg.GetStringAndRemove("--outf=",  "");
 
     const Int_t   kNumEvents  = arg.GetIntAndRemove("--num=", header.GetNumEvents());
@@ -299 +302 @@
         arg.Print("options");
         gLog << endl;
+        Usage();
         return 2;
     }
@@ -306 +310 @@
         gLog << warn << "ERROR - No '--run=' option given... required." << endl;
         gLog << endl;
+        Usage();
         return 2;
     }
@@ -312 +317 @@
         gLog << warn << "ERROR - No '--date=' option given... required." << endl;
         gLog << endl;
+        Usage();
         return 2;
     }
@@ -361 +367 @@
     if (!kOutpath.EndsWith("/"))
         kOutpath += "/";
-    kOutpath += Form("sinope%08d.", kRunNumber);
+    if (kOutfile.IsNull())
+        kOutpath += Form("sinope%08d.", kRunNumber);
+    else
+        kOutpath += kOutfile+".";
 
     if (!kOverwrite)