[Rivet-svn] r3169 - trunk/bin

[blackhole at projects.hepforge.org]

Author: buckley
Date: Wed Jun 29 18:11:25 2011
New Revision: 3169

Log:
Allow overwriting of properties in make-plots... emi a debug message if doing so. Any reason not to do this? I think the last-specified value should always be used... but maybe it's like this to let some global overrides work?

Modified:
   trunk/bin/make-plots

Modified: trunk/bin/make-plots
==============================================================================
--- trunk/bin/make-plots	Wed Jun 29 12:35:43 2011	(r3168)
+++ trunk/bin/make-plots	Wed Jun 29 18:11:25 2011	(r3169)
@@ -131,7 +131,8 @@
         foo=[]
         if self.description.has_key('DrawOnly'):
             for i in self.description['DrawOnly'].strip().split():
-                if i in self.histos.keys(): foo.append(i)
+                if i in self.histos.keys():
+                    foo.append(i)
         else:
             foo=self.histos.keys()
         self.description['DrawOnly']=foo
@@ -162,8 +163,9 @@
             m = pat_property.match(line)
             if m:
                 prop, value = m.group(1,2)
-                if not prop in self.description:
-                    self.description[prop] = value
+                if prop in self.description:
+                    logging.debug("Overwriting property %s = %s -> %s" % (prop, self.description[prop], value))
+                self.description[prop] = value
 
 
     def read_path_based_input(self, line):