Changeset 7398 for trunk/MagicSoft

Timestamp:

11/14/05 10:39:49 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mranforest

Files:

• MRFEnergyEst.cc (modified) (2 diffs)
• MRanForest.cc (modified) (1 diff)
• MRanForestGrow.h (modified) (1 diff)

trunk/MagicSoft/Mars/mranforest/MRFEnergyEst.cc

@@ -104 +104 @@
     const Int_t nobs = 3; // Number of obsolete columns
 
-    MDataArray &dcol = *matrixtrain.GetColumns();
+    const MDataArray &dcol = *matrixtrain.GetColumns();
 
     MDataArray usedrules;
@@ -292 +292 @@
     if (fEForests.GetEntries()==1)
     {
-        const MRanForest *rf = (MRanForest*)fEForests[0];
+        MRanForest *rf = (MRanForest*)fEForests[0];
         fEnergyEst->SetVal(rf->CalcHadroness(event));
         fEnergyEst->SetReadyToSave();

trunk/MagicSoft/Mars/mranforest/MRanForest.cc

@@ -265 +265 @@
     MRanTree *tree;
     while ((tree=(MRanTree*)Next()))
-    {
-        hadroness+=(fTreeHad[ntree]=tree->TreeHad(event));
-        ntree++;
-    }
+        hadroness += (fTreeHad[ntree++]=tree->TreeHad(event));
+
     return hadroness/ntree;
 }

trunk/MagicSoft/Mars/mranforest/MRanForestGrow.h

@@ -27 +27 @@
     Int_t PostProcess();
 
-    UInt_t  GetEntries()            { return fNumTrees; }
+    UInt_t  GetEntries()            { return 100; }//fNumTrees; }
     TString GetFileName() const     { return "MRanForestGrow"; }
     TString GetFullFileName() const { return "MRanForestGrow"; }