Changeset 6797 for trunk/MagicSoft

Timestamp:

03/09/05 11:35:32 (20 years ago)

Author:

hengsteb

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mranforest/MRFEnergyEst.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2005/03/09 Thomas Hengstebeck
+
+   * mranforest/MRFEnergyEst.cc
+     - changed call of min, max functions to TMath::Min() and 
+       TMath::Max() to avoid compilation problems with some gcc
+       versions
+     - changed check of energy rule (last col of MHMatrix) so, that 
+       any rule containing "fEnergy" is accepted.
+
+
  2005/03/08 Markus Gaug
 

trunk/MagicSoft/Mars/mranforest/MRFEnergyEst.cc

@@ -61 +61 @@
 #include "TStyle.h"
 #include "TCanvas.h"
+#include "TMath.h"
 #include "TVector.h"
 
@@ -134 +135 @@
     }
 
-    if(energy_rule.CompareTo("MMcEvt.fEnergy"))
+    if(!energy_rule.Contains("fEnergy"))
     {
         *fLog << err << dbginf << "Can not accept "<<energy_rule<<" as true energy ... aborting." << endl;
@@ -275 +276 @@
     for(Int_t j=0;j<nbins;j++)
     {
-        e_low = min(atof((fEForests[j])->GetTitle()),e_low);
-        e_up  = max(atof((fEForests[j])->GetTitle()),e_up);
+        e_low = TMath::Min(atof((fEForests[j])->GetTitle()),e_low);
+        e_up  = TMath::Max(atof((fEForests[j])->GetTitle()),e_up);
     }