[HepData-svn] r1356 - trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats

[blackhole at projects.hepforge.org]

Author: buckley
Date: Mon Jun  7 15:53:34 2010
New Revision: 1356

Log:
Fix remaining errors for data formatters when there are less than the maximal number of y-axis points.

Modified:
   trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/AidaFormatter.java
   trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/PyRootFormatter.java

Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/AidaFormatter.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/AidaFormatter.java	Mon Jun  7 11:38:02 2010	(r1355)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/AidaFormatter.java	Mon Jun  7 15:53:34 2010	(r1356)
@@ -72,11 +72,11 @@
                 s.append("path=\"" + path + "\" title=\"" + y.getHeader() + "\" >\n");
 
                 for (int r = 1; r <= d.getMaxPointId(); ++r) {
-                    s.append("    <dataPoint>\n");
                     StringTemplate xtag = new StringTemplate("<measurement value=\"$val$\" errorPlus=\"$dplus$\" errorMinus=\"$dminus$\"/>");
                     Bin b = x.getBin(r);
                     Point p = y.getPoint(r);
                     if (b != null && p != null) {
+                        s.append("    <dataPoint>\n");
 
                         Double xval = b.getFocus();
                         Double dxminus = b.getDMinus();
@@ -134,8 +134,8 @@
                         ytag.setAttribute("dminus", dyminus);
                         ytag.setAttribute("dplus", dyminus);
                         s.append("      " + ytag.toString() + '\n');
+                        s.append("    </dataPoint>\n");
                     }
-                    s.append("    </dataPoint>\n");
                 }
                 s.append("  </dataPointSet>\n");
             }

Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/PyRootFormatter.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/PyRootFormatter.java	Mon Jun  7 11:38:02 2010	(r1355)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/PyRootFormatter.java	Mon Jun  7 15:53:34 2010	(r1356)
@@ -66,29 +66,22 @@
                     StringBuffer yep = new StringBuffer("yerrplus = array(\"f\", [");
                     for (int r = 0; r <= d.getMaxPointId(); ++r) {
                         String sep = ", ";
-                        if (r == d.getMaxPointId()) sep = "])";
+                        if (r == 0) sep = "";
                         Bin b = x.getBin(r);
                         Point p = y.getPoint(r);
                         if (b != null && p != null) {
                             Double xval = b.getFocus();
-                            xv.append(xval.toString() + sep);
+                            xv.append(sep + xval.toString());
                             Double dxminus = b.getDMinus();
-                            xem.append(dxminus.toString() + sep);
+                            xem.append(sep + dxminus.toString());
                             Double dxplus = b.getDPlus();
-                            xep.append(dxplus.toString() + sep);
+                            xep.append(sep + dxplus.toString());
                             Double yval = p.getValue();
-                            yv.append(yval.toString() + sep);
+                            yv.append(sep + yval.toString());
                             Double dyminus = p.getQuadCombinedMinusError();
-                            yem.append(dyminus.toString() + sep);
+                            yem.append(sep + dyminus.toString());
                             Double dyplus = p.getQuadCombinedPlusError();
-                            yep.append(dyplus.toString() + sep);
-                        } else{
-                             xv.append(sep);
-                             xem.append(sep);
-                             xep.append(sep);
-                             yv.append(sep);
-                             yem.append(sep);
-                             yep.append(sep);
+                            yep.append(sep + dyplus.toString());
                         }
                     }