Changeset 5933

Timestamp:

01/21/05 14:17:41 (20 years ago)

Author:

rico

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtemp/mifae

Files:

• Changelog (modified) (1 diff)
• programs/Makefile (modified) (1 diff)
• programs/makeHillas.cc (modified) (10 diffs)
• programs/makehillas.datacard (modified) (1 diff)

trunk/MagicSoft/Mars/mtemp/mifae/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2005/01/21 Javier Rico
+    * programs/makeHillas.cc, programs/Makefile, 
+      programs/makehillas.datacard
+     - Add Random Forest computation
+        
  2005/01/20 Eva Domingo
     * library/MDispParameters.[cc,h]

trunk/MagicSoft/Mars/mtemp/mifae/programs/Makefile

@@ -47 +47 @@
            -I../../../mastro \
            -I../../../mreport \
+           -I../../../mranforest \
            -I../../../mtemp
 

trunk/MagicSoft/Mars/mtemp/mifae/programs/makeHillas.cc

@@ -63 +63 @@
 #include "MTopology.h"
 #include "MTopologyCalc.h"
+#include "MRanForest.h"
+#include "MRanForestCalc.h"
+#include "MRanForestFill.h"
 
 #include "TApplication.h"
@@ -106 +109 @@
 Int_t    wsize   = 6;
 Int_t    sext    = 0;
+TString  rffilename;
 
 const TString defaultcard="makehillas.datacard";
@@ -225 +229 @@
   MPedestalCam pedcamrms;
 
+
+  /************************************************************************/
+  /*                 SECOND LOOP TO READ THE RANDOM FOREST FILE(S)         */
+  /************************************************************************/      
+  MParList  plistrf;
+  MTaskList tlistrf;
+  MRanForest ranforest;
+
+  plistrf.AddToList(&tlistrf);
+  plistrf.AddToList(&ranforest);
+
+  MReadTree readrf("Tree",rffilename);
+  readrf.DisableAutoScheme();
+  
+  MRanForestFill rffill;
+  rffill.SetNumTrees(100);
+  
+  tlistrf.AddToList(&readrf);
+  tlistrf.AddToList(&rffill);
+
+  MEvtLoop evtlooprf;
+  evtlooprf.SetParList(&plistrf);
+  if (!evtlooprf.Eventloop())
+    return;
+  
+  tlistrf.PrintStatistics();
+
+
   /*****************************/
-  /* SECOND LOOP: CALIBRATION  */
+  /* THIRD LOOP: CALIBRATION  */
   /*****************************/        
 
@@ -242 +274 @@
   chargecam.Print();
 
-
   /************************************************************************/
-  /*                 THIRD (SMALL) LOOP TO GET INITIAl PEDESTALS          */
+  /*                 FOURTH (SMALL) LOOP TO GET INITIAl PEDESTALS          */
   /************************************************************************/      
   MParList  plist3;
@@ -322 +353 @@
     {
       /************************************************************************/
-      /*                 FOURTH (SMALL) LOOP TO GET INITIAl PEDESTALS RMS     */
+      /*                 SIXTH (SMALL) LOOP TO GET INITIAl PEDESTALS RMS     */
       /************************************************************************/      
       MParList  plist4;
@@ -405 +436 @@
   plist5.AddToList(&reportdrive);
   plist5.AddToList(&topology);
-  
+  plist5.AddToList(&ranforest);
+
   // cuts
   MF cut(filter);
@@ -435 +467 @@
   MIslandsCalc       island3;
   island3.SetOutputName("MIslands3");  
-  
+
+  MRanForestCalc hadrcalc;
   
   MHillasCalc       hcalc;
@@ -503 +536 @@
   if(topflag>0)
     tlist5.AddToList(&topcalc);
+  if(rffilename.Length())
+    tlist5.AddToList(&hadrcalc);
   tlist5.AddToList(&write);
   if(display)
@@ -639 +674 @@
             }
           }
+        }
+
+      // random forest file name
+      if(strcmp(word.Data(),"RANFOREST")==0)
+        {
+          if(rffilename.Length())
+            cout << "readDataCards Warning: overriding random forest file name" << endl;
+          ifun >> rffilename;
         }
       
@@ -703 +746 @@
   cout << "Cleaning level: ("<<lcore<<","<<ltail<<") - " << lrings << "ring" << endl;
   cout << "Cleaning method: "<< cleanflag << endl;
+  if(rffilename.Length())
+    cout << "Random Forest will be read from " << rffilename << endl;
   if (islflag == 1 || islflag == 2)
     cout << "Island calcultation..." << "using algorithm #" << kalgorithm <<endl;

trunk/MagicSoft/Mars/mtemp/mifae/programs/makehillas.datacard

@@ -63 +63 @@
 CLEANLEVEL 4.0 3.5 1 1
 
+// Add the following word if you want to include Hadronness calculation, 
+// followed by the name of the Random Forest file
+RANFOREST RFstd.root
+
 //Island calculations
 // 0  same as 1                1:normal algorithm