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

blackhole at projects.hepforge.org blackhole at projects.hepforge.org
Wed May 28 13:37:43 BST 2014


Author: watt
Date: Wed May 28 13:37:43 2014
New Revision: 1801

Log:
Clarify SubmittingData page and correct some other typos

Modified:
   trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/Tip.java
   trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Index.tml
   trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/SearchHelp.tml
   trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/SubmittingData.tml

Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/Tip.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/Tip.java	Tue May 13 12:32:16 2014	(r1800)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/Tip.java	Wed May 28 13:37:43 2014	(r1801)
@@ -29,7 +29,7 @@
 	writer.write(": ");
         writer.end();
 	writer.element("br"); writer.end();
-        writer.write("Enter your query command comprising keyword-value pairs joined with Boolean ANDs. See the full Seach help for more details as to which keywords can be joined.");
+        writer.write("Enter your query command comprising keyword-value pairs joined with Boolean ANDs.");
         writer.write("  A null entry will retrieve all records.");
 	writer.write("  Use % as the right or left truncation character to search for values beginning or ending with the value."); 
         writer.write("  All searches are ");
@@ -58,11 +58,15 @@
         writer.end();
         writer.write(" - the reaction (e.g. p p --> charged x), also "); 
         writer.element("b");
-	writer.write(" beam ");
+	writer.write("beam");
         writer.end(); 
-        writer.write(" and ");
+	writer.write(" , ");
+	writer.element("b");
+	writer.write("targ");
+	writer.end();
+        writer.write(", and ");
         writer.element("b");
-	writer.write(" fsp");
+	writer.write("fsp");
         writer.end();
 	writer.write(".");
         writer.element("br"); writer.end();
@@ -112,7 +116,7 @@
         writer.element("i");
 	writer.write("word");
         writer.end();
-	writer.write(" (matches Inspire records having 'word' in the paper title)");
+	writer.write(" (matches Inspire records having 'word' in the paper title).");
 
         writer.element("br"); writer.end();
         writer.element("b");
@@ -121,7 +125,7 @@
         writer.element("i");
 	writer.write("word");
         writer.end();
-	writer.write(" (matches Inspire records having 'word' in the Inspire keywords)");
+	writer.write(" (matches Inspire records having 'word' in the Inspire keywords).");
 
         writer.element("br"); writer.end();
         writer.element("b");
@@ -130,7 +134,7 @@
         writer.element("i");
 	writer.write("name");
         writer.end();
-	writer.write(" (matches Inspire records having 'name' in the author list)");
+	writer.write(" (matches Inspire records having 'name' in the author list).");
 
     }
 }

Modified: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Index.tml
==============================================================================
--- trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Index.tml	Tue May 13 12:32:16 2014	(r1800)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Index.tml	Wed May 28 13:37:43 2014	(r1801)
@@ -8,7 +8,7 @@
     <table>
       <tr>
 	<td id="mainsearchcol">
-          <h2>Reaction Database Standard Search Interface</h2>
+	  <br/>
           <t:form t:id="search" t:context="query" action="search">
             Enter query:
             <input t:type="textfield" t:value="query" name="q" size="50"/> <input type="submit" value="Search"/>

Modified: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/SearchHelp.tml
==============================================================================
--- trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/SearchHelp.tml	Tue May 13 12:32:16 2014	(r1800)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/SearchHelp.tml	Wed May 28 13:37:43 2014	(r1801)
@@ -25,34 +25,30 @@
 <p/>
 To use this method enter your query string, comprised of <b>keyword-value</b> pairs, in the search box.  
 All searches are case independent.  
-The 'physics' keywords are <b>reac, obs, sqrts, fsp, beam and target</b> which can be combined together with the boolean <b>AND</b>.
-The 'other' keywords are <b>exp, date, ref, auth </b>and <b>ins</b>. Note that in this catagory the only boolean combinations are date with exp or auth.
-Help on the values for the different keywords is available from the 'Browse' section.  
+The 'physics' keywords are <b>reac</b>, <b>obs</b>, <b>sqrts</b>, <b>fsp</b>, <b>beam</b> and <b>targ</b> which can be combined together with the boolean <b>AND</b>.
+The 'other' keywords are <b>exp</b>, <b>date</b>, <b>ref</b>, <b>auth</b> and <b>ins</b>.  Note that in this category the only boolean combinations are <b>date</b> with <b>exp</b> or <b>auth</b>.
+Help on the values for the different keywords is available from the <a href="#" t:type="pagelink" t:page="browse">Browse</a> section.  
 <p/>Descriptions of the keywords  are:
 
 <dl>
 <dt><b>reac</b></dt>
 <dd>
 "reac" (or "re") is one of the keywords to use to find data on a specific reaction.  
