Changeset 19848 for trunk/Mars/mjobs/MJSimulation.cc

Timestamp:

11/01/19 14:18:10 (5 years ago)

Author:

tbretz

Message:

Make a public access to MCorsikaRead::CalcNumEvents possible. This allows to use it to check whether all files are valid. Added the new option '--check' to ceres for that. Copy '-tel' to the file names. This is more conevenient in reading them.

File:

• trunk/Mars/mjobs/MJSimulation.cc (modified) (5 diffs)

trunk/Mars/mjobs/MJSimulation.cc

@@ -396 +396 @@
 }
 
-Bool_t MJSimulation::Process(const MArgs &args, const MSequence &seq)
+Bool_t MJSimulation::Process(const MArgs &args, const MSequence &seq, Bool_t checkonly)
 {
     // --------------------------------------------------------------------------------
@@ -409 +409 @@
     // - description of the job itself
     // - list of the to processed sequence
+    if (!checkonly)
+        fLog->Separator(GetDescriptor());
+
     *fLog << inf;
-    fLog->Separator(GetDescriptor());
-
     if (!CheckEnv())
         return kFALSE;
@@ -418 +419 @@
         *fLog << fSequence.GetFileName() << endl;
     else
-        *fLog << "Input: " << args.GetNumArguments() << "-files" << endl;
+        *fLog << "Input: " << args.GetNumArguments() << " file(s)" << endl;
     *fLog << endl;
 
@@ -550 +551 @@
         return kFALSE;
     }
+
+    if (checkonly)
+        return read.CalcNumTotalEvents();
 
     // --------------------------------------------------------------------------------
@@ -823 +827 @@
 
     const char *regex = fRunNumber<0 ?
-        "s/[cC][eE][rR]([0-9]+)(-[tT][eE][lL]([0-9]+))?/%s\\/00$1.%03d%%s_MonteCarlo$3.root/" :
-        "s/[cC][eE][rR][0-9]+([0-9][0-9][0-9])(-[tT][eE][lL]([0-9]+))?/%s\\/%08d.$1%%s_MonteCarlo$3.root/";
+        "s/[cC][eE][rR]([0-9]+)(-[tT][eE][lL]([0-9]+))?/%s\\/00$1.%03d%%s_MonteCarlo$2.root/" :
+        "s/[cC][eE][rR][0-9]+([0-9][0-9][0-9])(-[tT][eE][lL]([0-9]+))?/%s\\/%08d.$1%%s_MonteCarlo$2.root/";
 
     const char *fmt = fFileOut.IsNull() ?