Changeset 8719 for trunk/MagicSoft/Mars/mjtrain

Timestamp:

08/28/07 13:03:04 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjtrain

Files:

• MJTrainDisp.cc (modified) (5 diffs)
• MJTrainDisp.h (modified) (2 diffs)
• MJTrainEnergy.cc (modified) (5 diffs)
• MJTrainEnergy.h (modified) (1 diff)

trunk/MagicSoft/Mars/mjtrain/MJTrainDisp.cc

@@ -43 +43 @@
 //    opt.Train("rf-disp.root", set, 30000); // Number of train events
 //
+//    // Two of the displayed histograms show the cut efficiency for
+//    // a given Theta-Cut. The default is 0.215. It can be overwritten
+//    // by
+//    opt.SetThetaCut(0.165);
+//
 //
 // Random Numbers:
@@ -227 +232 @@
 Bool_t MJTrainDisp::Train(const char *out, const MDataSet &set, Int_t num)
 {
-    SetTitle(Form("TrainDisp: %s", out));
+    SetTitle(Form("Train%s: %s", fNameOutput.Data(), out));
 
     if (fDisplay)
@@ -282 +287 @@
 
     // ------------------------ Train RF --------------------------
-    MRanForestCalc rf("TrainDisp", fTitle);
+    MRanForestCalc rf("Train", fTitle);
     rf.SetNumTrees(fNumTrees);
     rf.SetNdSize(fNdSize);
@@ -292 +297 @@
     rf.SetFileName(out);
     rf.SetDebug(fDebug>1);
-    rf.SetNameOutput("Disp");
+    rf.SetNameOutput(fNameOutput);
+    rf.SetFunction(fResultFunction);
 
     /*
@@ -319 +325 @@
 
     MParameterD par("ThetaSquaredCut");
-    par.SetVal(0.215*0.215);
+    par.SetVal(fThetaCut*fThetaCut);
     plist.AddToList(&par);
 

trunk/MagicSoft/Mars/mjtrain/MJTrainDisp.h

@@ -17 +17 @@
 
     TString fTrainParameter;
+    TString fResultFunction;
+
+    Float_t fThetaCut;
+
+    // To be moved to a base class
+    TString fNameOutput;
 
     void DisplayHist(TCanvas &c, Int_t i, MH3 &mh3) const;
@@ -22 +28 @@
 
 public:
-    MJTrainDisp() : fTrainParameter(fgTrainParameter) { }
+    MJTrainDisp() : fTrainParameter(fgTrainParameter), fResultFunction("x"), fThetaCut(0.215), fNameOutput("Disp") { }
 
     void SetTrainParameter(const char *txt) { fTrainParameter=txt; }
+
+    void SetThetaCut(Float_t cut=0.215) { fThetaCut=cut; }
 
     Bool_t Train(const char *out, const MDataSet &set, Int_t num);

trunk/MagicSoft/Mars/mjtrain/MJTrainEnergy.cc

@@ -89 +89 @@
 Bool_t MJTrainEnergy::Train(const char *out, const MDataSet &set, Int_t num)
 {
-    SetTitle(Form("TrainEnergy: %s", out));
+    SetTitle(Form("Train%s: %s", fNameOutput.Data(), out));
 
     if (fDisplay)
@@ -128 +128 @@
     if (fEnableWeights)
         train.AddColumn("MWeight.fVal");
-    train.AddColumn("MMcEvt.fImpact/100");
-    train.AddColumn("MMcEvt.fTelescopeTheta*TMath::RadToDeg()");
     train.AddColumn(fTrainParameter);
-
 
     // ----------------------- Fill Matrix RF ----------------------
@@ -147 +144 @@
 
     // ------------------------ Train RF --------------------------
-    MRanForestCalc rf("TrainEnergy", fTitle);
+    MRanForestCalc rf("Train", fTitle);
     rf.SetNumTrees(fNumTrees);
     rf.SetNdSize(fNdSize);
     rf.SetNumTry(fNumTry);
-    rf.SetNumObsoleteVariables(3);
+    rf.SetNumObsoleteVariables(1);
     rf.SetLastDataColumnHasWeights(fEnableWeights);
     rf.SetDisplay(fDisplay);
@@ -157 +154 @@
     rf.SetFileName(out);
     rf.SetDebug(fDebug>1);
-    rf.SetNameOutput("MEnergyEst");
+    rf.SetNameOutput(fNameOutput);
     rf.SetFunction(fResultFunction);
 
@@ -175 +172 @@
 
     gLog.Separator("Test");
+
+    MH::SetPalette("pretty");
 
     MParList  plist;

trunk/MagicSoft/Mars/mjtrain/MJTrainEnergy.h

@@ -14 +14 @@
     TString fResultFunction;
 
+    // To be moved to a base class
+    TString fNameOutput;
+
 public:
-    MJTrainEnergy() { SetTrainLin(); }
+    MJTrainEnergy() : fNameOutput("MEnergyEst") { SetTrainLin(); }
 
     void SetTrainLog() { SetTrainFunc("log10(MMcEvt.fEnergy)", "pow(10, x)"); }