-Reactions  are written in the form "a b --> c d ..." where "a" and "b" are notionally called the beam and target 
-particles respectively in the initial state  and "c" and "d" etc. are the final state particles.  
-Because of the way the search is implemented the result is not dependent of the ordering within the final state.
-Note that the search match is exact and the truncation character '%' should be used to specifiy truncated reactions.  
+Reactions are written in the form "a b --> c d ..." where "a" and "b" are notionally called the beam and target particles, respectively, in the initial state, and "c" and "d" etc. are the final state particles.  Because of the way the search is implemented the result is not dependent of the ordering within the final state.  Note that the search match is exact and the truncation character '%' should be used to specify truncated reactions.  
 Help on the particle vocabulary is available in the <a href="#" t:type="pagelink" t:page="browse">Browse</a> section.  
 An example would be "re e+ e- --> j/psi%" which would locate all data from E+ E+ interactions with a J/PSI particle in the final state.
-This could also be written as "beam e+ and target e- and fsp pi+". 
 </dd>
 
 <dt><b>obs</b></dt>
 <dd>
-"obs" is the keyword to use to specifiy a particular type of measurement or observable.  It is often used in conjunction with the "reac" keyword.  Typical values are "SIG" "DSIG/DT", "F2" and "POL".  An example search would be "re e+ e- --> and obs dsig/dx".
+"obs" is the keyword to use to specify a particular type of measurement or observable.  It is often used in conjunction with the "reac" keyword.  Typical values are "SIG", "DSIG/DT", "F2" and "POL".  An example search would be "re e+ e- --> % and obs dsig/dx".
 </dd>
 
 <dt><b>sqrts</b></dt>
 <dd>
 the "sqrts" keyword adds the  centre-of-mass energy criteria to the search.  
 The units are GeV.  An example is "re pbar p% and sqrts 1800".
-Either ">" and "<" can also  be used to specifiy lower and upper bounds to "sqrts"
+Either ">" and "<" can also  be used to specify lower and upper bounds to "sqrts".
 </dd>
 
 <dt><b>fsp</b></dt>
@@ -74,12 +70,12 @@
 <dt><b>exp</b></dt>
 <dd>
 the "exp" (or "cn" or "de") keyword specifies the name of the experiment.  It is a very loose search so only part of a name need be specified.  For example "exp cern" would find all data in the database from CERN experiments while "de ALEPH" would only find data from the ALEPH experiment.
-<br/>The 'exp' keyword can be combined with the 'date' using AND.
+<br/>The "exp" keyword can be combined with the "date" using AND.
 </dd>
 
 <dt><b>date</b></dt>
 <dd>
-the "date" keyword specifies the year of the publication/preprint. It can be combined with 'exp' and 'auth'.     
+the "date" keyword specifies the year of the publication/preprint. It can be combined with "exp" and "auth".     
 </dd>
 
 <dt><b>ref</b></dt>
@@ -87,36 +83,32 @@
 the "ref" keyword specifies the publication or preprint.
 <br/>For example:
 <br/> ref arxiv:1401.7610
-<br/> ref JHEP 1404,031
-<br/> ref PL%  (all Physics Letter entries)
+<br/> ref JHEP 1404%
+<br/> ref PL%  (all Physics Letters entries)
 
 </dd>
 
 <dt><b>auth</b></dt>
 <dd>
 the "auth" keyword specifies the name of the first author on the publication.
-<br/>The 'auth' keyword can be combined with the 'date' using AND.
+<br/>The "auth" keyword can be combined with the "date" using AND.
 </dd>
 
 <dt><b>ins</b></dt>
 <dd>
-the "ins" keyword is the 'Inspire' record number
+the "ins" keyword is the <a href="http://inspirehep.net/">Inspire</a> record number.
 </dd>
 
 </dl>
 
-In most of the keywords left and right truncation on the search can be made by using the "%" character 
-at the beginning and end of the value string respectively.  However, when using the "reac" search care 
-needs to be taken since each of the individual particles are treated separately in the query.
+In most of the keywords left and right truncation on the search can be made by using the "%" character at the beginning and end of the value string, respectively.  However, when using the "reac" search care needs to be taken since each of the individual particles are treated separately in the query.
 <p/>
-<b>In addtion</b> to searching using the above query keywords, the search can be made using the Inspire query system.  
-In particular searching for a word from the title, any author name on the paper or for a specific Inspire keyword 
-can be useful.  For example:
+<b>In addition</b> to searching using the above query keywords, the search can be made using the <a href="http://inspirehep.net/">Inspire</a> query system.  In particular, searching for a word from the title, any author name on the paper or for a specific Inspire keyword can be useful.  For example:
 <p/> <b>title</b>:Higgs
 <br/> <b>author</b>:smith
 <br/> <b>keyword</b>:diffraction  
 <p/>
-The presence of the ":" in the search sends the query to Inspire which returns matching records in HepData
+The presence of the ":" in the search sends the query to <a href="http://inspirehep.net/">Inspire</a> which returns matching records in HepData.
 <p/>
 <b>Form Search Interface</b>
 <p/>

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	Tue May 13 12:32:16 2014	(r1800)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/SubmittingData.tml	Wed May 28 13:37:43 2014	(r1801)
@@ -15,23 +15,11 @@
 <p/>
 If you have, or know of, data which you think should be in the database, then please email us at hepdata(at)projects.hepforge.org.
 <p/>
