Changeset 8704 for trunk/MagicSoft/Mars/mranforest

Timestamp:

08/24/07 09:37:31 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mranforest

Files:

• MRanForestCalc.cc (modified) (7 diffs)
• MRanForestCalc.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mranforest/MRanForestCalc.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MRanForestCalc.cc,v 1.28 2007-08-23 10:25:08 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MRanForestCalc.cc,v 1.29 2007-08-24 08:33:48 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -63 +63 @@
 const TString MRanForestCalc::gsDefTitle   = "RF for energy estimation";
 
-const TString MRanForestCalc::gsNameOutput = "RanForestOut";
+const TString MRanForestCalc::gsNameOutput   = "RanForestOut";
+const TString MRanForestCalc::gsNameEvalFunc = "EvalFunction";
 
 MRanForestCalc::MRanForestCalc(const char *name, const char *title)
-    : fData(0), fRFOut(0), fTestMatrix(0), fFunc("Function", "x"),
+    : fData(0), fRFOut(0), fTestMatrix(0), fFunc("x"),
     fNumTrees(-1), fNumTry(-1), fNdSize(-1), fNumObsoleteVariables(1),
     fLastDataColumnHasWeights(kFALSE),
@@ -73 +74 @@
     fName  = name  ? name  : gsDefName.Data();
     fTitle = title ? title : gsDefTitle.Data();
-
-    gROOT->GetListOfFunctions()->Remove(&fFunc);
 
     // FIXME:
@@ -93 +92 @@
 Bool_t MRanForestCalc::SetFunction(const char *func)
 {
-    return !fFunc.Compile(func);
+    return !fFunc.SetRule(func);
 }
 
@@ -267 +266 @@
     usedrules.Write("rules");
 
+    fFunc.Write(gsNameEvalFunc);
+
     return kTRUE;
 }
@@ -302 +303 @@
     }
 
-    if (fileRF.GetListOfKeys()->FindObject("Function"))
-        fFunc.Read("Function");
+    if (fileRF.GetListOfKeys()->FindObject(gsNameEvalFunc))
+    {
+        if (fFunc.Read(gsNameEvalFunc)<=0)
+        {
+            *fLog << err << "ERROR - Reading '" << gsNameEvalFunc << "' from file " << fFileName << endl;
+            return kFALSE;
+        }
+
+        *fLog << inf << "Evaluation function found in file: " << fFunc.GetRule() << endl;
+    }
 
     return kTRUE;
@@ -325 +334 @@
 
     *fLog << inf << "RF read from " << fFileName << endl;
+
+    if (!fFunc.PreProcess(plist))
+    {
+        *fLog << err << "PreProcessing of evaluation function failed... aborting." << endl;
+        return kFALSE;
+    }
 
     if (fTestMatrix)

trunk/MagicSoft/Mars/mranforest/MRanForestCalc.h

@@ -14 +14 @@
 #endif
 
-#ifndef ROOT_TF1
-#include <TF1.h>
+#ifndef ROOT_MDataPhrase
+#include "MDataPhrase.h"
 #endif
 
@@ -33 +33 @@
 
 private:
-    static const TString gsDefName;     //! Default Name
-    static const TString gsDefTitle;    //! Default Title
-    static const TString gsNameOutput;  //! Default Output name
+    static const TString gsDefName;      //! Default Name
+    static const TString gsDefTitle;     //! Default Title
+    static const TString gsNameOutput;   //! Default Output name
+    static const TString gsNameEvalFunc; //! Evaluation function name
 
     MDataArray  *fData;                 //! Used to store the MDataChains to get the event values
     MParameterD *fRFOut;                //! Used to store result
     MHMatrix    *fTestMatrix;           //! Test Matrix used in Process (together with MMatrixLoop)
-    TF1          fFunc;                 //! Function to apply to the result
+    MDataPhrase  fFunc;                 //! Function to apply to the result
 
     TObjArray    fEForests;             //! List of forests read or to be written