GeomConverter/src/org/lcsim/detector

diff -u -r1.1 -r1.2
--- DetectorElementMap.java	24 Jul 2007 22:25:08 -0000	1.1
+++ DetectorElementMap.java	24 Jul 2007 22:57:50 -0000	1.2
@@ -2,16 +2,14 @@

 
 import java.util.HashMap;
 

-import org.lcsim.detector.identifier.IIdentifier;
-

 /**
  * A map of {@link org.lcsim.detector.identifier.IIdentifier} to
  * {@link org.lcsim.detector.IDetectorElement}.
  *
  * @author Jeremy McCormick

- * @version $Id: DetectorElementMap.java,v 1.1 2007/07/24 22:25:08 jeremy Exp $

+ * @version $Id: DetectorElementMap.java,v 1.2 2007/07/24 22:57:50 jeremy Exp $

  */
 
 public class DetectorElementMap

-extends HashMap<IIdentifier,IDetectorElement>

+extends HashMap<Long,IDetectorElement>

 {}

GeomConverter/src/org/lcsim/detector

diff -u -r1.8 -r1.9
--- DetectorElementStore.java	24 Jul 2007 22:25:08 -0000	1.8
+++ DetectorElementStore.java	24 Jul 2007 22:57:50 -0000	1.9
@@ -42,7 +42,7 @@

     			}    		
 
     			// Cache this DE by id in the lookup map.

-    			cache.put(id, de);

+    			cache.put(id.getValue(), de);

     		}
     	}