Changeset 6530
- Timestamp:
- 02/16/05 16:17:24 (20 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r6528 r6530 31 31 - include "TVector.h", otherwise this class does not compile 32 32 33 34 33 35 2005/02/16 Abelardo Moralejo 34 36 … … 39 41 40 42 43 41 44 2005/02/16 Thomas Bretz 42 45 … … 63 66 - replaced 'err' by 'warn' for under-/overflow in lo-gain pixel, 64 67 it doesn't result in an fatal error (abort) 68 69 * mranforest/MRanForestCalc.cc: 70 - added a missing debug level to some output 71 72 * mranforest/MRFEnergyEst.[h,cc]: 73 - cleaned up includes 74 65 75 66 76 … … 86 96 87 97 88 >>>>>>> 1.261689 98 2005/02/15 Thomas Bretz 90 99 -
trunk/MagicSoft/Mars/mjobs/MJCut.cc
r6464 r6530 308 308 plist.AddToList(&obs); 309 309 310 // Initialize binnings311 MBinning bins1(18, 0, 90, 312 MBinning bins2(25, 10, 1 000000, "BinningEnergyEst", "log");313 MBinning bins3(50, 0, 60, 310 // Initialize default binnings 311 MBinning bins1(18, 0, 90, "BinningAlpha", "lin"); 312 MBinning bins2(25, 10, 1e6 , "BinningEnergyEst", "log"); 313 MBinning bins3(50, 0, 60, "BinningTheta", "cos"); 314 314 MBinning bins4("BinningFalseSource"); 315 315 plist.AddToList(&bins1); -
trunk/MagicSoft/Mars/mranforest/MRFEnergyEst.cc
r6527 r6530 31 31 #include "MRFEnergyEst.h" 32 32 33 #include <TFile.h> 34 #include <TList.h> 35 36 #include <TH1F.h> 37 #include <TH2F.h> 38 #include <TStyle.h> 39 #include <TCanvas.h> 40 #include <TVector.h> 41 42 #include "MHMatrix.h" 43 33 44 #include "MLog.h" 34 45 #include "MLogManip.h" … … 42 53 #include "MRanForestGrow.h" 43 54 #include "MData.h" 44 #include "TFile.h" 45 #include "TList.h" 46 47 #include "TH1F.h" 48 #include "TH2F.h" 49 #include "TStyle.h" 50 #include "TCanvas.h" 51 #include "TVector.h" 55 #include "MEnergyEst.h" 52 56 53 57 ClassImp(MRFEnergyEst); -
trunk/MagicSoft/Mars/mranforest/MRFEnergyEst.h
r6479 r6530 4 4 #ifndef MARS_MTask 5 5 #include "MTask.h" 6 #endif7 8 #ifndef MARS_MDataArray9 #include "MDataArray.h"10 #endif11 12 #ifndef MARS_MEnergyEst13 #include "MEnergyEst.h"14 #endif15 16 #ifndef MARS_MHMatrix17 #include "MHMatrix.h"18 #endif19 20 #ifndef ROOT_TArrayF21 #include <TArrayF.h>22 6 #endif 23 7 … … 30 14 #endif 31 15 32 #ifndef ROOT_TRandom 33 #include <TRandom.h> 34 #endif 35 36 //class MRanTree; 37 //class MRanForest; 38 //class MParList; 39 //class MDataArray; 16 class MHMatrix; 17 class MDataArray; 18 class MEnergyEst; 40 19 41 20 class MRFEnergyEst : public MTask 42 21 { 43 22 private: 44 // MRanTree *fRanTree;45 // MRanForest *fRanForest;46 // MDataArray *fData;47 23 Int_t fNumTrees; 48 24 Int_t fNumTry; -
trunk/MagicSoft/Mars/mranforest/MRanForestCalc.cc
r5832 r6530 273 273 tname.ReplaceAll("\015", ""); 274 274 275 *fLog << dbginf << "Reading " << num << " trees " << tname << " from file " << fname << endl;275 *fLog << inf << dbginf << "Reading " << num << " trees " << tname << " from file " << fname << endl; 276 276 277 277 gLog.SetNullOutput(!debug);
Note:
See TracChangeset
for help on using the changeset viewer.