Changeset 5911 for trunk/MagicSoft/Mars/mbase

Timestamp:

01/20/05 14:27:59 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MEvtLoop.cc (modified) (5 diffs)
• MEvtLoop.h (modified) (1 diff)
• MParList.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -972 +972 @@
     fLog->ReadEnv(env, prefix, print);
 
+    if (!fParList)
+    {
+        *fLog << warn << "WARNING - No parameter list to propagate resources to." << endl;
+        return kTRUE;
+    }
+
     if (fParList->ReadEnv(env, prefix, print)==kERROR)
     {
@@ -986 +992 @@
 // If 'config=0' kTRUE is returned.
 //
-Bool_t MEvtLoop::ReadEnv(const char *config)
+Bool_t MEvtLoop::ReadEnv(const char *config, Bool_t print)
 {
     if (!config)
@@ -998 +1004 @@
     }
 
-    return ReadEnv(TEnv(config));
+    return ReadEnv(TEnv(config), "", print);
 }
 
@@ -1033 +1039 @@
     *fLog << inf << "Writing resources: " << prefix /*TEnv::fRcName << " to " << env.GetRcName()*/ << endl;
 
+    fLog->WriteEnv(env, prefix, print);
+
+    if (!fParList)
+    {
+        *fLog << warn << "WARNING - No parameter list to get resources from." << endl;
+        return kTRUE;
+    }
+
+
     if (fParList->WriteEnv(env, prefix, print)!=kTRUE)
     {
@@ -1038 +1053 @@
         return kFALSE;
     }
-
-    fLog->WriteEnv(env, prefix, print);
 
     return kTRUE;

trunk/MagicSoft/Mars/mbase/MEvtLoop.h

@@ -85 +85 @@
     Bool_t WriteEnv(TEnv &env, TString prefix="", Bool_t print=kFALSE) const;
 
-    Bool_t ReadEnv(const char *config);
+    Bool_t ReadEnv(const char *config, Bool_t print=kFALSE);
 
     void RecursiveRemove(TObject *obj);

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -911 +911 @@
 {
     if (print)
-        *fLog << all << "MParList::ReadEnv: " << prefix << " (" << (int)print << ")" << endl;
+        *fLog << all << "MParList::ReadEnv: " << prefix << endl;
 
     MParContainer *cont = NULL;