|
|
[HepData-svn] r1900 - in trunk/hepdata-webapp/src/main: java/cedar/hepdata/formats resources/cedar/hepdata/webapp/pages
blackhole at projects.hepforge.org
blackhole at projects.hepforge.org
Wed Oct 28 12:58:21 GMT 2015
Author: watt
Date: Wed Oct 28 12:58:21 2015
New Revision: 1900
Log:
Updates to AboutHepdata page, and recognise units given by lower-case 'in' for YAML formatter
Modified:
trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/YamlFormatter.java
trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/AboutHepdata.tml
Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/YamlFormatter.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/YamlFormatter.java Tue Oct 6 13:03:17 2015 (r1899)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/YamlFormatter.java Wed Oct 28 12:58:21 2015 (r1900)
@@ -337,6 +337,9 @@
if(xax.getHeader().contains(" IN ")){
name=xax.getHeader().substring(0,xax.getHeader().indexOf(" IN ")).trim();
unit=xax.getHeader().substring(xax.getHeader().indexOf(" IN ")+4).trim();
+ } else if (xax.getHeader().contains(" in ")) {
+ name=xax.getHeader().substring(0,xax.getHeader().indexOf(" in ")).trim();
+ unit=xax.getHeader().substring(xax.getHeader().indexOf(" in ")+4).trim();
}
s.append(sp+"header: {name: '"+name.replaceAll("'","''")+"'");
if(!unit.equals("")){ s.append(", units: '"+unit+"'"); }
@@ -428,6 +431,9 @@
if(yax.getHeader().contains(" IN ")){
name=yax.getHeader().substring(0,yax.getHeader().indexOf(" IN ")).trim();
unit=yax.getHeader().substring(yax.getHeader().indexOf(" IN ")+4).trim();
+ } else if (yax.getHeader().contains(" in ")) {
+ name=yax.getHeader().substring(0,yax.getHeader().indexOf(" in ")).trim();
+ unit=yax.getHeader().substring(yax.getHeader().indexOf(" in ")+4).trim();
}
s.append(sp+"header: {name: '"+name.replaceAll("'","''")+"'");
if(!unit.equals("")){ s.append(", units: '"+unit+"'"); }
@@ -482,6 +488,9 @@
if(type.contains(" IN ")){
unit=type.substring(type.indexOf(" IN ")+4).trim();
type=type.substring(0,type.indexOf(" IN ")).trim();
+ } else if (type.contains(" in ")) {
+ unit=type.substring(type.indexOf(" in ")+4).trim();
+ type=type.substring(0,type.indexOf(" in ")).trim();
}
s.append(s4+sp+"{name: '"+type.replaceAll("'","''")+"'");
s.append(", value: '"+ value.replaceAll("'","''")+"'");
Modified: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/AboutHepdata.tml
==============================================================================
--- trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/AboutHepdata.tml Tue Oct 6 13:03:17 2015 (r1899)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/AboutHepdata.tml Wed Oct 28 12:58:21 2015 (r1900)
@@ -11,70 +11,71 @@
<h2>About HepData</h2>
<p/>
-The Durham High Energy Physics Database (HepData) has been built up over the past four decades as a unique open-access repository for scattering data from experimental particle physics. It currently comprises the data points from plots and tables related to several thousand publications including those from the Large Hadron Collider (LHC).
+The Durham High Energy Physics Database (HepData) has been built up over the past four decades as a unique open-access repository for scattering data from experimental particle physics. It currently comprises the data points from plots and tables related to several thousand publications including those from the Large Hadron Collider (LHC). An overview of the HepData project was presented in a <a href="http://hepdata.cedar.ac.uk/resource/hepdata-aahep7.pdf">talk</a> (2.9 MB) at <a href="http://indico.cern.ch/event/aahep7/">AAHEP7</a> on 2nd April 2014 and in a <a href="http://hepdata.cedar.ac.uk/resource/hepdata-aahep8.pdf">talk</a> (1.4 MB) at <a href="http://indico.cern.ch/event/aahep8/">AAHEP8</a> on 2nd September 2015.
<p/>
HepData is funded by a grant from the UK <a href="http://www.stfc.ac.uk">STFC</a> and is based at the <a href="http://www.ippp.dur.ac.uk">IPPP</a> at Durham University. The HepData team is very small comprising:
-<table cellspacing='20'>
-<tr><td>
+<p/>
<table align='center' border='1' cellpadding='5'>
<tr align='center' valign='top'>
<td>
-<b>Graeme Watt</b><br/>
+<a href="http://www.ippp.dur.ac.uk/profile/watt"><b>Graeme Watt</b></a><br/>
<img src="http://hepdata.cedar.ac.uk/resource/graemewatt.jpeg" vspace='5'></img><br/>
Current Database Manager<br/>
(since October 2013)
</td>
<td>
-<b>Mike Whalley</b><br/>
+<a href="http://www.ippp.dur.ac.uk/profile/whalley"><b>Mike Whalley</b></a><br/>
<img src="http://hepdata.cedar.ac.uk/resource/mikewhalley.jpeg" vspace='5'></img><br/>
Previous Database Manager<br/>
(part-time, retiring)
</td>
<td>
-<b>Joanne Bentham</b><br/>
+<a href="http://www.ippp.dur.ac.uk/profile/joanne"><b>Joanne Bentham</b></a><br/>
<img src="http://hepdata.cedar.ac.uk/resource/joannebentham.jpeg" vspace='5'></img><br/>
Coding Assistant<br/>
</td>
-</tr>
-</table>
-</td>
<td>
-<i>Principal Investigator</i>:<br/>
-Frank Krauss<br/><br/>
-<i>Co-Investigators</i>:<br/>
-Jeppe Andersen<br/>Nigel Glover<br/>Valya Khoze<br/>Peter Richardson
+<a href="http://www.ippp.dur.ac.uk/profile/krauss"><b>Frank Krauss</b></a><br/>
+<img src="http://hepdata.cedar.ac.uk/resource/frankkrauss.jpeg" vspace='5'></img><br/>
+Principal Investigator<br/>
</td>
</tr>
</table>
<p/>
-An overview of the HepData project was presented in a <a href="http://hepdata.cedar.ac.uk/resource/hepdata-aahep7.pdf">talk</a> (2.9 MB) at <a href="http://indico.cern.ch/event/aahep7/">AAHEP7</a> on 2nd April 2014 and in a <a href="http://hepdata.cedar.ac.uk/resource/hepdata-aahep8.pdf">talk</a> (1.4 MB) at <a href="http://indico.cern.ch/event/aahep8/">AAHEP8</a> on 2nd September 2015.
-<p/>
-The HepData advisory board <a href="http://conference.ippp.dur.ac.uk/e/HepData2014">kickoff meeting</a> was held on 12th November 2014. The next advisory board meeting will be held on 16th October 2015. The current external advisory board members are:
+The HepData advisory board kickoff <a href="http://conference.ippp.dur.ac.uk/e/HepData2014">meeting</a> was held on 12th November 2014, with a follow-up <a href="http://conference.ippp.dur.ac.uk/e/HepData2015">meeting</a> held on 16th October 2015. The current advisory board members are:
<table border='0' cellspacing='5'>
<tr>
-<td> Constantin Loizides (LBNL, ALICE)</td>
+<td> Enrico Scomparin (Torino, ALICE)</td>
<td> </td>
-<td> Matthew Wing (UCL, smaller experiments)</td>
+<td> Kyle Cranmer (NYU, wider user base)</td>
</tr>
<tr>
<td> Bill Murray (RAL/Warwick, ATLAS)</td>
<td> </td>
-<td> Kyle Cranmer (NYU, wider user base)</td>
+<td> Sünje Dallmeier-Tiessen (CERN, INSPIRE)</td>
</tr>
<tr>
<td> Henning Flaecher (Bristol, CMS)</td>
<td> </td>
-<td> Sünje Dallmeier-Tiessen (CERN, INSPIRE)</td>
+<td> Salvatore Mele (CERN, INSPIRE)</td>
</tr>
<tr>
<td> Ulrik Egede (Imperial, LHCb)</td>
+<td> </td>
+<td> Keith Ellis (IPPP)</td>
+</tr>
+<tr>
+<td> Matthew Wing (UCL, smaller experiments)</td>
+<td> </td>
+<td> Jeppe Andersen (IPPP)</td>
</tr>
</table>
<p/>
+A transition will soon be made to a new HEPData site, <a href="http://www.hepdata.net">hepdata.net</a>, based on <a href="http://invenio-software.org/">Invenio</a>, developed in collaboration with <a href="http://inspirehep.net">INSPIRE</a>, and hosted at <a href="http://home.cern">CERN</a>.
+<p/>
</td>
</tr>
</table>
-
</body>
</html>
More information about the HepData-svn
mailing list
|
