[Rivet-svn] rivet: make-plots updates (allow for multiple ratios and extende...

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/a782e1488545
branches:  release-2-6-x
changeset: 6322:a782e1488545
user:      Christian Gutschow <chris.g at cern.ch>
date:      Fri May 25 22:26:28 2018 +0100
description:
make-plots updates (allow for multiple ratios and extended PStricks magic

diffs (truncated from 1887 to 50 lines):

--- a/bin/make-plots	Fri May 25 12:21:01 2018 +0100
+++ b/bin/make-plots	Fri May 25 22:26:28 2018 +0100
@@ -38,6 +38,7 @@
 import tempfile
 import getopt
 import string
+import copy
 from math import *
 
 
@@ -129,43 +130,59 @@
 class InputData(Described):
 
     def __init__(self, filename):
-        self.filename = filename
+        self.filename=filename
         if not self.filename.endswith(".dat"):
-            self.filename += ".dat"
+          self.filename += ".dat"
+        self.normalized=False
         self.histos = {}
+        self.ratiohistos = {}
+        self.histomangler = {}
         self.special = {}
         self.functions = {}
 
         self.description = {}
         self.pathdescriptions = []
 
-        self.is2dim = False
-        f = open(self.filename)
+        self.description['is2dim'] = False
+        f = open(filename)
         for line in f:
             m = pat_begin_block.match(line)
             if m:
                 name, path = m.group(1,2)
+
                 if path is None and name != 'PLOT':
                     raise Exception('BEGIN sections need a path name.')
 
-                ## Pass the reading of the block to separate functions
                 if name == 'PLOT':
                     self.read_input(f);
                 elif name == 'SPECIAL':
                     self.special[path] = Special(f)
                 elif name == 'HISTOGRAM' or name == 'HISTOGRAM2D':
                     self.histos[path] = Histogram(f, p=path)
-                    # self.histos[path].path = path
                     self.description['is2dim'] = self.histos[path].is2dim