[Rivet-svn] r3529 - trunk/bin

[blackhole at projects.hepforge.org]

Author: buckley
Date: Tue Dec 13 11:46:45 2011
New Revision: 3529

Log:
More tweaks!

Modified:
   trunk/bin/compare-histos
   trunk/bin/rivet-mkhtml

Modified: trunk/bin/compare-histos
==============================================================================
--- trunk/bin/compare-histos	Tue Dec 13 11:23:38 2011	(r3528)
+++ trunk/bin/compare-histos	Tue Dec 13 11:46:45 2011	(r3529)
@@ -284,8 +284,9 @@
         FILES.append(path)
         if len(asplit)>1:
             FILEOPTIONS[path] = []
-        for i in range(1, len(asplit)):
-            if not "=" in asplit[i]:
+        for i in xrange(1, len(asplit)):
+            ## Add "Title" if there is no = sign before math mode
+            if not "=" in asplit[i] or ("$" in asplit[i] and asplit[i].index("$") < asplit[i].index("=")):
                 asplit[i] = "Title=%s" % asplit[i]
             FILEOPTIONS[path].append(asplit[i])
 

Modified: trunk/bin/rivet-mkhtml
==============================================================================
--- trunk/bin/rivet-mkhtml	Tue Dec 13 11:23:38 2011	(r3528)
+++ trunk/bin/rivet-mkhtml	Tue Dec 13 11:46:45 2011	(r3529)
@@ -165,15 +165,21 @@
 # TODO: This isn't very sensible... what's the intention? Provide --plotinfodir cmd line option?
 ch_cmd.append("--plotinfodir=../")
 for af in aidafiles:
-    aidafilepath = os.path.abspath(aidafile.split(":")[0])
+    aidafilepath = os.path.abspath(af.split(":")[0])
     if not os.access(aidafilepath, os.R_OK):
         continue
-    ch_cmd.append("%s" % aidafilepath)
+    newarg = aidafilepath
+    if ":" in af:
+        for opt in af.split(":")[1:]:
+            newarg += ":%s" % opt
+    # print newarg
+    ch_cmd.append(newarg)
 if opts.VERBOSE:
     ch_cmd.append("--verbose")
     print "Calling compare-histos with the following options:"
     print ch_cmd
     print " ".join(ch_cmd)
+# print " ".join(ch_cmd)
 Popen(ch_cmd, cwd=opts.OUTPUTDIR, stderr=PIPE).wait()