Changeset 1902 for trunk/MagicSoft/Mars/mhist

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhist/MHMatrix.cc (modified) (2 diffs)

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;
+}