Changeset 3144 for trunk/MagicSoft/Mars/mhbase

Timestamp:

02/13/04 18:02:54 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhbase

Files:

• MFillH.cc (modified) (3 diffs)
• MFillH.h (modified) (1 diff)

trunk/MagicSoft/Mars/mhbase/MFillH.cc

@@ -395 +395 @@
 
         if (!fWeight)
-          {
-            *fLog << err << fWeightName << " [MWeight] not found... aborting." << endl;
-            return kFALSE;
-          }
+        {
+            *fLog << err << fWeightName << " [MWeight] not found... aborting." << endl;
+            return kFALSE;
+        }
     }
 
@@ -474 +474 @@
         return DrawToDisplay();
 
+    if (TestBit(kCanSkip))
+    {
+        *fLog << warn << fParContainerName << " [MParContainer] not found... skipped." << endl;
+        return kSKIP;
+    }
+
     *fLog << err << fParContainerName << " [MParContainer] not found... aborting." << endl;
     return kFALSE;
@@ -501 +507 @@
      */
 
-    return fH->Fill(fParContainer, fWeight?fWeight->GetWeight():1);
+    TVirtualPad *save = gPad;
+    if (fCanvas)
+        fCanvas->cd();
+
+    Bool_t rc = fH->Fill(fParContainer, fWeight?fWeight->GetWeight():1);
+
+    if (save && fCanvas)
+        save->cd();
+
+    return rc;
 } 
 

trunk/MagicSoft/Mars/mhbase/MFillH.h

@@ -18 +18 @@
 public:
     enum {
-        kDoNotDisplay = BIT(17)
+        kDoNotDisplay = BIT(17),
+        kCanSkip      = BIT(18)
     };