Changeset 1864


Ignore:
Timestamp:
03/24/03 14:26:49 (22 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars/manalysis
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/manalysis/MHillasSrcCalc.h

    r1862 r1864  
    3636                   const char *name=NULL, const char *title=NULL);
    3737
    38     void SetInput(TSTring hilname) { fHillasName = hilname; }
     38    void SetInput(TString hilname) { fHillasName = hilname; }
    3939
    4040    ClassDef(MHillasSrcCalc, 1) // task to calculate the source position depandant hillas parameters

  • trunk/MagicSoft/Mars/manalysis/MRanForest.cc

    r1859 r1864  
    3838// namely bootstrap aggregating (which is done in GrowForest()) and random //
    3939// split selection (which is subject to MRanTree::GrowTree())              //
     40//                                                                         //
    4041/////////////////////////////////////////////////////////////////////////////
    4142#include "MRanForest.h"
    42 #include <iostream.h> 
    43 #include <fstream.h>
    44 
    45 #include <TFile.h>          // gFile
     43
     44#include <TMatrix.h>
     45
     46#include "MHMatrix.h"
     47#include "MRanTree.h"
    4648
    4749#include "MLog.h"
    4850#include "MLogManip.h"
    4951
    50 
    5152ClassImp(MRanForest);
     53
    5254// --------------------------------------------------------------------------
    5355//
    … …  
    6668    fTreeHad.Set(fNumTrees);
    6769    fTreeHad.Reset();
    68 
    69     return;
    7070}
    7171
    … …  
    8383
    8484    fUsePriors=kTRUE;
    85 
    86     return;
    8785}
    8886
    … …  
    106104    fForest=new TObjArray();
    107105    fForest->SetOwner(kTRUE);
    108 
    109     return;
    110106}
    111107
    … …  
    115111    // ndsize + numtry are set in MRanForestGrow!!
    116112    fRanTree=rantree;
    117 
    118     return;
    119113}
    120114

  • trunk/MagicSoft/Mars/manalysis/MRanForest.h

    r1859 r1864  
    1818#endif
    1919
    20 #ifndef ROOT_TObjArray
    21 #include <TObjArray.h>
    22 #endif
    23 
    2420#ifndef ROOT_TRandom
    2521#include <TRandom.h>
    2622#endif
    2723
    28 #ifndef ROOT_TMatrix
    29 #include <TMatrix.h>
    30 #endif
    31 
    32 #ifndef MARS_MHMatrix
    33 #include "MHMatrix.h"
    34 #endif
    35 
    36 #ifndef MARS_MRanTree
    37 #include "MRanTree.h"
    38 #endif
     24class MHMatrix;
     25class MRanTree;
     26class TVector;
    3927
    4028class MRanForest : public MParContainer

  • trunk/MagicSoft/Mars/manalysis/MRanForestCalc.cc

    r1859 r1864  
    3636#include "MRanForestCalc.h"
    3737
    38 #include <fstream.h>
    39 
    4038#include "MHMatrix.h" // must be before MLogManip.h
    4139
    … …  
    4442
    4543#include "MParList.h"
    46 #include "MDataChain.h"
    47 #include "MDataArray.h"
     44
     45#include "MRanTree.h"
     46#include "MRanForest.h"
    4847
    4948#include "MHadronness.h"
    … …  
    5352static const TString gsDefName  = "MRanForestCalc";
    5453static const TString gsDefTitle = "Tree Classification Loop 1/2";
     54
    5555// --------------------------------------------------------------------------
    5656//

  • trunk/MagicSoft/Mars/manalysis/MRanForestCalc.h

    r1859 r1864  
    66#endif
    77
    8 #ifndef MARS_MRanForest
    9 #include "MRanForest.h"
    10 #endif
    11 
    128class MParList;
    139class MHadronness;
    1410class MDataArray;
     11class MRanTree;
     12class MRanForest;
    1513
    1614class MRanForestCalc : public MTask

  • trunk/MagicSoft/Mars/manalysis/MRanForestFill.cc

    r1859 r1864  
    3636#include "MRanForestFill.h"
    3737
    38 #include <fstream.h>
    39 
    4038#include "MLog.h"
    4139#include "MLogManip.h"
    4240
    4341#include "MParList.h"
    44 #include "MDataChain.h"
    45 #include "MDataArray.h"
     42
     43#include "MRanForest.h"
    4644
    4745ClassImp(MRanForestFill);
    … …  
    4947static const TString gsDefName  = "MRanForestFill";
    5048static const TString gsDefTitle = "Tree Classification Loop 1/2";
     49
    5150// --------------------------------------------------------------------------
    5251//
    … …  
    9897Bool_t MRanForestFill::Process()
    9998{
    100 
    10199    fNum++;
    102100    fRanForest->SetTree(fRanTree);

  • trunk/MagicSoft/Mars/manalysis/MRanForestFill.h

    r1859 r1864  
    66#endif
    77
    8 #ifndef MARS_MRanForest
    9 #include "MRanForest.h"
    10 #endif
    11 
    12 #ifndef MARS_MRanTree
    13 #include "MRanTree.h"
    14 #endif
    15 
     8class MRanTree;
     9class MRanForest;
    1610class MParList;
    1711class MDataArray;

  • trunk/MagicSoft/Mars/manalysis/MRanForestGrow.cc

    r1859 r1864  
    2929//  Grows a random forest.                                                 //
    3030//                                                                         //
    31 //                                                                         //
    3231/////////////////////////////////////////////////////////////////////////////
    3332#include "MRanForestGrow.h"
    34 
    35 #include <fstream.h>
    3633
    3734#include "MHMatrix.h" // must be before MLogManip.h
    … …  
    4239#include "MParList.h"
    4340
     41#include "MRanTree.h"
     42#include "MRanForest.h"
     43
    4444ClassImp(MRanForestGrow);
    4545
    4646static const TString gsDefName  = "MRanForestGrow";
    4747static const TString gsDefTitle = "Tree Classification Loop 1/2";
     48
    4849// --------------------------------------------------------------------------
    4950//
    … …  
    5960    fName  = name  ? name  : gsDefName.Data();
    6061    fTitle = title ? title : gsDefTitle.Data();
    61 
    6262}
    6363
    … …  
    128128    return not_last;
    129129}
     130
    130131Bool_t MRanForestGrow::PostProcess()
    131132{
    … …  
    135136    return kTRUE;
    136137}
     138
    137139void MRanForestGrow::SetNumTrees(Int_t n)
    138140{
    139141    fNumTrees=n;
    140     return;
    141142}
    142143
    … …  
    144145{
    145146    fNumTry=n;
    146     return;
    147147}
    148148
    … …  
    150150{
    151151    fNdSize=n;
    152     return;
    153152}

  • trunk/MagicSoft/Mars/manalysis/MRanForestGrow.h

    r1859 r1864  
    11#ifndef MARS_MRanForestGrow
    22#define MARS_MRanForestGrow
    3 
    4 #ifndef MARS_MTask
    5 #include "MTask.h"
    6 #endif
    7 
    8 #include "TRandom.h"
    9 #include "TMath.h"
    103
    114/////////////////////////////////////////////////////////////////////////////
    … …  
    1710/////////////////////////////////////////////////////////////////////////////
    1811
    19 #include "MRanForest.h"
     12#ifndef MARS_MTask
     13#include "MTask.h"
     14#endif
    2015
    2116class MHMatrix;
    2217class MParList;
    2318class MRanForest;
     19class MRanTree;
    2420
    2521class MRanForestGrow : public MTask
Note: See TracChangeset for help on using the changeset viewer.