Changeset 5959 for trunk/MagicSoft/Mars

Timestamp:

01/24/05 11:18:14 (20 years ago)

Author:

rico

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtemp/mifae

Files:

• Changelog (modified) (1 diff)
• programs/RFstd.root (added)
• programs/makeHillas.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mtemp/mifae/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
- 2005/01/24 Eva Domingo
+ 2005/01/24 Javier Rico
     * programs/RFstd.root
      - added default random forest file

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

@@ -306 +306 @@
   MRanForest ranforest;
 
-  plistrf.AddToList(&tlistrf);
-  plistrf.AddToList(&ranforest);
-
   if(rffilename.Length())
     {
+      plistrf.AddToList(&tlistrf);
+      plistrf.AddToList(&ranforest);
+
       MReadTree readrf("Tree",rffilename);
       readrf.DisableAutoScheme();
@@ -423 +423 @@
   MIslands      isl3;
   MTopology     topology;
+
   // disp
   // (read in optimum Disp parameter values)  
-  TFile inparam(dispfilename);
   MDispParameters dispin;
-  dispin.Read("MDispParameters");
-  inparam.Close();
   TArrayD dispPar;
-  dispPar =  dispin.GetParameters();
-  cout << "Optimum parameter values taken for calculating Disp : " << endl;
-  for (Int_t i=0; i<dispPar.GetSize(); i++)
-    {
-      cout << dispPar[i] << ",  ";
-    }
-  cout << endl;
+  if(dispfilename.Length())
+    {
+      TFile inparam(dispfilename);
+      dispin.Read("MDispParameters");
+      cout << "Optimum parameter values taken for calculating Disp : " << endl;
+
+      dispPar =  dispin.GetParameters();
+      for (Int_t i=0; i<dispPar.GetSize(); i++)
+        cout << dispPar[i] << ",  ";
+      cout << endl;
+      
+      inparam.Close();
+    }
   // Disp results container
   MImageParDisp imagepardisp;
@@ -473 +477 @@
   plist5.AddToList(&topology);
   plist5.AddToList(&ranforest);
-  plist5.AddToList(&dispin);  
-  plist5.AddToList(&imagepardisp);
-  plist5.AddToList(&hdisp);
+  if(dispfilename.Length())
+    {
+      plist5.AddToList(&dispin);  
+      plist5.AddToList(&imagepardisp);
+      plist5.AddToList(&hdisp);
+    }
 
   // cuts