-The criteria for data to be included is that it be data of a publishable form and not preliminary data.   Data from conferences often fall into the latter category.  If it is possible that data will change following peer review, it may be better to delay HepData submission until after journal acceptance.
+The criterium for data to be included is that it be data of a publishable form and not preliminary data.  Data from conferences often fall into the latter category.  If it is possible that data will change following peer review, it may be better to delay HepData submission until after journal acceptance.
 <p/>
-The format we accept data in is very wide and generally we require only a flat file containing the numerical values.  Postscript and pdf figures are not suitable.  
-
+The format we accept data in is very wide and generally we require only a flat file containing the numerical values.  Postscript and pdf figures are not suitable.  However, supplementary files of any format (.ps, .pdf, .root, .C, .slha, etc.) can be placed in a web directory linked from the main HepData record.
 <p/>
-Ideally the format should be:
-<p/>
-<b>xlow xhigh  y +stat -stat +sys1 -sys1 +sys2 -sys2</b> ...
-<p/> where:
-<br/> <b>xlow</b> and <b>xhigh</b> are the xbin edges
-<br/> <b>y</b> is the measured quantity
-<br/> <b>+stat</b> and <b>-stat</b> are the positive and negative statistical errors (could also be <b>+-stat</b> if equal)
-<br/> <b>+sysn</b> and <b>-sysn</b> are any number of positive and negative systematic errors (again could be <b>+-sysn</b> if equal)
-<p/> You can also include other things like
-<b>xfocus</b> (mean of the distribution within the bin); just specify the column definitions when submitting the data.
-<p/>
-Any text files you send us will be processed into a standard format, which can be seen from the "input" link on any of the existing records.  Data submissions provided in text formats closer to the "input" format can therefore be entered more quickly into the database.  You can start by looking at the "input" file for an existing record that is similar to your submitted data.  An annotated <a href="http://hepdata.cedar.ac.uk/resource/sample.input">sample input file</a> is available, as is the historical 1970s <a href="http://hepdata.cedar.ac.uk/resource/EncodingManual.pdf">encoding manual</a> (14 MB) defining some nomenclature that is still used in practice.  It is useful to provide key metadata for each table such as a caption, the process being considered (initial-state and final-state particles), important kinematic cuts, and headers for the x and y columns specifying the quantity with units.  Multiple x and y values can be given in the same row separated by semicolons an
 d non-existent entries can be indicated by dashes "-".  Numerical values should be given with an appropriate and not excessive number of significant figures (in general, a maximum of 4), avoiding giving more decimal places for the errors than the central values.  An <a href='http://hepdata.cedar.ac.uk/resource-cgi/input'>online form</a> is available to test data input.  Click on "Browse..." to select your input file, followed by "Upload" and "Process", then click "Display" for the first 10 tables, or "All" for the whole record.  Please note that this <a href='http://hepdata.cedar.ac.uk/resource-cgi/input'>online form</a> is only for testing purposes, and the final submittal to HepData must still be done by email.
+Any text files you send us will be processed into a standard format, which can be seen from the "input" link on any of the existing records.  Data submissions provided in text formats closer to the "input" format (<i>not</i> the "plain text" format) can therefore be entered more quickly into the database.  You can start by looking at the "input" file for an existing record that is similar to your submitted data.  An annotated <a href="http://hepdata.cedar.ac.uk/resource/sample.input">sample input file</a> is available, as is a <a href="http://hepdata.cedar.ac.uk/resource/6150.pl">Perl script</a> used to produce the "input" file from the <a href="http://hepdata.cedar.ac.uk/resource/zz.txt">original submission</a>.  Some nomenclature that is still used in practice is defined in the historical 1970s <a href="http://hepdata.cedar.ac.uk/resource/EncodingManual.pdf">encoding manual</a> (14 MB).  It is useful to provide key metadata for each table such as a caption, the process bei
 ng considered (initial-state and final-state particles), important kinematic cuts, and headers for the x and y columns specifying the quantity with units.  Multiple x and y values can be given in the same row separated by semicolons and non-existent entries can be indicated by dashes "-".  Numerical values should be given with an appropriate and not excessive number of significant figures (in general, a maximum of 4), avoiding giving more decimal places for the errors than the central values.  An <a href="http://hepdata.cedar.ac.uk/resource-cgi/input">online form</a> is available to test data input.  Click on "Browse..." to select your input file, followed by "Upload" and "Process", then click "Display" for the first 10 tables, or "All" for the whole record.  Please note that this <a href="http://hepdata.cedar.ac.uk/resource-cgi/input">online form</a> is only for testing purposes, and the final submittal to HepData must still be done by email to hepdata(at)projects.hepforge.
 org.
 </td>
 </tr>
 </table>


More information about the HepData-svn mailing list