Changeset 5934 for trunk/MagicSoft/Mars/mtemp/mifae/programs

Timestamp:

01/21/05 14:43:04 (20 years ago)

Author:

rico

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mtemp/mifae/programs/makeHillas.cc (modified) (4 diffs)

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

@@ -230 +230 @@
 
 
-  /************************************************************************/
-  /*                 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();
-
-
   /*****************************/
-  /* THIRD LOOP: CALIBRATION  */
+  /* SECOND LOOP: CALIBRATION  */
   /*****************************/        
 
@@ -275 +248 @@
 
   /************************************************************************/
-  /*                 FOURTH (SMALL) LOOP TO GET INITIAl PEDESTALS          */
+  /*                THIRD (SMALL) LOOP TO GET INITIAl PEDESTALS          */
   /************************************************************************/      
   MParList  plist3;
@@ -312 +285 @@
   
   tlist3.PrintStatistics();
+
+
+  /************************************************************************/
+  /*                 FOURTH LOOP TO READ THE RANDOM FOREST FILE(S)         */
+  /************************************************************************/      
+  MParList  plistrf;
+  MTaskList tlistrf;
+  MRanForest ranforest;
+
+  plistrf.AddToList(&tlistrf);
+  plistrf.AddToList(&ranforest);
+
+  if(rffilename.Length())
+    {
+      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();
+    }
   
   /************************************************************************/
@@ -493 +496 @@
   write.AddContainer("MReportDrive"   , "Parameters");
   write.AddContainer("MTopology",       "Parameters");
+  write.AddContainer("MHadronness",     "Parameters");
   
   if (islflag == 2)