[Rivet-svn] r3080 - trunk/bin

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Thu May  5 17:38:00 2011
New Revision: 3080

Log:
revert c3077 in compare-histos, since it introduced a different set of problems. *SIGH*

Modified:
   trunk/bin/compare-histos

Modified: trunk/bin/compare-histos
==============================================================================
--- trunk/bin/compare-histos	Thu May  5 12:48:27 2011	(r3079)
+++ trunk/bin/compare-histos	Thu May  5 17:38:00 2011	(r3080)
@@ -189,13 +189,13 @@
 
     ## Get file names and labels
     FILES = []
-    REFFILES = []
     FILEOPTIONS = { }
     if opts.RIVETREFS and rivet_data_dirs:
+        reffiles = []
         for d in rivet_data_dirs:
             import glob
-            REFFILES += glob.glob(os.path.join(d, "*.aida"))
-        args = REFFILES + args
+            reffiles += glob.glob(os.path.join(d, "*.aida"))
+        args = reffiles + args
     for a in args:
         asplit = a.split(":")
         path = asplit[0]
@@ -207,8 +207,6 @@
                 asplit[i] = "Title=%s" % asplit[i]
             FILEOPTIONS[path].append(asplit[i])
 
-    ## Ignore duplicates
-    FILES = list(set(FILES))
 
     ## Check that the requested files are sensible
     if (len(FILES) < 1):
@@ -275,8 +273,6 @@
     for f in FILES:
         histos, titles, xlabels, ylabels = getHistos(f)
         for n, h in histos.iteritems():
-            if not h.isdata and f not in REFFILES:
-                continue
             if h.isdata:
                 l = "data"
                 if h.expt: