Changeset 19627 for trunk/Mars

Timestamp:

09/05/19 11:38:14 (5 years ago)

Author:

tbretz

Message:

Implemented the possiblity to read a file list instead of a sequence file (using the --list) option and specifying a file with the .txt ending

File:

• trunk/Mars/ceres.cc (modified) (4 diffs)

trunk/Mars/ceres.cc

@@ -76 +76 @@
     gLog << "   --mode=calibration        calibration data (no input files required) or" << endl;
     gLog << "   --mode=data               process data files [default]" << endl << endl;
-    gLog << "   --run-number=#            Optionally set the run number of the run to simulate" << endl;
-    gLog << "   --fits                    Write FITS output files instead of root files." << endl << endl;
+    gLog << "   --run-number=#            Optionally set the run number to simulate" << endl;
+    gLog << "   --fits                    Write FITS output files instead of root files." << endl;
+    gLog << "   --list                    The specified .txt file contains a file list" << endl;
+    gLog << "                              (see MDirIter::ReadFile)." << endl << endl;
     gLog << endl;
 //    gLog << "     -f:  force reading of runheader" << endl;
@@ -177 +179 @@
     const TString kOpMode     = arg.GetStringAndRemove("--mode=", "data");
     const Bool_t  kFitsFile   = arg.HasOnlyAndRemove("--fits");
+    const Bool_t  kFileList   = arg.HasOnlyAndRemove("--list");
 
     Int_t opmode = -1;
@@ -274 +277 @@
     // Setup sequence and check its validity
     //
-    MSequence seq(kSequence, kInpath);
-    if (!kSequence.IsNull())
+    MSequence seq(kFileList ? "" : kSequence, kInpath);
+    if (!kSequence.IsNull() && !kFileList)
     {
         if (kPrintSeq)
@@ -305 +308 @@
     else
     {
+        if (kFileList)
+        {
+            arg.RemoveArgument(0);
+
+            MDirIter Next;
+            Next.ReadList(kSequence);
+
+            TString name;
+            while (!(name=Next()).IsNull())
+                arg.AddEntry(name);
+        }
+
         if (kPrintFiles)
             PrintFiles(arg, kFALSE);