[Rivet-svn] r3139 - trunk/bin

[blackhole at projects.hepforge.org]

Author: fsiegert
Date: Fri Jun 10 10:43:58 2011
New Revision: 3139

Log:
make-plots:
In addition to being able to read (path-based) HISTOGRAM configurations from the config file, also allow for reading PLOT configurations. They can be specified like

# BEGIN PLOT ./path/to/file.dat
XMin=30.0
Legend=0
# END PLOT

(potentially in addition to any HISTOGRAM configurations)

and will be applied when running 'make-plots -c make-plot.conf ./path/to/file.dat'.

Modified:
   trunk/bin/make-plots

Modified: trunk/bin/make-plots
==============================================================================
--- trunk/bin/make-plots	Wed Jun  8 15:27:35 2011	(r3138)
+++ trunk/bin/make-plots	Fri Jun 10 10:43:58 2011	(r3139)
@@ -56,6 +56,7 @@
 
 class Inputdata:
     def __init__(self, filename):
+        self.filename=filename+".dat"
         self.histos = {}
         self.special = {}
         self.functions = {}
@@ -143,7 +144,7 @@
 
                 for line in cf:
                     m = pat_begin_block.match(line)
-                    if m and m.group(1) == 'PLOT':
+                    if m and m.group(1) == 'PLOT' and m.group(2) == self.filename:
                         self.read_input(cf)
                     elif is_comment(line):
                         continue
@@ -161,7 +162,8 @@
             m = pat_property.match(line)
             if m:
                 prop, value = m.group(1,2)
-                self.description[prop] = value
+                if not prop in self.description:
+                    self.description[prop] = value
 
 
     def read_path_based_input(self, line):