[Rivet-svn] rivet: 6 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/1d893bc9d413
branches:  release-2-4-x
changeset: 5221:1d893bc9d413
user:      Andy Buckley <andy at insectnation.org>
date:      Tue May 31 22:53:48 2016 +0100
description:
Trying to tidy and improve the make-plots code... we might be stuck with it for a while yet, so let's streamline

details:   https://rivet.hepforge.org/hg/rivet/rev/5d7684df7b15
branches:  release-2-4-x
changeset: 5222:5d7684df7b15
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Jun 01 10:50:56 2016 +0100
description:
Start putting in properties

details:   https://rivet.hepforge.org/hg/rivet/rev/c746f30ddaa2
branches:  release-2-4-x
changeset: 5223:c746f30ddaa2
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Jun 02 09:56:32 2016 +0100
description:
Typo/bug fixes in make-plots reworking

details:   https://rivet.hepforge.org/hg/rivet/rev/ee23212e5072
branches:  release-2-4-x
changeset: 5224:ee23212e5072
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Jun 02 10:13:00 2016 +0100
description:
Add warning printout if custom ticks lists are not an even number of elements long

details:   https://rivet.hepforge.org/hg/rivet/rev/a01afd3e56f9
branches:  release-2-4-x
changeset: 5225:a01afd3e56f9
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Jun 02 11:44:37 2016 +0100
description:
More properties, now for plot sizes

details:   https://rivet.hepforge.org/hg/rivet/rev/0fb09450310e
branches:  release-2-4-x
changeset: 5226:0fb09450310e
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Jun 03 10:34:38 2016 +0100
description:
Updating .plot files and make-plots docs for general-whitespace-separated XCustomMajorTicks pos/label lists

diffs (truncated from 1084 to 50 lines):

--- a/bin/make-plots	Mon May 30 21:19:03 2016 +0100
+++ b/bin/make-plots	Fri Jun 03 10:34:38 2016 +0100
@@ -65,7 +65,7 @@
 
 
 
-class Inputdata(object):
+class InputData(object):
 
     def __init__(self, filename):
         self.filename = filename+".dat"
@@ -76,8 +76,8 @@
         self.description = {}
         self.pathdescriptions = []
 
-        self.description['is2dim'] = False
-        f = open(filename+'.dat')
+        self.is2dim = False
+        f = open(self.filename)
         for line in f:
             m = pat_begin_block.match(line)
             if m:
@@ -109,7 +109,6 @@
 
         self.apply_config_files(opts.CONFIGFILES)
 
-
         ## Plot (and subplot) sizing
         self.description.setdefault('PlotSizeX', 10.)
         if self.description['is2dim']:
@@ -168,11 +167,10 @@
         sortedhistolist = []
         for i in sorted(histoordermap.keys()):
             sortedhistolist.extend(histoordermap[i])
-        self.description['DrawOnly']=sortedhistolist
+        self.description['DrawOnly'] = sortedhistolist
 
 
-        # inherit various values from histograms if not explicitly
-        # set.
+        ## Inherit various values from histograms if not explicitly set
         for k in ['LogX', 'LogY', 'LogZ',
                   'XLabel', 'YLabel', 'ZLabel',
                   'XCustomMajorTicks', 'YCustomMajorTicks', 'ZCustomMajorTicks']:
@@ -181,17 +179,194 @@
         return
 
 
+    def has_attr(self, key):
+        return self.description.has_key(key)