Changeset 7423 for trunk/MagicSoft/Mars

Timestamp:

11/22/05 12:19:28 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mranforest

Files:

• MRanForestCalc.cc (modified) (1 diff)
• MRanForestCalc.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mranforest/MRanForestCalc.cc

@@ -376 +376 @@
 }
 
-void MRanForest::Print(Option_t *o) const
+void MRanForestCalc::Print(Option_t *o) const
 {
     *fLog << all;

trunk/MagicSoft/Mars/mranforest/MRanForestCalc.h

@@ -33 +33 @@
     static const TString gsNameOutput;  //! Default Output name
 
-    Bool_t       fDebug;      // Debugging of eventloop while training on/off
+    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)
 
-    TString      fFileName;   // File name to forest
-    TObjArray    fEForests;   // List of forests
+    TObjArray    fEForests;             //! List of forests read or to be written
 
-    TString      fNameOutput; // Name of output container
+    Int_t        fNumTrees;             //! Training parameters
+    Int_t        fNumTry;               //! Training parameters
+    Int_t        fNdSize;               //! Training parameters
 
-    MDataArray  *fData;       //! Used to store the MDataChains to get the event values
-    MParameterD *fRFOut;      //! Used to store result
+    Int_t        fNumObsoleteVariables; //! Training parameters
 
-    Int_t        fNumTrees;   //! Training parameters
-    Int_t        fNumTry;     //! Training parameters
-    Int_t        fNdSize;     //! Training parameters
+    TString      fFileName;             // File name to forest
+    TString      fNameOutput;           // Name of output container
 
-    Int_t        fNumObsoleteVariables;
+    Bool_t       fDebug;                // Debugging of eventloop while training on/off
 
-    MHMatrix    *fTestMatrix; //! Test Matrix used in Process (together with MMatrixLoop)
-
-    EstimationMode_t fEstimationMode;
+    EstimationMode_t fEstimationMode;   // Mode of estimation in case of multi random forest regression
 
 private:
@@ -70 +69 @@
     MRanForestCalc(const char *name=NULL, const char *title=NULL);
     ~MRanForestCalc();
+
+    // TObject
+    void Print(Option_t *o="") const;
 
     // Setter for estimation
@@ -106 +108 @@
     void  InitMapping(MHMatrix *m=0)   { fTestMatrix=m; }
 
-    ClassDef(MRanForestCalc, 0) // Task to calculate RF output and for RF training
+    ClassDef(MRanForestCalc, 1) // Task to calculate RF output and for RF training
 };