Changeset 6553 for trunk/MagicSoft/Mars/star.cc

Timestamp:

02/16/05 19:53:21 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/star.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/star.cc

@@ -9 +9 @@
 #include "MLogManip.h"
 
+#include "MEnv.h"
 #include "MArgs.h"
 #include "MArray.h"
@@ -49 +50 @@
     gLog << " Options:" << endl;
     gLog.Usage();
-    gLog << "   --debug-env               Debug setting resources from file" << endl;
+    gLog << "   --debug-env=0             Disable debugging setting resources <default>" << endl;
+    gLog << "   --debug-env[=1]           Display untouched resources after program execution" << endl;
+    gLog << "   --debug-env=2             Display untouched resources after eventloop setup" << endl;
+    gLog << "   --debug-env=3             Debug setting resources from resource file" << endl;
     gLog << "   --debug-mem               Debug memory usage" << endl << endl;
     gLog << endl;
@@ -109 +113 @@
     const Bool_t  kPrintFiles = arg.HasOnlyAndRemove("--print-files");
     const Bool_t  kPrintFound = arg.HasOnlyAndRemove("--print-found");
-    const Bool_t  kDebugEnv   = arg.HasOnlyAndRemove("--debug-env");
     const Bool_t  kDebugMem   = arg.HasOnlyAndRemove("--debug-mem");
+    Int_t  kDebugEnv = arg.HasOnlyAndRemove("--debug-env") ? 1 : 0;
+    kDebugEnv = arg.GetIntAndRemove("--debug-env=", kDebugEnv);
 
     const Bool_t  kQuit       = arg.HasOnlyAndRemove("-q");
@@ -149 +154 @@
     }
 
+    if (gSystem->AccessPathName(kConfig, kFileExists))
+    {
+        gLog << err << "Sorry, config file '" << kConfig << "' doesn't exist." << endl;
+        return -1;
+    }
+
     //
     // Setup sequence and check its validity
@@ -202 +213 @@
     // Do calibration in a block (debug mem)
     //
+    MEnv env(kConfig);
     {
         MJStar job(Form("MJStar #%d", seq.GetSequence()));
         job.SetSequence(seq);
-        job.SetEnv(kConfig);
+        job.SetEnv(&env);
         job.SetEnvDebug(kDebugEnv);
         job.SetDisplay(d);;
@@ -219 +231 @@
         }
 
+        if (kDebugEnv>0)
+            env.PrintUntouched();
+
         if (!job.GetDisplay())
         {