[Rivet-svn] r2894 - trunk/bin

[blackhole at projects.hepforge.org]

Author: fsiegert
Date: Tue Jan 25 19:52:04 2011
New Revision: 2894

Log:
more fixes for python 2.4

Modified:
   trunk/bin/make-plots
   trunk/bin/rivet-mkhtml

Modified: trunk/bin/make-plots
==============================================================================
--- trunk/bin/make-plots	Mon Jan 24 22:35:46 2011	(r2893)
+++ trunk/bin/make-plots	Tue Jan 25 19:52:04 2011	(r2894)
@@ -317,7 +317,10 @@
             foo=[]
             for i in inputdata.description['DrawOnly']:
                 foo.append(inputdata.histos[i].getZMin(self.xmin, self.xmax, self.ymin, self.ymax))
-            self.zmin = min(foo) if foo else 0
+            if foo:
+                self.zmin = min(foo)
+            else:
+                self.zmin = 0
 
     def set_zmax(self,inputdata):
         if inputdata.description.has_key('ZMax'):
@@ -326,7 +329,10 @@
             foo=[]
             for i in inputdata.description['DrawOnly']:
                 foo.append(inputdata.histos[i].getZMax(self.xmin, self.xmax, self.ymin, self.ymax))
-            self.zmax = max(foo) if foo else 1
+            if foo:
+                self.zmax = max(foo)
+            else:
+                self.zmax = 1
 
 
     def draw(self):

Modified: trunk/bin/rivet-mkhtml
==============================================================================
--- trunk/bin/rivet-mkhtml	Mon Jan 24 22:35:46 2011	(r2893)
+++ trunk/bin/rivet-mkhtml	Tue Jan 25 19:52:04 2011	(r2894)
@@ -182,7 +182,10 @@
     references = []
     summary = analysis
     description = "NONE"
-    spiresid = analysis[analysis.rfind('S')+1:len(analysis)] if analysis.startswith("S") else "NONE"
+    if analysis.startswith("S"):
+        spiresid = analysis[analysis.rfind('S')+1:len(analysis)]
+    else:
+        spiresid = "NONE"
     ana = rivet.AnalysisLoader.getAnalysis(analysis)
     if ana:
         if ana.summary() and ana.summary() != "NONE":