Changeset 6530


Ignore:
Timestamp:
02/16/05 16:17:24 (20 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r6528 r6530  
    3131     - include "TVector.h", otherwise this class does not compile
    3232
     33
     34
    3335 2005/02/16 Abelardo Moralejo
    3436
     
    3941
    4042
     43
    4144 2005/02/16 Thomas Bretz
    4245
     
    6366     - replaced 'err' by 'warn' for under-/overflow in lo-gain pixel,
    6467       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
    6575
    6676
     
    8696
    8797
    88 >>>>>>> 1.2616
    8998 2005/02/15 Thomas Bretz
    9099
  • trunk/MagicSoft/Mars/mjobs/MJCut.cc

    r6464 r6530  
    308308    plist.AddToList(&obs);
    309309
    310     // Initialize binnings
    311     MBinning bins1(18, 0,  90,      "BinningAlpha",     "lin");
    312     MBinning bins2(25, 10, 1000000, "BinningEnergyEst", "log");
    313     MBinning bins3(50, 0,  60,      "BinningTheta",     "cos");
     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");
    314314    MBinning bins4("BinningFalseSource");
    315315    plist.AddToList(&bins1);
  • trunk/MagicSoft/Mars/mranforest/MRFEnergyEst.cc

    r6527 r6530  
    3131#include "MRFEnergyEst.h"
    3232
     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
    3344#include "MLog.h"
    3445#include "MLogManip.h"
     
    4253#include "MRanForestGrow.h"
    4354#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"
    5256
    5357ClassImp(MRFEnergyEst);
  • trunk/MagicSoft/Mars/mranforest/MRFEnergyEst.h

    r6479 r6530  
    44#ifndef MARS_MTask
    55#include "MTask.h"
    6 #endif
    7 
    8 #ifndef MARS_MDataArray
    9 #include "MDataArray.h"
    10 #endif
    11 
    12 #ifndef MARS_MEnergyEst
    13 #include "MEnergyEst.h"
    14 #endif
    15 
    16 #ifndef MARS_MHMatrix
    17 #include "MHMatrix.h"
    18 #endif
    19 
    20 #ifndef ROOT_TArrayF
    21 #include <TArrayF.h>
    226#endif
    237
     
    3014#endif
    3115
    32 #ifndef ROOT_TRandom
    33 #include <TRandom.h>
    34 #endif
    35 
    36 //class MRanTree;
    37 //class MRanForest;
    38 //class MParList;
    39 //class MDataArray;
     16class MHMatrix;
     17class MDataArray;
     18class MEnergyEst;
    4019
    4120class MRFEnergyEst : public MTask
    4221{
    4322private:
    44 //      MRanTree *fRanTree;
    45 //      MRanForest *fRanForest;
    46 //      MDataArray *fData;
    4723    Int_t fNumTrees;
    4824    Int_t fNumTry;
  • trunk/MagicSoft/Mars/mranforest/MRanForestCalc.cc

    r5832 r6530  
    273273    tname.ReplaceAll("\015", "");
    274274
    275     *fLog << dbginf << "Reading " << num << " trees " << tname << " from file " << fname << endl;
     275    *fLog << inf << dbginf << "Reading " << num << " trees " << tname << " from file " << fname << endl;
    276276
    277277    gLog.SetNullOutput(!debug);
Note: See TracChangeset for help on using the changeset viewer.