Changeset 1902

Timestamp:

04/03/03 15:37:41 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• macros/testenv.C (added)
• mbase/MEvtLoop.cc (modified) (1 diff)
• mbase/MParContainer.cc (modified) (2 diffs)
• mbase/MParContainer.h (modified) (1 diff)
• mbase/MParList.cc (modified) (1 diff)
• mbase/MTaskList.cc (modified) (1 diff)
• mfileio/MRead.cc (modified) (3 diffs)
• mhist/MHMatrix.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -6 +6 @@
        floor() is unkown)
 
- 2003/04/02: Thomas Bretz
+
+
+ 2003/04/03: Thomas Bretz
+
+   * mbase/MEvtLopp.cc, mbase/MParContainer.[h,cc], 
+     mbase/MParList.cc, mbase/MTaskList.cc:
+     - changed the stuff for reading steering card - didn't really
+       work like expected
+
+   * mhist/MHMatrix.cc, mfileio/MRead.cc, manalysis/MImgCleanStd.cc:
+     - adapted ReadEnv
 
    * mhist/MHMatrix.[h,cc]:
@@ -22 +32 @@
      - added Clear
      - added Delete
+
+   * mbase/MEvtLoop.cc:
+     - added output of the name
+   
+   * mbase/MLog.[h,cc]:
+     - don't use any pthread stuff if _REENTRANT is not defined
+   
+   * mfileio/MRead.cc, mhist/MHMatrix.cc:
+     - fixed waring for unreachable statement
+   
+   * mhist/MHArray.cc:
+     - fixed: redifinition of default argument
+     
 
 

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -701 +701 @@
         *fLog << warn << "WARNING - Second argument in MEvtLoop::ReadEnv has no meaning... ignored." << endl;
 
-    *fLog << "1: " << "'" << prefix << "'" << (int)print << endl;
-
     prefix = fName;
     prefix += ".";

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -520 +520 @@
         postfix.Insert(0, ".");
 
-    return IsEnvDefined(env, prefix+fName+postfix, print);
+    return IsEnvDefined(env, prefix+postfix, print);
 }
 
@@ -543 +543 @@
 Int_t MParContainer::GetEnvValue(const TEnv &env, TString prefix, TString postfix, Int_t dflt) const
 {
-    return ((TEnv&)env).GetValue(prefix+fName+"."+postfix, dflt);
+    return GetEnvValue(env, prefix+"."+postfix, dflt);
 }
 
 Double_t MParContainer::GetEnvValue(const TEnv &env, TString prefix, TString postfix, Double_t dflt) const
 {
-    return ((TEnv&)env).GetValue(prefix+fName+"."+postfix, dflt);
+    return GetEnvValue(env, prefix+"."+postfix, dflt);
 }
 
 const char *MParContainer::GetEnvValue(const TEnv &env, TString prefix, TString postfix, const char *dflt) const
 {
-    return ((TEnv&)env).GetValue(prefix+fName+"."+postfix, dflt);
-}
+    return GetEnvValue(env, prefix+"."+postfix, dflt);
+}
+
+Int_t MParContainer::GetEnvValue(const TEnv &env, TString prefix, Int_t dflt) const
+{
+    return ((TEnv&)env).GetValue(prefix, dflt);
+}
+
+Double_t MParContainer::GetEnvValue(const TEnv &env, TString prefix, Double_t dflt) const
+{
+    return ((TEnv&)env).GetValue(prefix, dflt);
+}
+
+const char *MParContainer::GetEnvValue(const TEnv &env, TString prefix, const char *dflt) const
+{
+    return ((TEnv&)env).GetValue(prefix, dflt);
+}

trunk/MagicSoft/Mars/mbase/MParContainer.h

@@ -113 +113 @@
     const char *GetEnvValue(const TEnv &env, TString prefix, TString postfix, const char *dflt) const;
 
