Changeset 1880 for trunk/MagicSoft/Mars/mhist

Timestamp:

03/31/03 10:37:56 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MH.cc (modified) (4 diffs)
• MHRanForest.cc (modified) (4 diffs)
• MHRanForestGini.cc (modified) (3 diffs)
• MHRanForestGini.h (modified) (1 diff)

trunk/MagicSoft/Mars/mhist/MH.cc

@@ -59 +59 @@
 #include <TLegend.h>
 #include <TPaveStats.h>
+#if ROOT_VERSION_CODE > ROOT_VERSION(3,04,01)
+#include <THLimitsFinder.h>
+#endif
 
 #include "MLog.h"
@@ -469 +472 @@
 void MH::FindGoodLimits(Int_t nbins, Int_t &newbins, Double_t &xmin, Double_t &xmax, Bool_t isInteger)
 {
+#if ROOT_VERSION_CODE > ROOT_VERSION(3,04,01)
+    THLimitsFinder::OptimizeLimits(nbins, newbins, xmin, xmax, isInteger);
+#else
 //*-*-*-*-*-*-*-*-*Find reasonable bin values*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
 //*-*              ==========================
@@ -486 +492 @@
     Double_t binwidth=0;
 
-#if ROOT_VERSION_CODE < ROOT_VERSION(3,03,01)
     TGaxis::Optimize(umin, umax, nbins, binlow, binhigh, nbins, binwidth, "");
-#else
-    gLog << all << "*********************************************************" << endl;
-    gLog << all << "ERROR, because Abelardo removed TGaxis::Optimize from" << endl;
-    gLog << all << " MH::FindGoodLimits to be able to compile Mars with newer" << endl;
-    gLog << all << " root versions, whatever you are trying to do will fail!!!" << endl;
-    gLog << all << "*********************************************************" << endl;
-#endif
 
     if (binwidth <= 0 || binwidth > 1.e+39)
@@ -532 +530 @@
 
     newbins = nbins;
+#endif
 }
 

trunk/MagicSoft/Mars/mhist/MHRanForest.cc

@@ -114 +114 @@
 
     Int_t ntrees=fRanForest->GetNumTrees();
-    //cout<<"filling"<<endl;
+
     for (Int_t i=0;i<ntrees;i++)
     {
@@ -120 +120 @@
             hest+=fRanForest->GetTreeHad(j);
 
-        hest/=Double_t(i+1);
+        hest/=i+1;
         fSigma[i]+=(htrue-hest)*(htrue-hest);
     }
@@ -177 +177 @@
         g.GetXaxis()->SetTitle("Number of Trees");
         g.GetYaxis()->SetTitle("Standard deviation of estimated hadronness");
-        g.SetMarkerStyle(kFullDotlarge);
-        g.Draw("P");
-
+        g.SetMarkerStyle(kFullDotMedium);
+        gPad->Modified();
+        gPad->Update();
+        //g.Draw("P");
     }
     gPad->SetGrid();
@@ -209 +210 @@
 
         fGraphSigma->SetMarkerStyle(kFullDotSmall);
-        fGraphSigma->Draw("P");
+        //fGraphSigma->Draw("P");
         gPad->Modified();
         gPad->Update();

trunk/MagicSoft/Mars/mhist/MHRanForestGini.cc

@@ -121 +121 @@
     for (Int_t i=0; i<n; i++)
     {
+        fGini[i]/=fRanForest->GetNumTrees();
+        fGini[i]/=fRanForest->GetNumData();
+
         Stat_t ip = i+1.;
-        fGini[i]/=Stat_t(fRanForest->GetNumTrees());
-        fGini[i]/=Stat_t(fRanForest->GetNumData());
         Stat_t ig = fGini[i];
+
         max=TMath::Max(max,ig);
         min=TMath::Min(min,ig);
+
         fGraphGini->SetPoint(i,ip,ig);
     }
@@ -157 +160 @@
         g.GetXaxis()->SetTitle("No. of RF-input parameter");
         g.GetYaxis()->SetTitle("Mean decrease in Gini-index [a.u.]");
-        g.SetMarkerStyle(kFullDotlarge);
-        g.Draw("P");
-
+        g.SetMarkerStyle(kFullDotMedium);
+        //g.Draw("P");
+        gPad->Modified();
+        gPad->Update();
     }
     gPad->SetGrid();
@@ -189 +193 @@
 
         fGraphGini->SetMarkerStyle(kFullDotSmall);
-        fGraphGini->Draw("P");
+        //fGraphGini->Draw("P");
         gPad->Modified();
         gPad->Update();

trunk/MagicSoft/Mars/mhist/MHRanForestGini.h

@@ -19 +19 @@
 {
 private:
-    MRanForest *fRanForest;
+    MRanForest *fRanForest;  //!
 
-    TArrayF fGini;
-    TGraph *fGraphGini;
+    TArrayF fGini;           //!
+    TGraph *fGraphGini;      //->
 
 public: