Changeset 6553 for trunk/MagicSoft/Mars/mjobs

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJPedestal.cc (modified) (1 diff)
• MJob.cc (modified) (9 diffs)
• MJob.h (modified) (5 diffs)

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -802 +802 @@
     tenv.SetDefault(fExtractor);
 
-    if (tenv.ReadEnv(*GetEnv(), GetEnvPrefix()+".ExtractSignal", GetEnvDebug())==kERROR)
+    if (tenv.ReadEnv(*GetEnv(), GetEnvPrefix()+".ExtractSignal", GetEnvDebug()>2)==kERROR)
         return kFALSE;
 

trunk/MagicSoft/Mars/mjobs/MJob.cc

@@ -29 +29 @@
 // A base class for jobs
 //
+// SetDebugEnv(0) // switch off debugging
+// SetDebugEnv(1) // reserved
+// SetDebugEnv(2) // print untouched resources after evtloop resources setup
+// SetDebugEnv(3) // do 2) and debug setting env completely
+//
 /////////////////////////////////////////////////////////////////////////////
 #include "MJob.h"
 
-#include <TEnv.h>
+#include "MEnv.h"
 #include <TFile.h>
 #include <TSystem.h>
@@ -54 +59 @@
 // Sets fDataFlag to 0
 //
-MJob::MJob(const char *name, const char *title) : fEnv(0), fOverwrite(kFALSE), fMaxEvents(0)
+MJob::MJob(const char *name, const char *title) : fEnv(0), fEnvDebug(0), fOverwrite(kFALSE), fMaxEvents(0)
   
 {
@@ -61 +66 @@
 }
 
+void MJob::ClearEnv()
+{
+    if (fEnv && TestBit(kIsOwner))
+        delete fEnv;
+    ResetBit(kIsOwner);
+    fEnv=0;
+}
+
 MJob::~MJob()
 {
-    if (fEnv)
-        delete fEnv;
+    ClearEnv();
 }
 
 Bool_t MJob::SetEnv(const char *env, const char *prefix)
 {
-    if (fEnv)
-    {
-        delete fEnv;
-        fEnv = 0;
-    }
+    ClearEnv();
 
     const Bool_t fileexist = !gSystem->AccessPathName(env, kFileExists);
@@ -82 +90 @@
     }
 
-    fEnv = new TEnv(env);
+    fEnv = new MEnv(env);
+    SetBit(kIsOwner);
 
     fEnvPrefix = prefix;
@@ -94 +103 @@
 }
 
+void MJob::SetEnv(MEnv *env, const char *prefix)
+{
+    ClearEnv();
+
+    fEnv = env;
+
+    fEnvPrefix = prefix;
+    if (!prefix)
+        fEnvPrefix = fName.First(' ')>0 ? fName(0, fName.First(' ')) : fName;
+
+    if (fEnvPrefix.EndsWith("."))
+        fEnvPrefix.Remove(fEnvPrefix.Length()-1);
+}
+
 void MJob::FixPath(TString &path) const
 {
@@ -123 +146 @@
 }
 
+const TEnv *MJob::GetEnv() const
+{
+    return static_cast<const TEnv *const>(fEnv);
+}
+
 Int_t MJob::GetEnv(const char *name, Int_t dflt) const
 {
@@ -140 +168 @@
 Bool_t MJob::HasEnv(const char *name) const
 {
-    return IsEnvDefined(*fEnv, fEnvPrefix, name, fEnvDebug);//fEnv->Lookup(Form("%s%s", fEnvPrefix.Data(), name));
+    return IsEnvDefined(*fEnv, fEnvPrefix, name, fEnvDebug>2);//fEnv->Lookup(Form("%s%s", fEnvPrefix.Data(), name));
 }
 
@@ -163 +191 @@
     SetMaxEvents(GetEnv("MaxEvents", fMaxEvents));
     SetOverwrite(GetEnv("Overwrite", fOverwrite));
+    SetEnvDebug( GetEnv("EnvDebug",  fEnvDebug));
 
     return CheckEnvLocal();
@@ -172 +201 @@
         return kTRUE;
 
-    return loop.ReadEnv(*fEnv, fEnvPrefix, fEnvDebug) ? kTRUE : kFALSE;
+    if (!loop.ReadEnv(*fEnv, fEnvPrefix, fEnvDebug>2))
+        return kFALSE;
+
+    if (fEnvDebug>1)
+        fEnv->PrintUntouched();
+
+    return kTRUE;
 }
 

trunk/MagicSoft/Mars/mjobs/MJob.h

@@ -6 +6 @@
 #endif
 
-class TEnv;
+class MEnv;
 class MEvtLoop;
 
@@ -12 +12 @@
 {
 private:
+    enum { kIsOwner = BIT(14) };
+
     void FixPath(TString &path) const;
+    void ClearEnv();
 
-    const TEnv *fEnv;         // Resource file
+    const MEnv *fEnv;         // Resource file
     TString     fEnvPrefix;   // Prefix for resources
-    Bool_t      fEnvDebug;    // Debug setup of resources
+    Int_t       fEnvDebug;    // Debug setup of resources
 
 protected:
-
     TString   fPathOut;       // Directory to write output file to (eg. calib*.root)
     TString   fPathIn;        // Directory to read output from (eg. calib*.root)
@@ -29 +31 @@
     MSequence fSequence;      // Sequence
 
-    const TEnv *GetEnv() const { return fEnv; }
+    const TEnv *GetEnv() const;
+    const MEnv *GetMEnv() const { return fEnv; }
     const TString &GetEnvPrefix() const { return fEnvPrefix; }
-    Bool_t GetEnvDebug() const { return fEnvDebug; }
+    Int_t GetEnvDebug() const { return fEnvDebug; }
 
     Int_t       GetEnv(const char *name, Int_t dflt) const;
@@ -40 +43 @@
     Bool_t SetupEnv(MEvtLoop &loop) const;
     Bool_t CheckEnv();
+    void PrintUntouchedEnv() const;
     virtual Bool_t CheckEnvLocal() { return kTRUE; }
 
@@ -57 +61 @@
     void   SetOverwrite(Bool_t b=kTRUE) { fOverwrite=b; }
     Bool_t SetEnv(const char *env, const char *prefix=0);
-    void   SetEnvDebug(Bool_t b=kTRUE) { fEnvDebug=b; }
+    void   SetEnv(MEnv *env, const char *prefix=0);
+    void   SetEnvDebug(Int_t d=2) { fEnvDebug=d; }
 
     void   SetMaxEvents(Int_t max) { fMaxEvents = max; }