Changeset 1666 for trunk/MagicSoft/Mars/mhist

Timestamp:

11/22/02 09:23:54 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhist/MH3.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mhist/MH3.cc

@@ -223 +223 @@
     {
     case 3:
-        binsz = (MBinning*)plist->FindObject(bname+"Z");
+        binsz = (MBinning*)plist->FindObject(bname+"Z", "MBinning");
         if (!binsz)
         {
@@ -235 +235 @@
             return kFALSE;
     case 2:
-        binsy = (MBinning*)plist->FindObject(bname+"Y");
+        binsy = (MBinning*)plist->FindObject(bname+"Y", "MBinning");
         if (!binsy)
         {
@@ -247 +247 @@
             return kFALSE;
     case 1:
-        binsx = (MBinning*)plist->FindObject(bname+"X");
+        binsx = (MBinning*)plist->FindObject(bname+"X", "MBinning");
         if (!binsx)
         {
-            *fLog << err << dbginf << "MBinning '" << bname << "X' not found... aborting." << endl;
-            return kFALSE;
+            if (fDimension==1)
+                binsx = (MBinning*)plist->FindObject(bname, "MBinning");
+
+            if (!binsx)
+            {
+                *fLog << err << dbginf << "Neither MBinning '" << bname << "X' nor '" << bname << "' found... aborting." << endl;
+                return kFALSE;
+            }
         }
         if (binsx->IsLogarithmic())