[Rivet-svn] r2264 - trunk/bin

[blackhole at projects.hepforge.org]

Author: eike
Date: Fri Feb 12 14:08:08 2010
New Revision: 2264

Log:
ignore missing errors due to missing .plot files

Modified:
   trunk/bin/aida2flat
   trunk/bin/compare-histos

Modified: trunk/bin/aida2flat
==============================================================================
--- trunk/bin/aida2flat	Fri Feb 12 00:01:05 2010	(r2263)
+++ trunk/bin/aida2flat	Fri Feb 12 14:08:08 2010	(r2264)
@@ -119,7 +119,10 @@
                         break
             if useThisDps:
                 hist = lighthisto.Histo.fromDPS(dps)
-                plotparser.updateHistoHeaders(hist)
+                try:
+                    plotparser.updateHistoHeaders(hist)
+                except VallueError, err:
+                    logging.warn(err.message)
                 histos.append(hist)
         if len(histos) > 0:
             if opts.SPLITOUTPUT:

Modified: trunk/bin/compare-histos
==============================================================================
--- trunk/bin/compare-histos	Fri Feb 12 00:01:05 2010	(r2263)
+++ trunk/bin/compare-histos	Fri Feb 12 14:08:08 2010	(r2264)
@@ -278,7 +278,11 @@
 
 
         ## Header
-        headers = plotparser.getHeaders(name)
+        try:
+            headers = plotparser.getHeaders(name)
+        except ValueError, err:
+            logging.error("Could not get plot headers: %s" % (err))
+            headers = {}
 
         drawonlystr = ""
         for hfile in activefiles:
@@ -301,7 +305,11 @@
         headstr += "# END PLOT\n"
 
         ## Special
-        special = plotparser.getSpecial(name)
+        try:
+            special = plotparser.getSpecial(name)
+        except ValueError, err:
+            logging.error("Could not get histo specials: %s" % (err))
+            special = {}
         if special:
             headstr += "\n"
             headstr += "# BEGIN SPECIAL %s\n" %name
@@ -309,7 +317,11 @@
             headstr += "# END SPECIAL\n"
 
         ## Write histos
-        histopts = plotparser.getHistogramOptions(name)
+        try:
+            histopts = plotparser.getHistogramOptions(name)
+        except ValueError, err:
+            logging.error("Could not get histo options: %s" % (err))
+            histopts = {}
         histstrs = []
         i = 0
         for hfile in activefiles: