Changeset 8698 for trunk/MagicSoft/Mars/mranforest

Timestamp:

08/23/07 11:26:38 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mranforest

Files:

• MRanForestCalc.cc (modified) (9 diffs)
• MRanForestCalc.h (modified) (4 diffs)

trunk/MagicSoft/Mars/mranforest/MRanForestCalc.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MRanForestCalc.cc,v 1.27 2007-07-26 11:13:00 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MRanForestCalc.cc,v 1.28 2007-08-23 10:25:08 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -66 +66 @@
 
 MRanForestCalc::MRanForestCalc(const char *name, const char *title)
-    : fData(0), fRFOut(0), fTestMatrix(0),
+    : fData(0), fRFOut(0), fTestMatrix(0), fFunc("Function", "x"),
     fNumTrees(-1), fNumTry(-1), fNdSize(-1), fNumObsoleteVariables(1),
     fLastDataColumnHasWeights(kFALSE),
@@ -73 +73 @@
     fName  = name  ? name  : gsDefName.Data();
     fTitle = title ? title : gsDefTitle.Data();
+
+    gROOT->GetListOfFunctions()->Remove(&fFunc);
 
     // FIXME:
@@ -83 +85 @@
 {
     fEForests.Delete();
+}
+
+// --------------------------------------------------------------------------
+//
+// Set a function which is applied to the output of the random forest
+//
+Bool_t MRanForestCalc::SetFunction(const char *func)
+{
+    return !fFunc.Compile(func);
 }
 
@@ -291 +302 @@
     }
 
+    if (fileRF.GetListOfKeys()->FindObject("Function"))
+        fFunc.Read("Function");
+
     return kTRUE;
 }
@@ -326 +340 @@
 }
 
-Int_t MRanForestCalc::Process()
+Double_t MRanForestCalc::Eval() const
 {
     TVector event;
@@ -338 +352 @@
     {
         MRanForest *rf = static_cast<MRanForest*>(fEForests.UncheckedAt(0));
-        fRFOut->SetVal(rf->CalcHadroness(event));
-        fRFOut->SetReadyToSave();
-
-        return kTRUE;
+        return rf->CalcHadroness(event);
     }
 
@@ -383 +394 @@
     {
     case kMean:
-        fRFOut->SetVal(pow(10, sume/sumh));
-        break;
+        return sume/sumh;
     case kMaximum:
-        fRFOut->SetVal(pow(10, maxe));
-        break;
+        return maxe;
     case kFit:
         f1.SetParameter(0, maxh);
@@ -393 +402 @@
         f1.SetParameter(2, 0.125);
         g.Fit(&f1, "Q0N");
-        fRFOut->SetVal(pow(10, f1.GetParameter(1)));
-        break;
-    }
-
+        return f1.GetParameter(1);
+    }
+
+    return 0;
+}
+
+Int_t MRanForestCalc::Process()
+{
+    const Double_t val = Eval();
+
+    fRFOut->SetVal(fFunc.Eval(val));
     fRFOut->SetReadyToSave();
 

trunk/MagicSoft/Mars/mranforest/MRanForestCalc.h

@@ -12 +12 @@
 #ifndef ROOT_TArrayD
 #include <TArrayD.h>
+#endif
+
+#ifndef ROOT_TF1
+#include <TF1.h>
 #endif
 
@@ -36 +40 @@
     MParameterD *fRFOut;                //! Used to store result
     MHMatrix    *fTestMatrix;           //! Test Matrix used in Process (together with MMatrixLoop)
+    TF1          fFunc;                 //! Function to apply to the result
 
     TObjArray    fEForests;             //! List of forests read or to be written
@@ -60 +65 @@
     // MRanForestCalc
     Int_t ReadForests(MParList &plist);
+    Double_t Eval() const;
 
     // MParContainer
@@ -84 +90 @@
     void SetNumTry(UShort_t n=0)     { fNumTry   = n; }
     void SetDebug(Bool_t b=kTRUE)    { fDebug    = b; }
+
+    Bool_t SetFunction(const char *name="x");
 
     void SetNumObsoleteVariables(Int_t n=1)          { fNumObsoleteVariables = n; }