[HepData-svn] r1819 - in trunk/hepdata-webapp/src/main: java/cedar/hepdata/formats resources/cedar/hepdata/webapp/pages

[blackhole at projects.hepforge.org]

Author: watt
Date: Tue Sep 30 18:20:21 2014
New Revision: 1819

Log:
Capitalise experiment name in AIDA and YODA formats.  Fix display of semicolons in location part of input format.  Add link to new GraphSysErr ROOT class written by Christian Holm Christensen.

Modified:
   trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/AidaFormatter.java
   trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/InputFormatter.java
   trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/YodaFormatter.java
   trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/SubmittingData.tml

Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/AidaFormatter.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/AidaFormatter.java	Thu Sep 25 14:29:17 2014	(r1818)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/AidaFormatter.java	Tue Sep 30 18:20:21 2014	(r1819)
@@ -44,7 +44,7 @@
             Paper pp = d.getPaper();
             String expts = "";
             for (Experiment e : pp.getExperiments()) {
-                expts += e.getInformalName() + "_";
+                expts += e.getInformalName().toUpperCase() + "_";
             }
             if (expts.length() == 0) expts = "EXPT_";
             String year = "XXXX";

Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/InputFormatter.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/InputFormatter.java	Thu Sep 25 14:29:17 2014	(r1818)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/InputFormatter.java	Tue Sep 30 18:20:21 2014	(r1819)
@@ -59,7 +59,11 @@
 	StringBuffer s = new StringBuffer();
         s.append("\n*dataset:"+"\n");
         if(ds.getTfpString() != null){ 
-            s.append(ds.getTfpString().replace("TFP = L","*l").replace(";","").replace(": ",": ") + "\n"); 
+            //s.append(ds.getTfpString().replace("TFP = L","*l").replace(";","").replace(": ",": ") + "\n");
+	    // G.W. 29/09/2014 Line above will remove semicolons in middle.
+	    String stemp = ds.getTfpString().replace("TFP = L","*l");
+	    stemp = stemp.substring(0, stemp.length() - 1);
+	    s.append(stemp + "\n");
         }
         for (String comment : ds.getComments()){
             if(!comment.startsWith("Location")){

Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/YodaFormatter.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/YodaFormatter.java	Thu Sep 25 14:29:17 2014	(r1818)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/YodaFormatter.java	Tue Sep 30 18:20:21 2014	(r1819)
@@ -43,7 +43,7 @@
                 Paper pp = d.getPaper();
                 String expts = "";
                 for (Experiment e : pp.getExperiments()){
-                    expts += e.getInformalName() + "_";
+                    expts += e.getInformalName().toUpperCase() + "_";
                 }
                 if (expts.length() == 0) expts = "EXPT_";
                 String year = "XXXX";

Modified: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/SubmittingData.tml
==============================================================================
--- trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/SubmittingData.tml	Thu Sep 25 14:29:17 2014	(r1818)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/SubmittingData.tml	Tue Sep 30 18:20:21 2014	(r1819)
@@ -21,6 +21,8 @@
 <p/>
 A Python <a href="http://hepdata.cedar.ac.uk/resource/hepconverter.py">script</a> has been written by Mike Flowerdew (ATLAS) to convert objects in .root files to the HepData "input" format.  A test .root file can be made with another Python <a href="http://hepdata.cedar.ac.uk/resource/MakeTestFile.py">script</a> and some brief usage <a href="http://hepdata.cedar.ac.uk/resource/hepconverternotes.txt">notes</a> are provided.
 <p/>
+A ROOT TGraph-like <a href="http://cern.ch/cholm/root/gse/html/">class</a> has been written by Christian Holm Christensen (ALICE) to hold results with statistical and systematic errors and with the ability to import from and export to the HepData "input" format.
+<p/>
 It is possible to use LaTeX mathematical expressions in the "input" file, which will be rendered using <a href="http://www.mathjax.org">MathJax</a> in the HTML display; see <a href="http://hepdata.cedar.ac.uk/view/ins1298811">here</a> or <a href="http://hepdata.cedar.ac.uk/view/ins1306294">here</a> for example records that use LaTeX.
 </td>
 </tr>