Changeset 7099 for trunk/MagicSoft/Mars/mjobs

Timestamp:

05/27/05 16:33:19 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJPedestal.cc (modified) (5 diffs)
• MJSpectrum.cc (modified) (1 diff)
• MJob.cc (modified) (3 diffs)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -777 +777 @@
     SetNoStorage(GetEnv("DisableOutput", IsNoStorage()));
 
+    // Setup an environment task
     MTaskEnv tenv("ExtractSignal");
     tenv.SetDefault(fExtractor);
 
-    if (tenv.ReadEnv(*GetEnv(), GetEnvPrefix()+".ExtractSignal", GetEnvDebug()>2)==kERROR)
+    // check the resource file for it
+    if (CheckEnv(tenv)==kERROR)
         return kFALSE;
 
+//    if (tenv.ReadEnv(*GetEnv(), GetEnvPrefix()+".ExtractSignal", GetEnvDebug()>2)==kERROR)
+//        return kFALSE;
+
+    // If the resource file didn't change the default we are done
     if (fExtractor==tenv.GetTask())
         return kTRUE;
 
+    // If it changed the default check its inheritance...
     if (!tenv.GetTask()->InheritsFrom(MExtractor::Class()))
     {
@@ -792 +799 @@
     }
 
+    // ..and store it
     SetExtractor((MExtractor*)tenv.GetTask());
 
@@ -973 +981 @@
     }
 
-    *fLog << inf;
-    fLog->Separator(GetDescriptor());
-    *fLog << "Calculate pedestal from Sequence #";
-    *fLog << fSequence.GetSequence() << endl << endl;
-
-    if (!CheckEnv())
-        return kFALSE;
-
     // --------------------------------------------------------------------------------
 
@@ -992 +992 @@
 
     // --------------------------------------------------------------------------------
+
+    if (!CheckEnv())
+        return kFALSE;
 
     MParList  plist;
@@ -1087 +1090 @@
             return kFALSE;
 
+        // The requested setup might have been overwritten
+        if (CheckEnv(*fExtractor)==kERROR)
+            return kFALSE;
+
         *fLog << all;
-        *fLog << underline << "Signal Extractor found in calibration file:" << endl;
+        *fLog << underline << "Signal Extractor found in calibration file and setup:" << endl;
         fExtractor->Print();
         *fLog << endl;

trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc

@@ -170 +170 @@
     fLog->Separator("Initialize energy weighting");
 
-    MParList l;
-    l.AddToList(&w);
-    if (!CheckEnv(l))
+    if (!CheckEnv(w))
     {
         *fLog << err << "ERROR - Reading resources for MMcSpectrumWeight failed." << endl;

trunk/MagicSoft/Mars/mjobs/MJob.cc

@@ -47 +47 @@
 #include "MLogManip.h"
 
+#include "MParList.h"
 #include "MEvtLoop.h"
 
@@ -195 +196 @@
 }
 
+//------------------------------------------------------------------------
+//
+// Returns the result of c.ReadEnv(*fEnv, fEnvPrefix, fEnvDebug>2)
+// By adding the container first to a MParList it is ensured that
+// all levels are checked.
+//
 Bool_t MJob::CheckEnv(MParContainer &c) const
 {
@@ -200 +207 @@
         return kTRUE;
 
-    return c.ReadEnv(*fEnv, fEnvPrefix, fEnvDebug>2);
+    // Make sure that all levels are checked
+    MParList l;
+    l.AddToList(&c);
+    return l.ReadEnv(*fEnv, fEnvPrefix+".", fEnvDebug>2);
 }
 

trunk/MagicSoft/Mars/mjobs/Makefile

@@ -23 +23 @@
            -I../mbadpixels -I../msignal -I../mraw -I../mpedestal -I../mtools \
            -I../mimage -I../mpointing -I../mastro -I../mfbase -I../mhvstime \
-           -I../mtrigger -I../mmuon
+           -I../mtrigger -I../mmuon -I../mmc
 
 SRCFILES = MSequence.cc \