[Rivet-svn] r4182 - in trunk: . data/refdata doc

[blackhole at projects.hepforge.org]

Author: buckley
Date: Tue Mar  5 10:24:36 2013
New Revision: 4182

Log:
Fixing the histograms entries in the documentation to be tolerant to plotinfo loading failures.

Modified:
   trunk/ChangeLog
   trunk/data/refdata/ATLAS_2012_I1119557.aida
   trunk/doc/mk-analysis-latex

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Tue Mar  5 10:23:44 2013	(r4181)
+++ trunk/ChangeLog	Tue Mar  5 10:24:36 2013	(r4182)
@@ -1,3 +1,12 @@
+2013-03-05  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Fixing the histograms entries in the documentation to be
+	tolerant to plotinfo loading failures.
+
+	* Making the findDatafile() function primarily find YODA data
+	files, then fall back to AIDA. The ref data loader will use the
+	appropriate YODA format reader.
+
 2013-02-05  David Grellscheid  <David.Grellscheid at durham.ac.uk>
 
 	* include/Rivet/Math/MathUtils.hh: added BWspace bin edge method

Modified: trunk/data/refdata/ATLAS_2012_I1119557.aida
==============================================================================
--- trunk/data/refdata/ATLAS_2012_I1119557.aida	Tue Mar  5 10:23:44 2013	(r4181)
+++ trunk/data/refdata/ATLAS_2012_I1119557.aida	Tue Mar  5 10:24:36 2013	(r4182)
@@ -118,7 +118,7 @@
       <measurement value="0.59" errorPlus="0.161245154965971" errorMinus="0.14142135623730953"/>
     </dataPoint>
   </dataPointSet>
-<!-- comment out eccentricity plots for now since not validated
+  <!-- comment out eccentricity plots for now since not validated
   <dataPointSet name="d03-x01-y01" dimension="2" path="/REF/ATLAS_2012_I1119557" title="(1/N)*D(N)/DECCENTRICITY(C=JET)" >
     <dataPoint>
       <measurement value="0.1" errorPlus="0.1" errorMinus="0.1"/>
@@ -163,7 +163,7 @@
       <measurement value="1.86" errorPlus="0.28284271247461906" errorMinus="0.27294688127912364"/>
     </dataPoint>
   </dataPointSet>
--->
+  -->
   <dataPointSet name="d04-x02-y01" dimension="2" path="/REF/ATLAS_2012_I1119557" title="(1/N)*D(N)/DPLANARFLOW(C=JET)" >
     <dataPoint>
       <measurement value="0.1" errorPlus="0.1" errorMinus="0.1"/>

Modified: trunk/doc/mk-analysis-latex
==============================================================================
--- trunk/doc/mk-analysis-latex	Tue Mar  5 10:23:44 2013	(r4181)
+++ trunk/doc/mk-analysis-latex	Tue Mar  5 10:24:36 2013	(r4182)
@@ -152,7 +152,7 @@
         page += "\\begin{itemize}\n"
         for i in infos:
             if i:
-                page += "\n  \\item %s" % i
+                page += "\\item %s\n" % i
         page += "\\end{itemize}\n"
     else:
         page += "\\textbf{No run details listed}\\\\ \n"
@@ -165,14 +165,21 @@
     try:
         import readplot
         info = readplot.plotinfo(ana.name())
-        if info:
-            page += "\n\\vspace{1em}\n\\noindent\n"
-            page += "\\textbf{Histograms:}\n \\penalty 100\n"
-            page += "\\begin{itemize}\n"
-            for hpath in sorted(info.keys()):
-                htitle = info[hpath]["TITLE"]
-                page += "  \\item %s (\kbd{%s})\n" % (htitle, hpath.replace(r"_", r"\_"))
-            page += "\\end{itemize}\n"
+        histpage = ""
+        histcount = 0
+        if info and info.keys():
+            histpage += "\n\\vspace{1em}\n\\noindent\n"
+            histpage += "\\textbf{Histograms:}\n \\penalty 100\n"
+            try:
+                histpage += "\\begin{itemize}\n"
+                for hpath in sorted(info.keys()):
+                    htitle = info[hpath]["TITLE"]
+                    histpage += "  \\item %s (\kbd{%s})\n" % (htitle, hpath.replace(r"_", r"\_"))
+                    histcount += 1
+            finally:
+                histpage += "\\end{itemize}\n"
+        if histcount > 0:
+            page += histpage
     except:
         pass