+    Int_t       GetEnvValue(const TEnv &env, TString prefix, Int_t dflt) const;
+    Double_t    GetEnvValue(const TEnv &env, TString prefix, Double_t dflt) const;
+    const char *GetEnvValue(const TEnv &env, TString prefix, const char *dflt) const;
+
     ClassDef(MParContainer, 0)  //The basis for all parameter containers
 };

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -792 +792 @@
 Bool_t MParList::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
 {
+    if (print)
+        *fLog << all << "MParList::ReadEnv: " << prefix << " (" << (int)print << ")" << endl;
+
     MParContainer *cont = NULL;
 
     TIter Next(fContainer);
     while ((cont=(MParContainer*)Next()))
-        if (cont->ReadEnv(env, print)==kERROR)
+    {
+        if (cont->InheritsFrom("MTaskList"))
+        {
+            if (cont->ReadEnv(env, prefix, print)==kERROR)
+                return kERROR;
+            continue;
+        }
+
+        // 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)
             return kERROR;
-
-    Next.Reset();
-    while ((cont=(MParContainer*)Next()))
-        if (cont->ReadEnv(env, prefix, print)==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;
+    }
 
     return kTRUE;

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -667 +667 @@
 Bool_t MTaskList::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
 {
+    if (print)
+        *fLog << all << "MTaskList::ReadEnv: " << prefix << " (" << (int)print << ")" << endl;
+
     MParContainer *cont = NULL;
 
     TIter Next(fTasks);
     while ((cont=(MParContainer*)Next()))
-        if (cont->ReadEnv(env, print)==kERROR)
+    {
+        if (cont->InheritsFrom("MTaskList"))
+        {
+            if (cont->ReadEnv(env, prefix, print)==kERROR)
+                return kERROR;
+            continue;
+        }
+
+        // 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)
             return kERROR;
-
-    Next.Reset();
-    while ((cont=(MParContainer*)Next()))
-        if (cont->ReadEnv(env, prefix, print)==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;
+    }
 
     return kTRUE;

trunk/MagicSoft/Mars/mfileio/MRead.cc

@@ -56 +56 @@
 {
     //
-    // Don't allow 'global' setup of files
-    //
-    if (prefix.IsNull())
-        return kFALSE;
-
-    //
     // Search (beginning with 0) all keys
     //
-    for (int i=0;; i++)
+    int i=0;
+    while (1)
     {
         TString idx = "File";
@@ -70 +65 @@
 
         // Output if print set to kTRUE
-        IsEnvDefined(env, prefix, idx, print);
+        if (!IsEnvDefined(env, prefix, idx, print))
+            break;
 
         // Try to get the file name
         TString name = GetEnvValue(env, prefix, idx, "");
         if (name.IsNull())
-            break;
+        {
+            *fLog << warn << prefix+"."+idx << " empty." << endl;
+            continue;
+        }
 
         if (name.BeginsWith("\"") && name.EndsWith("\""))
@@ -83 +82 @@
         }
 
-        if (print)
-            *fLog << all << "Add File: " << name << endl;
+        *fLog << inf << "Add File: " << name << endl;
+
         AddFile(name);
+        i++;
     }
 
-    return kTRUE;
+    return i!=0;
 }

trunk/MagicSoft/Mars/mhist/MHMatrix.cc

@@ -1027 +1027 @@
     }
 
-    if (fData)
-    {
-        *fLog << inf << "Removing all existing columns in " << GetDescriptor() << endl;
-        fData->Delete();
-    }
-    else
-    {
-        fData = new MDataArray;
-        SetBit(kIsOwner);
-    }
-
     //
     // Search (beginning with 0) all keys
     //
-    for (int i=0;; i++)
+    int i=0;
+    while (1)
     {
         TString idx = "Column";
@@ -1047 +1037 @@
 
         // Output if print set to kTRUE
-        IsEnvDefined(env, prefix, idx, print);
+        if (!IsEnvDefined(env, prefix, idx, print))
+            break;
 
         // Try to get the file name
         TString name = GetEnvValue(env, prefix, idx, "");
         if (name.IsNull())
-            break;
-
-        if (print)
-            *fLog << all << "Add Column: " << name << endl;
+        {
+            *fLog << warn << prefix+"."+idx << " empty." << endl;
+            continue;
+        }
+
+        if (i==0)
+            if (fData)
+            {
+                *fLog << inf << "Removing all existing columns in " << GetDescriptor() << endl;
+                fData->Delete();
+            }
+            else
+            {
+                fData = new MDataArray;
+                SetBit(kIsOwner);
+            }
+
         fData->AddEntry(name);
-    }
-
-    return kTRUE;
-}
+        i++;
+    }
+
+    return i!=0;
+}