Changeset 9497 for trunk/MagicSoft/Mars

Timestamp:

08/18/09 14:14:53 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• Makefile (modified) (1 diff)
• NEWS (modified) (2 diffs)
• mbase/MEvtLoop.cc (modified) (4 diffs)
• mjobs/MJCut.cc (modified) (1 diff)
• mjobs/MJob.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2009/08/18 Thomas Bretz
+
+   * Makefile:
+     - replaced $OSTYPE by a call to "uname -s" converted to lower
+       case for compatibility
+
+   * mjobs/MJob.cc:
+     - output the name of the resoruce file in SetupEnv for convinience
+
+   * mjobs/MJCut.cc:
+     - write command line to output
+
+   * mbase/MEvtLoop.cc:
+     - improved some output
+
+
+
  2009/08/14 Daniela Dorner
 
@@ -179 +196 @@
      - added getter for command line
 
-   * mjobs/MJCalibration.cc, mjobs/MJCut.cc, mjobs/MJSpectrum.cc,
+   * mjobs/MJCalibration.cc, mjobs/MJSpectrum.cc,
      mjobs/MJStar.cc, mjobs/MJCalibrateSignal.cc:
      - write command line to output

trunk/MagicSoft/Mars/Makefile

@@ -15 +15 @@
 #
 #
+
+OSTYPE=$(shell uname -s | tr '[:upper:]' '[:lower:]')
+
 include Makefile.conf.$(OSTYPE)
 include Makefile.conf.general

trunk/MagicSoft/Mars/NEWS

@@ -19 +19 @@
 
    * All programs now store the command line as TNamed "CommandLine"
+
+   * the environment variable OSTYPE should now be obsolete. Instead
+     the output of "uname -s" converted to lower cases is used
 
  ;showplot:
@@ -103 +106 @@
 
    * jobmanager can be used more flexible now: via environnent variable
-     $AUTOMATIONSETUO more than one jobmanager per user can be started
+     $AUTOMATIONSETUP more than one jobmanager per user can be started
      using the same MARS version
      Usage: export AUTOMATIONSETUP=mysetup ; /fullpath/jobmanager

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -1030 +1030 @@
     prefix += ".";
 
-    *fLog << inf << "Reading resources for " << prefix /*TEnv::fRcName << " from " << env.GetRcName()*/ << endl;
+    *fLog << inf << "Looking for resources with prefix " << prefix /*TEnv::fRcName << " from " << env.GetRcName()*/ << endl;
 
     fLog->ReadEnv(env, prefix, print);
@@ -1042 +1042 @@
     if (fParList->ReadEnv(env, prefix, print)==kERROR)
     {
-        *fLog << err << "ERROR - Reading Environment file." << endl;
+        *fLog << err << "ERROR - Reading resource file." << endl;
         return kFALSE;
     }
@@ -1100 +1100 @@
     prefix += ".";
 
-    *fLog << inf << "Writing resources: " << prefix /*TEnv::fRcName << " to " << env.GetRcName()*/ << endl;
+    *fLog << inf << "Writing resources with prefix " << prefix /*TEnv::fRcName << " to " << env.GetRcName()*/ << endl;
 
     fLog->WriteEnv(env, prefix, print);
@@ -1113 +1113 @@
     if (fParList->WriteEnv(env, prefix, print)!=kTRUE)
     {
-        *fLog << err << "ERROR - Writing Environment file." << endl;
+        *fLog << err << "ERROR - Writing resource file." << endl;
         return kFALSE;
     }

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -320 +320 @@
     if (fDisplay)
         arr.Add(fDisplay);
+
+    TNamed cmdline("CommandLine", fCommandLine.Data());
+    arr.Add(&cmdline);
 
     const Int_t num = set.GetNumAnalysis();

trunk/MagicSoft/Mars/mjobs/MJob.cc

@@ -381 +381 @@
         return kTRUE;
 
+    *fLog << all << "Evaluating resources from: " << fEnv->GetRcName() << endl;
+
     if (!loop.ReadEnv(*fEnv, fEnvPrefix, fEnvDebug>2))
         return kFALSE;