Commit in GeomConverter/src/org/lcsim/geometry/util on MAIN
BaseIDDecoder.java+5-51.9 -> 1.10
JM: Use the Subdetector object for system ID.  If no Subdetector object, use the IDDecoder's field value.

GeomConverter/src/org/lcsim/geometry/util
BaseIDDecoder.java 1.9 -> 1.10
diff -u -r1.9 -r1.10
--- BaseIDDecoder.java	15 Mar 2006 23:47:33 -0000	1.9
+++ BaseIDDecoder.java	12 Apr 2007 23:41:03 -0000	1.10
@@ -184,14 +184,14 @@
 
     public int getSystemID()
     {
-        int idx = descriptor.indexOf("system");
         int sysid = -1;
-        if (idx != INVALID_INDEX)
+        if ( getSubdetector() != null )
         {
-            sysid = decoder.getValue("system");
+            sysid = getSubdetector().getSystemID();
         }
-        else {
-            throw new RuntimeException("IDDecoder is missing system field.");
+        else 
+        {
+            sysid = decoder.getValue("system");
         }
         return sysid;
     }
CVSspam 0.2.8