[HepData-svn] r1653 - trunk/hepdata-model/src/main/java/cedar/hepdata/model

[blackhole at projects.hepforge.org]

Author: whalley
Date: Wed Nov  6 12:00:58 2013
New Revision: 1653

Log:
to make HepML work

Modified:
   trunk/hepdata-model/src/main/java/cedar/hepdata/model/ErrorNorm.java
   trunk/hepdata-model/src/main/java/cedar/hepdata/model/ErrorSource.java

Modified: trunk/hepdata-model/src/main/java/cedar/hepdata/model/ErrorNorm.java
==============================================================================
--- trunk/hepdata-model/src/main/java/cedar/hepdata/model/ErrorNorm.java	Tue Nov  5 17:05:44 2013	(r1652)
+++ trunk/hepdata-model/src/main/java/cedar/hepdata/model/ErrorNorm.java	Wed Nov  6 12:00:58 2013	(r1653)
@@ -1,18 +1,21 @@
 package cedar.hepdata.model;
 
 public enum ErrorNorm {
-    ABS     ("absolute", ""),
-    FRAC    ("fractional", "/"),
-    PCT     ("percent", "%"),
-    UNKNOWN ("unknown", "?");
+    ABS     ("absolute", "","abs"),
+    FRAC    ("fractional", "/","frac"),
+    PCT     ("percent", "%","pct"),
+    UNKNOWN ("unknown", "?","unknown");
 
     private final String nicename;
 
     private final String symbol;
 
-    ErrorNorm(String nicename, String symbol) {
+    private final String shortname;
+
+    ErrorNorm(String nicename, String symbol, String shortname) {
         this.nicename = nicename;
         this.symbol = symbol;
+        this.shortname = shortname;
     }
 
     public String toString() {
@@ -22,4 +25,8 @@
     public String toSymbol() {
         return symbol;
     }
+
+    public String toShortName() {
+        return shortname;
+    }
 }

Modified: trunk/hepdata-model/src/main/java/cedar/hepdata/model/ErrorSource.java
==============================================================================
--- trunk/hepdata-model/src/main/java/cedar/hepdata/model/ErrorSource.java	Tue Nov  5 17:05:44 2013	(r1652)
+++ trunk/hepdata-model/src/main/java/cedar/hepdata/model/ErrorSource.java	Wed Nov  6 12:00:58 2013	(r1653)
@@ -5,7 +5,8 @@
     STAT    ("statistical", "stat"),
     SYS     ("systematic", "sys"),
     TOTAL   ("total", "tot"),
-    UNKNOWN ("unknown", "?");
+    //UNKNOWN ("unknown", "?");
+    UNKNOWN ("unknown", "unknown");
 
     private final String name;
     private final String shortname;