Changeset 1870 for trunk/MagicSoft/Mars/mhist

Timestamp:

03/27/03 11:37:39 (22 years ago)

Author:

hengsteb

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MHRanForest.cc (modified) (1 diff)
• MHRanForestGini.cc (modified) (5 diffs)
• MHRanForestGini.h (modified) (1 diff)

trunk/MagicSoft/Mars/mhist/MHRanForest.cc

@@ -114 +114 @@
 
     Int_t ntrees=fRanForest->GetNumTrees();
-
+    //cout<<"filling"<<endl;
     for (Int_t i=0;i<ntrees;i++)
     {

trunk/MagicSoft/Mars/mhist/MHRanForestGini.cc

@@ -41 +41 @@
 #include "MParList.h"
 #include "MBinning.h"
+#include "MRanTree.h"
 #include "MRanForest.h"
 
 #include "MLog.h"
 #include "MLogManip.h"
-
-#include "MMcEvt.hxx"
 
 ClassImp(MHRanForestGini);
@@ -84 +83 @@
 Bool_t MHRanForestGini::SetupFill(const MParList *plist)
 {
-    fMcEvt = (MMcEvt*)plist->FindObject("MMcEvt");
-    if (!fMcEvt)
-    {
-        *fLog << err << dbginf << "MMcEvt not found... aborting." << endl;
-        return kFALSE;
-    }
-
     fRanForest = (MRanForest*)plist->FindObject("MRanForest");
     if (!fRanForest)
@@ -111 +103 @@
 {
     for (Int_t i=0;i<fRanForest->GetNumDim();i++)
-        fGini[i]+=fRanForest->GetGiniDec(i);
+        fGini[i]+=fRanForest->GetCurTree()->GetGiniDec(i);
 
     return kTRUE;
@@ -163 +155 @@
     {
         g.GetXaxis()->SetRangeUser(0, fRanForest->GetNumTrees());
-        g.GetXaxis()->SetTitle("No. of RF-input parameter parameter");
+        g.GetXaxis()->SetTitle("No. of RF-input parameter");
         g.GetYaxis()->SetTitle("Mean decrease in Gini-index [a.u.]");
         g.SetMarkerStyle(kFullDotlarge);
@@ -193 +185 @@
     {
         fGraphGini->GetXaxis()->SetRangeUser(0, 1);
-        fGraphGini->GetXaxis()->SetTitle("No. of parameter");
+        fGraphGini->GetXaxis()->SetTitle("No. of RF-input parameter");
         fGraphGini->GetYaxis()->SetTitle("Mean decrease in Gini-index [a.u.]");
 

trunk/MagicSoft/Mars/mhist/MHRanForestGini.h

@@ -13 +13 @@
 class TGraph;
 class MParList;
-class MMcEvt;
 class MRanForest;
+class MRanTree;
 
 class MHRanForestGini : public MH
 {
 private:
-    const MMcEvt *fMcEvt;          //!
-    const MRanForest *fRanForest;  //!
+    MRanForest *fRanForest;
 
-    TArrayF fGini;                 //!
-    TGraph *fGraphGini;            //->
+    TArrayF fGini;
+    TGraph *fGraphGini;
 
 public: