[Rivet-svn] rivet: Bugfix in make-plots for plotting of FUNCTIONs and SPECIALs.

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/4fa3fda73bef
branches:  release-2-5-x
changeset: 5771:4fa3fda73bef
user:      Frank Siegert <frank.siegert at cern.ch>
date:      Thu May 11 14:00:28 2017 +0200
description:
Bugfix in make-plots for plotting of FUNCTIONs and SPECIALs.

diffs (41 lines):

--- a/bin/make-plots	Wed May 10 22:24:55 2017 +0100
+++ b/bin/make-plots	Thu May 11 14:00:28 2017 +0200
@@ -691,31 +691,31 @@
 
         # TODO: do this more compactly, e.g. by assigning sorting keys!
         if inputdata.attr_bool('DrawSpecialFirst', False):
-            for s in inputdata.special:
+            for s in inputdata.special.values():
                 out += s.draw(self.coors)
             if inputdata.attr_bool('DrawFunctionFirst', False):
-                for f in inputdata.functions:
+                for f in inputdata.functions.values():
                     out += f.draw(self.coors)
                 for i in inputdata.description['DrawOnly']:
                     out += inputdata.histos[i].draw(self.coors)
             else:
                 for i in inputdata.description['DrawOnly']:
                     out += inputdata.histos[i].draw(self.coors)
-                for f in inputdata.functions:
+                for f in inputdata.functions.values():
                     out += f.draw(self.coors)
         else:
             if inputdata.attr_bool('DrawFunctionFirst', False):
-                for f in inputdata.functions:
+                for f in inputdata.functions.values():
                     out += f.draw(self.coors)
                 for i in inputdata.description['DrawOnly']:
                     out += inputdata.histos[i].draw(self.coors)
             else:
                 for i in inputdata.description['DrawOnly']:
                     out += inputdata.histos[i].draw(self.coors)
-                for f in inputdata.functions:
+                for f in inputdata.functions.values():
                     out += f.draw(self.coors)
-            for i in inputdata.special.keys():
-                out += inputdata.special[i].draw(self.coors)
+            for s in inputdata.special.values():
+                out += s.draw(self.coors)
 
         if inputdata.attr_bool('Legend', False):
             legend = Legend(inputdata.description,inputdata.histos,inputdata.functions)