Changeset 6915 for trunk/MagicSoft/Mars/mhbase

Timestamp:

04/07/05 14:27:22 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhbase

Files:

• HBaseLinkDef.h (modified) (1 diff)
• MFillH.cc (modified) (4 diffs)
• MFillH.h (modified) (3 diffs)
• MWeight.cc (deleted)
• MWeight.h (deleted)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mhbase/HBaseLinkDef.h

@@ -13 +13 @@
 
 #pragma link C++ class MBinning+;
-#pragma link C++ class MWeight+;
 
 #endif

trunk/MagicSoft/Mars/mhbase/MFillH.cc

@@ -51 +51 @@
 //
 // To use a weight for each event filled in a histogram call
-// SetWeight(). You can eithe use the name of a MWeight container stored
+// SetWeight(). You can eithe use the name of a MParameterD container stored
 // in the parameter list or a pointer to it as an argument.
 //
@@ -92 +92 @@
 #include "MHArray.h"
 
-#include "MWeight.h"
+#include "MParameters.h"
 
 #include "MParList.h"
@@ -424 +424 @@
     if (!fWeight && !fWeightName.IsNull())
     {
-        fWeight = (MWeight*)pList->FindObject(fWeightName, "MWeight");
+        fWeight = (MParameterD*)pList->FindObject(fWeightName, "MParameterD");
 
         if (!fWeight)
         {
-            *fLog << err << fWeightName << " [MWeight] not found... aborting." << endl;
+            *fLog << err << fWeightName << " [MParameterD] not found... aborting." << endl;
             return kFALSE;
         }
@@ -547 +547 @@
         fCanvas->cd();
 
-    const Bool_t rc = fH->Fill(fParContainer, fWeight?fWeight->GetWeight():1);
+    const Bool_t rc = fH->Fill(fParContainer, fWeight?fWeight->GetVal():1);
     fH->SetNumExecutions(GetNumExecutions()+1);
 
     if (save && fCanvas)
         save->cd();
-
     return rc;
 } 

trunk/MagicSoft/Mars/mhbase/MFillH.h

@@ -9 +9 @@
 class MMap;
 class MData;
-class MWeight;
+class MParameterD;
 class MParList;
 
@@ -30 +30 @@
     TString fNameTab;
 
-    MWeight *fWeight;             // Pointer to the container storing a weight
+    MParameterD *fWeight;         // Pointer to the container storing a weight
     TString fWeightName;          // Name of a container storing a weight
 
@@ -62 +62 @@
     void SetRuleForIdx(MData *rule);
 
-    void SetWeight(MWeight *w)       { fWeight = w; }
+    void SetWeight(MParameterD *w)   { fWeight = w; }
     void SetWeight(const char *name) { fWeightName = name; }
 

trunk/MagicSoft/Mars/mhbase/Makefile

@@ -23 +23 @@
 SRCFILES = MFillH.cc \
            MBinning.cc \
-           MWeight.cc \
            MH.cc \
            MH3.cc \