Changeset 19848 for trunk/Mars/ceres.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/ceres.cc (modified) (4 diffs)

trunk/Mars/ceres.cc

@@ -148 +148 @@
     gLog.Setup(arg);
 
-    StartUpMessage();
+    const Bool_t kCheckOnly = arg.HasOnlyAndRemove("--check");
+
+    if (!kCheckOnly)
+        StartUpMessage();
 
     if (arg.HasOnly("-V") || arg.HasOnly("--version"))
@@ -159 +162 @@
     }
 
-    const Bool_t  kBatch      = arg.HasOnlyAndRemove("-b");
+    const Bool_t  kBatch      = arg.HasOnlyAndRemove("-b") || kCheckOnly;
     //const Int_t   kCompLvl   = arg.GetIntAndRemove("--comp=", 1);
-    const Bool_t  kForce      = arg.HasOnlyAndRemove("-ff");
+    const Bool_t  kForce      = arg.HasOnlyAndRemove("-ff") && !kCheckOnly;
     const Bool_t  kDebugMem   = arg.HasOnlyAndRemove("--debug-mem");
     const Bool_t  kNullOut    = arg.HasOnlyAndRemove("--dev-null");
@@ -340 +343 @@
     MArray::Class()->IgnoreTObjectStreamer();
     MParContainer::Class()->IgnoreTObjectStreamer();
+
+    if (kCheckOnly)
+        gROOT->SetBatch();
 
     TApplication app("ceres", &argc, argv);
@@ -381 +387 @@
         // job.SetPathIn(kInpath); // not yet needed
 
-        if (!job.Process(arg, seq))
-        {
-            gLog << err << "Calculation of ceres failed." << endl << endl;
+        if (!job.Process(arg, seq, kCheckOnly))
+        {
+            if (job.GetDisplay())
+                delete d;
+
+            if (!kCheckOnly)
+                gLog << err << "Calculation of ceres failed." << endl << endl;
             return 2;
         }