Changeset 9268 for trunk/MagicSoft/Mars

Timestamp:

01/26/09 10:54:04 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• BaseLinkDef.h (modified) (1 diff)
• MParContainer.cc (modified) (1 diff)
• MParEnv.cc (added)
• MParEnv.h (added)
• MParList.cc (modified) (5 diffs)
• MParameters.cc (modified) (3 diffs)
• MParameters.h (modified) (3 diffs)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/BaseLinkDef.h

@@ -89 +89 @@
 #pragma link C++ class MParameterD+;
 #pragma link C++ class MParameterDerr+;
+
+#pragma link C++ class MParEnv+;
 #pragma link C++ class MParEmulated+;
 

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -920 +920 @@
     // Check For: Job4.MClassName.Varname
     if (print)
-        *fLog << all << "Testing Prefix+ClasName: " << prefix+ClassName() << endl;
+        *fLog << all << "Testing Prefix+ClassName: " << prefix+ClassName() << endl;
     rc = ReadEnv(env, prefix+ClassName(), print);
     if (rc==kERROR || rc==kTRUE)

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -51 +51 @@
 
 #include "MIter.h"
+#include "MParEnv.h"
 #include "MTaskList.h"
 
@@ -349 +350 @@
 TObject *MParList::FindObject(const char *name) const
 {
-    return fContainer->FindObject(name);
+    TObject *obj = fContainer->FindObject(name);
+    const MParEnv *env = dynamic_cast<const MParEnv*>(obj);
+    return env ? env->GetCont() : obj;
 }
 
@@ -358 +361 @@
 TObject *MParList::FindObject(const TObject *obj) const
 {
-    return fContainer->FindObject(obj);
+    TObject *ret = fContainer->FindObject(obj);
+    const MParEnv *env = dynamic_cast<const MParEnv*>(ret);
+    return env ? env->GetCont() : ret;
 }
 
@@ -370 +375 @@
 TObject *MParList::FindObject(const char *name, const char *classname) const
 {
-    TObject *obj = fContainer->FindObject(name);
+    TObject *obj = FindObject(name);
 
     if (!obj)
@@ -391 +396 @@
 TObject *MParList::FindObject(const TObject *obj, const char *classname) const
 {
-    TObject *nobj = fContainer->FindObject(obj);
+    TObject *nobj = FindObject(obj);
 
     if (!nobj)

trunk/MagicSoft/Mars/mbase/MParameters.cc

@@ -81 +81 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Print value of container.
+//
 void MParameterD::Print(Option_t *) const
 {
@@ -86 +90 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Print value and error of container.
+//
 void MParameterDerr::Print(Option_t *) const
 {
@@ -91 +99 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Print value of container.
+//
 void MParameterI::Print(Option_t *) const
 {
     *fLog << all << GetDescriptor() << ":  Val=" << fVal << endl;
 }
+
+// --------------------------------------------------------------------------
+//
+// MParameterD.Val: 55.7
+//
+Int_t MParameterD::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
+{
+    Bool_t rc = kFALSE;
+    if (IsEnvDefined(env, prefix, "Val", print))
+    {
+        rc = kTRUE;
+        fVal = GetEnvValue(env, prefix, "Val", fVal);
+    }
+    return rc;
+}
+
+// --------------------------------------------------------------------------
+//
+// MParameterD.Val: 55.7
+// MParameterD.Err: 12.3
+//
+Int_t MParameterDerr::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
+{
+    Int_t rc = MParameterD::ReadEnv(env, prefix, print);
+    if (rc==kERROR)
+        return kERROR;
+
+    if (IsEnvDefined(env, prefix, "Err", print))
+    {
+        rc = kTRUE;
+        fErr = GetEnvValue(env, prefix, "Err", fErr);
+    }
+    return rc;
+}
+
+// --------------------------------------------------------------------------
+//
+// MParameterD.Val: 42
+//
+Int_t MParameterI::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
+{
+    Bool_t rc = kFALSE;
+    if (IsEnvDefined(env, prefix, "Val", print))
+    {
+        rc = kTRUE;
+        fVal = GetEnvValue(env, prefix, "Val", fVal);
+    }
+    return rc;
+}

trunk/MagicSoft/Mars/mbase/MParameters.h

@@ -10 +10 @@
 private:
     Double_t fVal;
+
+protected:
+    Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print);
 
 public:
@@ -29 +32 @@
     Double_t fErr;
 
+    Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print);
+
 public:
     MParameterDerr(const char *name=NULL, const char *title=NULL);
@@ -45 +50 @@
 private:
     Int_t fVal;
+
+    Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print);
 
 public:

trunk/MagicSoft/Mars/mbase/Makefile

@@ -34 +34 @@
            MParContainer.cc \
            MParEmulated.cc \
+           MParEnv.cc \
            MParameters.cc \
            MInputStreamID.cc \