Changeset 6530 for trunk/MagicSoft/Mars/mranforest

Timestamp:

02/16/05 16:17:24 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mranforest

Files:

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

trunk/MagicSoft/Mars/mranforest/MRFEnergyEst.cc

@@ -31 +31 @@
 #include "MRFEnergyEst.h"
 
+#include <TFile.h>
+#include <TList.h>
+
+#include <TH1F.h>
+#include <TH2F.h>
+#include <TStyle.h>
+#include <TCanvas.h>
+#include <TVector.h>
+
+#include "MHMatrix.h"
+
 #include "MLog.h"
 #include "MLogManip.h"
@@ -42 +53 @@
 #include "MRanForestGrow.h"
 #include "MData.h"
-#include "TFile.h"
-#include "TList.h"
-
-#include "TH1F.h"
-#include "TH2F.h"
-#include "TStyle.h"
-#include "TCanvas.h"
-#include "TVector.h"
+#include "MEnergyEst.h"
 
 ClassImp(MRFEnergyEst);

trunk/MagicSoft/Mars/mranforest/MRFEnergyEst.h

@@ -4 +4 @@
 #ifndef MARS_MTask
 #include "MTask.h"
-#endif
-
-#ifndef MARS_MDataArray
-#include "MDataArray.h"
-#endif
-
-#ifndef MARS_MEnergyEst
-#include "MEnergyEst.h"
-#endif
-
-#ifndef MARS_MHMatrix
-#include "MHMatrix.h"
-#endif
-
-#ifndef ROOT_TArrayF
-#include <TArrayF.h>
 #endif
 
@@ -30 +14 @@
 #endif
 
-#ifndef ROOT_TRandom
-#include <TRandom.h>
-#endif
-
-//class MRanTree;
-//class MRanForest;
-//class MParList;
-//class MDataArray;
+class MHMatrix;
+class MDataArray;
+class MEnergyEst;
 
 class MRFEnergyEst : public MTask
 {
 private:
-//      MRanTree *fRanTree;
-//      MRanForest *fRanForest;
-//      MDataArray *fData;
     Int_t fNumTrees;
     Int_t fNumTry;

trunk/MagicSoft/Mars/mranforest/MRanForestCalc.cc

@@ -273 +273 @@
     tname.ReplaceAll("\015", "");
 
-    *fLog << dbginf << "Reading " << num << " trees " << tname << " from file " << fname << endl;
+    *fLog << inf << dbginf << "Reading " << num << " trees " << tname << " from file " << fname << endl;
 
     gLog.SetNullOutput(!debug);