Changeset 4575 for trunk/MagicSoft/Mars/merpp.cc

Timestamp:

08/11/04 10:35:11 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/merpp.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/merpp.cc

@@ -8 +8 @@
 #include "MSqlInsertRun.h"
 #include "MRawFileWrite.h"
-
-#include "MReportFileRead.h"
+#include "MReportFileReadCC.h"
 #include "MWriteRootFile.h"
 
@@ -77 +76 @@
     gLog << "     --start=yyyy-mm-dd/hh:mm:ss.mmm  Start event time for merpping report files" << endl;
     gLog << "     --stop=yyyy-mm-dd/hh:mm:ss.mmm   Stop  event time for merpping report files" << endl;
-    gLog << "     --run=#                          Only data corresponding to this run number" << endl;
+    gLog << "     --run=#                          Only data corresponding to this run number (from RUN-REPORT)" << endl;
+    gLog << "     --runfile=#                      Check that CC file corresponds to this run (from .rep header)" << endl;
+    gLog << "     --sumfile                        Check that CC file is a all night summary (from .rep header)" << endl;
+    gLog << "     --allfiles                       Don't check file type for CC files <default>" << endl;
     gLog << "     --debug[=n]                      Enable root debugging (Default: gDebug=1)" << endl;
     gLog << "     -?, -h, --help                   This help" << endl << endl;
@@ -133 +135 @@
     const Int_t   kRunNumber   = arg.HasOption("--run=") ? arg.GetIntAndRemove("--run=") : -1;
     const TString kSqlDataBase(arg.GetStringAndRemove("--sql="));
+
+    Int_t kRunFile = arg.HasOption("--runfile=") ? arg.GetIntAndRemove("--runfile=") : -1;
+    if (arg.HasOnlyAndRemove("--sumfile"))
+        kRunFile = 0;
 
     if (kTimeStart)
@@ -284 +290 @@
         write = w;
 
-        MReportFileRead *r = new MReportFileRead(kNamein);
+        MReportFileReadCC *r = new MReportFileReadCC(kNamein);
         r->SetTimeStart(kTimeStart);
         r->SetTimeStop(kTimeStop);
@@ -294 +300 @@
         else
         {
+            r->SetRunNumber(kRunFile);
             r->AddToList("MReportCC");
             //r->AddToList("MReportDAQ");