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

[blackhole at projects.hepforge.org]

Author: watt
Date: Fri Jul 25 18:06:16 2014
New Revision: 1811

Log:
Fix bug swapping xerr- and xerr+ in YodaFormatter.  Browse observables from DsObservables rather than YAxes.

Modified:
   trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/YodaFormatter.java
   trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Browsing.java

Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/YodaFormatter.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/YodaFormatter.java	Thu Jul 24 13:07:28 2014	(r1810)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/YodaFormatter.java	Fri Jul 25 18:06:16 2014	(r1811)
@@ -72,7 +72,7 @@
                         s.append("Type=Scatter2D\n");
                         s.append("# xval   xerr-   xerr+   yval   yerr-   yerr+\n");
                         for (int r = 1; r <= d.getMaxPointId(); ++r) {
-                            StringTemplate row = new StringTemplate("$focus$\t$dplus$\t$dminus$\t$xlow$\t$xhigh$\t$yval$\t$yerrminus$\t$yerrplus$");
+                            StringTemplate row = new StringTemplate("$focus$\t$dminus$\t$dplus$\t$xlow$\t$xhigh$\t$yval$\t$yerrminus$\t$yerrplus$");
                             Bin b = x.getBin(r);
                             Point p = y.getPoint(r);
                             if (b != null && p != null) {

Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Browsing.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Browsing.java	Thu Jul 24 13:07:28 2014	(r1810)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Browsing.java	Fri Jul 25 18:06:16 2014	(r1811)
@@ -131,8 +131,8 @@
            q = _session.createSQLQuery("select distinct ParticleName from FinalStates");
        }
        else if (getQueryParam("keyword").equals("obs")){
-//           q = _session.createSQLQuery("select distinct dsobs.DsObservables as dsname from DsObservables dsobs order by dsname").addScalar("dsname", Hibernate.STRING);
-           q = _session.createSQLQuery("select distinct ya.Observable as dsname from YAxes ya order by dsname").addScalar("dsname", Hibernate.STRING);
+           q = _session.createSQLQuery("select distinct dsobs.DsObservables as dsname from DsObservables dsobs order by dsname").addScalar("dsname", Hibernate.STRING);
+           //q = _session.createSQLQuery("select distinct ya.Observable as dsname from YAxes ya order by dsname").addScalar("dsname", Hibernate.STRING);
        }
        else if (getQueryParam("keyword").equals("reac")){
            q = _session.createSQLQuery("select distinct dsreac.DsReactions as dsname from DsReactions dsreac order by dsname").addScalar("dsname", Hibernate.STRING);