Changeset 2475 for trunk/MagicSoft/Mars/macros/CT1Analysis.C

Timestamp:

11/05/03 15:11:25 (21 years ago)

Author:

wittek

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/macros/CT1Analysis.C (modified) (7 diffs)

trunk/MagicSoft/Mars/macros/CT1Analysis.C

@@ -241 +241 @@
 
     Bool_t JobB_RF_UP  = kFALSE;  
+    Bool_t CTrainRF    = kFALSE;  // create matrices of training events
     Bool_t RTrainRF    = kFALSE;  // read in matrices of training events
-    Bool_t CTrainRF    = kFALSE;  // create matrices of training events
-    Bool_t RTree       = kFALSE;  // read in trees
+    Bool_t RTree       = kFALSE;  // read in trees (otherwise grow them)
     Bool_t WRF         = kFALSE;  // update input root file ?
 
@@ -255 +255 @@
 
     Bool_t JobB_SC_UP  = kFALSE;
-    Bool_t RMatrix     = kFALSE;  // read training and test matrices from file  
+    Bool_t CMatrix     = kFALSE;  // create training and test matrices 
+    Bool_t RMatrix     = kFALSE;  // read training and test matrices from file
     Bool_t WOptimize   = kFALSE;  // do optimization using the training sample
                                   // and write supercuts parameter values 
@@ -1293 +1294 @@
     rfwrite2.AddContainer("MRanTree", "TREE");
 
+    MFillH fillh2("MHRanForestGini");
+
     // list of tasks for the loop over the trees
     
     tlist2.AddToList(&rfgrow2);
     tlist2.AddToList(&rfwrite2);
+    tlist2.AddToList(&fillh2);
 
     //-------------------
@@ -1309 +1313 @@
 
     tlist2.PrintStatistics(0, kTRUE);
+
+    plist2.FindObject("MHRanForestGini")->DrawClone();
+
 
     // get adresses of objects which are used in the next eventloop
@@ -1557 +1564 @@
 
     gLog << "" << endl;
-    gLog << "Macro CT1Analysis : JobB_SC_UP, RMatrix, WOptimize, RTest, WSC = "
+    gLog << "Macro CT1Analysis : JobB_SC_UP, CMatrix, RMatrix, WOptimize, RTest, WSC = "
          << (JobB_SC_UP ? "kTRUE" : "kFALSE")  << ",  " 
+         << (CMatrix    ? "kTRUE" : "kFALSE")  << ",  "
          << (RMatrix    ? "kTRUE" : "kFALSE")  << ",  "
          << (WOptimize  ? "kTRUE" : "kFALSE")  << ",  "
@@ -1660 +1668 @@
     //--------------------------
     // create matrices and write them onto files 
-    if (!RMatrix)
+    if (CMatrix)
     {
       MH3 &mh3 = *(new MH3("MHillas.fSize"));
@@ -2111 +2119 @@
     //  - read ON1 and MC1 data files  
     //    which should have been updated to contain the hadronnesses
-    //    for the method of NEAREST NEIGHBORS and for the SUOERCUTS
+    //    for the method of Random Forest and for the SUPERCUTS
     //  - produce Neyman-Pearson plots