Changeset 6530 for trunk/MagicSoft

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (4 diffs)
• mjobs/MJCut.cc (modified) (1 diff)
• mranforest/MRFEnergyEst.cc (modified) (2 diffs)
• mranforest/MRFEnergyEst.h (modified) (2 diffs)
• mranforest/MRanForestCalc.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -31 +31 @@
      - include "TVector.h", otherwise this class does not compile
 
+
+
  2005/02/16 Abelardo Moralejo
 
@@ -39 +41 @@
 
 
+
  2005/02/16 Thomas Bretz
 
@@ -63 +66 @@
      - replaced 'err' by 'warn' for under-/overflow in lo-gain pixel,
        it doesn't result in an fatal error (abort)
+
+   * mranforest/MRanForestCalc.cc:
+     - added a missing debug level to some output
+
+   * mranforest/MRFEnergyEst.[h,cc]: 
+     - cleaned up includes
+
 
 
@@ -86 +96 @@
 
 
->>>>>>> 1.2616
  2005/02/15 Thomas Bretz
 

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -308 +308 @@
     plist.AddToList(&obs);
 
-    // Initialize binnings
-    MBinning bins1(18, 0,  90,      "BinningAlpha",     "lin");
-    MBinning bins2(25, 10, 1000000, "BinningEnergyEst", "log");
-    MBinning bins3(50, 0,  60,      "BinningTheta",     "cos");
+    // Initialize default binnings
+    MBinning bins1(18, 0,  90,   "BinningAlpha",     "lin");
+    MBinning bins2(25, 10, 1e6 , "BinningEnergyEst", "log");
+    MBinning bins3(50, 0,  60,   "BinningTheta",     "cos");
     MBinning bins4("BinningFalseSource");
     plist.AddToList(&bins1);

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);