[Rivet-svn] r3287 - in trunk: . bin

[blackhole at projects.hepforge.org]

Author: davemallows
Date: Tue Aug  9 16:23:55 2011
New Revision: 3287

Log:
Fix aida2flat for empty dataPointSets

Modified:
   trunk/ChangeLog
   trunk/bin/aida2flat

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Tue Aug  9 15:11:37 2011	(r3286)
+++ trunk/ChangeLog	Tue Aug  9 16:23:55 2011	(r3287)
@@ -1,3 +1,6 @@
+2011-08-09  David Mallows <dave.mallows at gmail.com>
+	* Fix aida2flat to ignore empty dataPointSet
+
 2011-08-07  Andy Buckley  <andy at insectnation.org>
 
 	* Adding TEXINPUTS and LATEXINPUTS prepend definitions to the

Modified: trunk/bin/aida2flat
==============================================================================
--- trunk/bin/aida2flat	Tue Aug  9 15:11:37 2011	(r3286)
+++ trunk/bin/aida2flat	Tue Aug  9 16:23:55 2011	(r3287)
@@ -133,6 +133,14 @@
             sys.exit(1)
         for dps in tree.findall("dataPointSet"):
             useThis = True
+            
+            ## Check dataPointSet contains at least one measurement
+            try:
+                if dps.find('dataPoint').find('measurement') is None:
+                    useThis = False
+            except AttributeError, err:
+                logging.debug(err)
+
             dpspath = os.path.join(dps.get("path"), dps.get("name"))
 
             ## If regexes have been provided, only add analyses which match and don't unmatch