Changeset 4601 for trunk/MagicSoft/Mars/mbase

Timestamp:

08/12/04 16:41:37 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• BaseLinkDef.h (modified) (1 diff)
• MEvtLoop.cc (modified) (3 diffs)
• MEvtLoop.h (modified) (1 diff)
• MGList.cc (modified) (8 diffs)
• MGList.h (modified) (1 diff)
• MLog.cc (modified) (1 diff)
• MParContainer.cc (modified) (2 diffs)
• MParContainer.h (modified) (1 diff)
• MParList.cc (modified) (2 diffs)
• MParList.h (modified) (1 diff)
• MTaskEnv.cc (added)
• MTaskEnv.h (added)
• MTaskList.cc (modified) (2 diffs)
• MTaskList.h (modified) (1 diff)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/BaseLinkDef.h

@@ -33 +33 @@
 
 #pragma link C++ class MTask+;
+#pragma link C++ class MTaskEnv+;
 #pragma link C++ class MTaskInteractive+;
 #pragma link C++ class MTaskList+;

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -936 +936 @@
 //          all Mars classes.
 //
-Bool_t MEvtLoop::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
+Int_t MEvtLoop::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
 {
     if (!prefix.IsNull())
@@ -946 +946 @@
     *fLog << inf << "Reading resources for " << prefix /*TEnv::fRcName << " from " << env.GetRcName()*/ << endl;
 
+    fLog->ReadEnv(env, prefix, print);
+
     if (fParList->ReadEnv(env, prefix, print)==kERROR)
     {
@@ -951 +953 @@
         return kFALSE;
     }
-
-    fLog->ReadEnv(env, prefix, print);
 
     return kTRUE;

trunk/MagicSoft/Mars/mbase/MEvtLoop.h

@@ -77 +77 @@
     void Print(Option_t *opt="") const;
 
-    Bool_t ReadEnv(const TEnv &env, TString prefix="", Bool_t print=kFALSE);
+    Int_t  ReadEnv(const TEnv &env, TString prefix="", Bool_t print=kFALSE);
     Bool_t WriteEnv(TEnv &env, TString prefix="", Bool_t print=kFALSE) const;
 

trunk/MagicSoft/Mars/mbase/MGList.cc

@@ -37 +37 @@
 #include <iostream>
 
+#include <TROOT.h>
 #include <TClass.h>
 #include <TGClient.h>
@@ -45 +46 @@
 
 using namespace std;
+
+// --------------------------------------------------------------------------
+//
+//  Add the list to the global list of cleanups
+//  objects in the list.
+//
+MGList::MGList() : TList()
+{
+    gROOT->GetListOfCleanups()->Add(this);
+}
 
 // --------------------------------------------------------------------------
@@ -159 +170 @@
 
     TList::Add(obj);
+    obj->SetBit(kMustCleanup);
 }
 
@@ -180 +192 @@
 
     TList::Add(obj, opt);
+    obj->SetBit(kMustCleanup);
 }
 
@@ -187 +200 @@
 //   - The picture is freed as often as it was retrieved from gClient
 //
-void MGList::AddPicture(const TGPicture *pic, const char *name)
+void MGList::AddPicture(TGPicture *pic, const char *name)
 {
     //
@@ -204 +217 @@
     // Add the picture to the list
     //
-    TList::Add(const_cast<TGPicture*>(pic));
+    TList::Add(pic);
+    pic->SetBit(kMustCleanup);
 }
 
@@ -221 +235 @@
 const TGPicture *MGList::GetPicture(const char *name)
 {
-    const TGPicture *pic = gClient->GetPicture(name);
+    TGPicture *pic = const_cast<TGPicture*>(gClient->GetPicture(name));
     AddPicture(pic, name);
     return pic;
@@ -240 +254 @@
 const TGPicture *MGList::GetPicture(const char *name, Int_t width, Int_t height)
 {
-    const TGPicture *pic = gClient->GetPicture(name, width, height);
+    TGPicture *pic = const_cast<TGPicture*>(gClient->GetPicture(name, width, height));
     AddPicture(pic, name);
     return pic;

trunk/MagicSoft/Mars/mbase/MGList.h

@@ -15 +15 @@
     Bool_t    IsExisting(TObject *obj) const;
 
-    void      AddPicture(const TGPicture *pic, const char *name);
+    void      AddPicture(TGPicture *pic, const char *name);
 
 public:
-    MGList() : TList() {}
-    virtual ~MGList();
+    MGList();
+    ~MGList();
 
     void Add(TObject *obj);

trunk/MagicSoft/Mars/mbase/MLog.cc

@@ -544 +544 @@
 void MLog::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
 {
-    if (!prefix.IsNull())
-        prefix += ".";
-    prefix += "MLog";
-
     MParContainer mlog("MLog");
 
-    if (mlog.IsEnvDefined(env, prefix, "VerbosityLevel", print))
-        SetDebugLevel(mlog.GetEnvValue(env, prefix, "VerbosityLevel", 2));
-
-    if (mlog.IsEnvDefined(env, prefix, "DebugLevel", print))
-        gDebug = mlog.GetEnvValue(env, prefix, "DebugLevel", 0);
-
-    if (mlog.IsEnvDefined(env, prefix, "NoColors", print))
-        if (mlog.GetEnvValue(env, prefix, "NoColors", 1)>0)
-            SetNoColors();
+    if (mlog.IsEnvDefined(env, prefix+"MLog", "VerbosityLevel", print))
+        SetDebugLevel(mlog.GetEnvValue(env, prefix+"MLog", "VerbosityLevel", 2));
+    else
+        if (mlog.IsEnvDefined(env, "MLog", "VerbosityLevel", print))
+            SetDebugLevel(mlog.GetEnvValue(env, "MLog", "VerbosityLevel", 2));
+
+    if (mlog.IsEnvDefined(env, prefix+"MLog", "DebugLevel", print))
+        gDebug = mlog.GetEnvValue(env, prefix+"MLog", "DebugLevel", 0);
+    else
+        if (mlog.IsEnvDefined(env, "MLog", "DebugLevel", print))
+            gDebug = mlog.GetEnvValue(env, "MLog", "DebugLevel", 0);
+
+    if (mlog.IsEnvDefined(env, prefix+"MLog", "NoColors", print))
+        SetNoColors(mlog.GetEnvValue(env, prefix+"MLog", "NoColors", kFALSE));
+    else
+        if (mlog.IsEnvDefined(env, "MLog", "NoColors", print))
+            SetNoColors(mlog.GetEnvValue(env, "MLog", "NoColors", kFALSE));
 }
 

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -569 +569 @@
 //          all Mars classes.
 //
-Bool_t MParContainer::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
+// Return values:
+//  kTRUE:  Environment string found
+//  kFALSE: Environment string not found
+//  kERROR: Error occured, eg. environment invalid
+//
+// Overload this if you don't want to control the level of setup-string. In
+// this case ReadEnv gets called with the different possibilities, see TestEnv.
+//
+Int_t MParContainer::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
 {
     if (!IsEnvDefined(env, prefix, "", print))
@@ -609 +617 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Take the prefix and call ReadEnv for:
+//   prefix.containername
+//   prefix.classname
+//   containername
+//   classname
+//
+//  The existance of an environment variable is done in this order. If
+//  ReadEnv return kTRUE the existance of the container setup is assumed and
+//  the other tests are skipped. If kFALSE is assumed the sequence is
+//  continued. In case of kERROR failing of the setup from a file is assumed.
+//
+// Overload this if you want to control the handling of level of setup-string
+// mentioned above. In this case ReadEnv gets never called if you don't call
+// it explicitly.
+//
+Int_t MParContainer::TestEnv(const TEnv &env, TString prefix, Bool_t print)
+{
+    if (print)
+        *fLog << all << "Testing Prefix+ContName: " << prefix+GetName() << endl;
+    Int_t rc = ReadEnv(env, prefix+GetName(), print);
+    if (rc==kERROR || rc==kTRUE)
+        return rc;
+
+    // Check For: Job4.MClassName.Varname
+    if (print)
+        *fLog << all << "Testing Prefix+ClasName: " << prefix+ClassName() << endl;
+    rc = ReadEnv(env, prefix+ClassName(), print);
+    if (rc==kERROR || rc==kTRUE)
+        return rc;
+
+    // Check For: ContainerName.Varname
+    if (print)
+        *fLog << all << "Testing ContName: " << GetName() << endl;
+    rc = ReadEnv(env, GetName(), print);
+    if (rc==kERROR || rc==kTRUE)
+        return rc;
+
+    // Check For: MClassName.Varname
+    if (print)
+        *fLog << all << "Testing ClassName: " << ClassName() << endl;
+    rc = ReadEnv(env, ClassName(), print);
+    if (rc==kERROR || rc==kTRUE)
+        return rc;
+
+    // Not found
+    return kFALSE;
+}
+
 Bool_t MParContainer::IsEnvDefined(const TEnv &env, TString prefix, TString postfix, Bool_t print) const
 {

trunk/MagicSoft/Mars/mbase/MParContainer.h

@@ -118 +118 @@
     virtual void SetNames(TObjArray &arr);
 
-    virtual Bool_t ReadEnv(const TEnv &env, TString prefix, Bool_t print=kFALSE);
+    virtual Int_t  TestEnv(const TEnv &env, TString prefix, Bool_t print=kFALSE);
+    virtual Int_t  ReadEnv(const TEnv &env, TString prefix, Bool_t print=kFALSE);
     virtual Bool_t WriteEnv(TEnv &env, TString prefix, Bool_t print=kFALSE) const;
 

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -853 +853 @@
 //          all Mars classes.
 //
-Bool_t MParList::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
+Int_t MParList::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
 {
     if (print)
@@ -870 +870 @@
         }
 
-        // Check For: Job4.ContainerName.Varname
-        if (print)
-            *fLog << all << "Testing: " << prefix+cont->GetName() << endl;
-        Bool_t rc = cont->ReadEnv(env, prefix+cont->GetName(), print);
-        if (rc==kERROR)
+        if (cont->TestEnv(env, prefix, print)==kERROR)
             return kERROR;
-        if (rc==kTRUE)
-            continue;
-
-        // Check For: Job4.MClassName.Varname
-        if (print)
-            *fLog << all << "Testing: " << prefix+cont->ClassName() << endl;
-        rc = cont->ReadEnv(env, prefix+cont->ClassName(), print);
-        if (rc==kERROR)
-            return kERROR;
-        if (rc==kTRUE)
-            continue;
-
-        // Check For: ContainerName.Varname
-        if (print)
-            *fLog << all << "Testing: " << cont->GetName() << endl;
-        rc = cont->ReadEnv(env, cont->GetName(), print);
-        if (rc==kERROR)
-            return kERROR;
-        if (rc==kTRUE)
-            continue;
-
-        // Check For: MClassName.Varname
-        if (print)
-            *fLog << all << "Testing: " << cont->ClassName() << endl;
-        rc = cont->ReadEnv(env, cont->ClassName(), print);
-        if (rc==kERROR)
-            return kERROR;
-        if (rc==kTRUE)
-            continue;
     }
 

trunk/MagicSoft/Mars/mbase/MParList.h

@@ -91 +91 @@
     void SavePrimitive(ofstream &out, Option_t *o="");
 
-    Bool_t ReadEnv(const TEnv &env, TString prefix, Bool_t print=kFALSE);
+    Int_t  ReadEnv(const TEnv &env, TString prefix, Bool_t print=kFALSE);
     Bool_t WriteEnv(TEnv &env, TString prefix, Bool_t print=kFALSE) const;
 

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -734 +734 @@
 //          all Mars classes.
 //
-Bool_t MTaskList::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
+Int_t MTaskList::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
 {
     if (print)
@@ -751 +751 @@
         }
 
-        // Check For: Job4.ContainerName.Varname
-        if (print)
-            *fLog << all << "Testing: " << prefix+cont->GetName() << endl;
-        Bool_t rc = cont->ReadEnv(env, prefix+cont->GetName(), print);
-        if (rc==kERROR)
+        if (cont->TestEnv(env, prefix, print)==kERROR)
             return kERROR;
-        if (rc==kTRUE)
-            continue;
-
-        // Check For: Job4.MClassName.Varname
-        if (print)
-            *fLog << all << "Testing: " << prefix+cont->ClassName() << endl;
-        rc = cont->ReadEnv(env, prefix+cont->ClassName(), print);
-        if (rc==kERROR)
-            return kERROR;
-        if (rc==kTRUE)
-            continue;
-
-        // Check For: ContainerName.Varname
-        if (print)
-            *fLog << all << "Testing: " << cont->GetName() << endl;
-        rc = cont->ReadEnv(env, cont->GetName(), print);
-        if (rc==kERROR)
-            return kERROR;
-        if (rc==kTRUE)
-            continue;
-
-        // Check For: MClassName.Varname
-        if (print)
-            *fLog << all << "Testing: " << cont->ClassName() << endl;
-        rc = cont->ReadEnv(env, cont->ClassName(), print);
-        if (rc==kERROR)
-            return kERROR;
-        if (rc==kTRUE)
-            continue;
     }
 

trunk/MagicSoft/Mars/mbase/MTaskList.h

@@ -78 +78 @@
     void SetNames(TObjArray &arr);
 
-    Bool_t ReadEnv(const TEnv &env, TString prefix, Bool_t print=kFALSE);
+    Int_t  ReadEnv(const TEnv &env, TString prefix, Bool_t print=kFALSE);
     Bool_t WriteEnv(TEnv &env, TString prefix, Bool_t print=kFALSE) const;
 

trunk/MagicSoft/Mars/mbase/Makefile

@@ -30 +30 @@
            MInputStreamID.cc \
            MTask.cc \
+           MTaskEnv.cc \
            MTaskInteractive.cc \
            MTaskList.cc \