diff -N IIdentifier64.java
--- IIdentifier64.java	28 Feb 2007 19:50:47 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@

-interface IIdentifier64 extends IIdentifier
-{
-    public boolean equals(IIdentifier64 id);
-    public boolean nequals(IIdentifier64 id);
-    public boolean less(IIdentifier64 id);
-    public boolean greater(IIdentifier64 id);
-	
-    long value();
-    void set(long newValue);
-}

diff -u -r1.16 -r1.17
--- DetectorElement.java	27 Apr 2007 23:32:50 -0000	1.16
+++ DetectorElement.java	2 May 2007 01:58:18 -0000	1.17
@@ -3,16 +3,17 @@

 import hep.physics.vec.Hep3Vector;
 
 import org.lcsim.detector.identifier.IIdentifier;

+import org.lcsim.detector.identifier.IIdentifierHelper;

 
 public class DetectorElement 
 extends Named
 implements IDetectorElement
 {
     private IDetectorElementContainer children = new DetectorElementContainer(); 

-

     private IGeometryInfo geometry = null;
     private IDetectorElement parent = null;

-    private IIdentifier id = null; 

+    private IIdentifier id = null;
+    private IIdentifierHelper helper = null;

     private IParameters parameters = new Parameters();
     private IReadout readout;
 

@@ -84,8 +85,8 @@

             String name,
             IDetectorElement parent)
     {

-        super(name);        
-        setParent(parent);        

+        super(name);
+        setup(parent,(IPhysicalVolumePath)null,null);

         register();
     }
 

@@ -334,4 +335,30 @@

             }
         }
     }   

+    
+    public boolean isDescendant(IDetectorElement de)
+    {
+        boolean isDesc = false;
+        if ( hasChildren() )
+        {
+            if ( children.contains( de) )
+            {
+                return isDesc = true;
+            }
+            else {
+                for ( IDetectorElement child : children )
+                {
+                    isDesc = child.isDescendant( de );
+                    if ( isDesc )
+                        break;
+                }
+            }
+        }
+        return isDesc;
+    }
+    
+    public void setIdentifierHelper( IIdentifierHelper helper )
+    {
+        this.helper = helper;
+    }

 }

\ No newline at end of file

diff -u -r1.2 -r1.3
--- DetectorElementContainer.java	20 Mar 2007 21:19:59 -0000	1.2
+++ DetectorElementContainer.java	2 May 2007 01:58:18 -0000	1.3
@@ -2,6 +2,9 @@

 
 import java.util.ArrayList;
 

+/**
+ * 
+ */

 public class DetectorElementContainer
 extends ArrayList<IDetectorElement>
 implements IDetectorElementContainer

diff -u -r1.4 -r1.5
--- DetectorFactory.java	17 Mar 2007 00:10:40 -0000	1.4
+++ DetectorFactory.java	2 May 2007 01:58:18 -0000	1.5
@@ -138,4 +138,9 @@

 				outerRadius,
 				zHalfLength);
 	}

+    
+    public <T> IReadout<T> createReadout()
+    {
+        return new Readout<T>();
+    }    

 }

\ No newline at end of file

diff -u -r1.3 -r1.4
--- IDetectorElementContainer.java	20 Mar 2007 21:19:59 -0000	1.3
+++ IDetectorElementContainer.java	2 May 2007 01:58:18 -0000	1.4
@@ -2,9 +2,41 @@

 
 import java.util.List;
 

+/**
+ * DetectorElementContainer extends 
+ * {@link java.util.List} and contains 0 
+ * or more DetectorElements.  It can be used 
+ * to provide special behavior for collections 
+ * of DetectorElements.
+ * 
+ * @see DetectorElement
+ * @see IDetectorElement
+ * @see java.util.List
+ * @see java.util.ArrayList
+ * 
+ * @author Jeremy McCormick
+ * @version $Id: IDetectorElementContainer.java,v 1.4 2007/05/02 01:58:18 jeremy Exp $
+ */

 public interface IDetectorElementContainer 
 extends List<IDetectorElement>
 {

+    /**
+     * Get a DetectorElement by name.
+     * 
+     * @param  name The name of the DetectorElement.
+     * @return      The matching DetectorElement or
+     *              <code>null</code> if none exists
+     *              with matching {@param name}.
+     */

     public IDetectorElement get(String name);

+    
+    /**
+     * True if contains a DetectorElement with name {@param name};
+     * False if does not contain.
+     * 
+     * @param   name The name of the DetectorElement.
+     * @return       True if contains a DetectorElement with
+     *               matching name; False if it does not.
+     */

     public boolean contains(String name);
 }

\ No newline at end of file

diff -u -r1.1 -r1.2
--- IDetectorElementStore.java	6 Mar 2007 20:22:17 -0000	1.1
+++ IDetectorElementStore.java	2 May 2007 01:58:19 -0000	1.2
@@ -1,7 +1,15 @@

 package org.lcsim.detector;
 

-import java.util.List;
-

+/**
+ * The {@link IDetectorElementStore} is a registry of 
+ * all DetectorElements in the current geometry.
+ * 
+ * @see IDetectorElement
+ * @see IObjectStore
+ * 
+ * @author jeremym
+ * @version $Id: IDetectorElementStore.java,v 1.2 2007/05/02 01:58:19 jeremy Exp $
+ */

 public interface IDetectorElementStore 

-extends List<IDetectorElement> 

+extends IObjectStore 

 {}

\ No newline at end of file

diff -u -r1.7 -r1.8
--- IDetectorFactory.java	17 Mar 2007 00:10:40 -0000	1.7
+++ IDetectorFactory.java	2 May 2007 01:58:19 -0000	1.8
@@ -72,4 +72,6 @@

 			double innerRadius, 
 			double outerRadius, 
 			double zHalfLength);	

+    
+    public <T> IReadout<T> createReadout();    

 }

\ No newline at end of file

diff -N DeDetector.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ DeDetector.java	2 May 2007 01:58:19 -0000	1.1
@@ -0,0 +1,33 @@

+package org.lcsim.detector.converter.compact;
+
+import hep.physics.vec.Hep3Vector;
+
+import org.lcsim.detector.DetectorElement;
+import org.lcsim.geometry.Detector;
+
+/**
+ * Wraps a compact detector in a DetectorElement.
+ * 
+ * @see org.lcsim.geometry.Detector
+ * @see org.lcsim.geometry.DetectorElement
+ * @see org.lcsim.geometry.FieldMap
+ *
+ * @author Jeremy McCormick
+ * @version $Id: DeDetector.java,v 1.1 2007/05/02 01:58:19 jeremy Exp $
+ */
+
+public class DeDetector
+extends DetectorElement
+{
+    Detector detector;
+    public DeDetector(Detector detector)
+    {
+        super( detector.getName(), null, "/");
+        this.detector = detector;
+    }   
+    
+    public Hep3Vector getBField(Hep3Vector position)
+    {
+        return detector.getFieldMap().getField(position);
+    }
+}

\ No newline at end of file

diff -u -r1.12 -r1.13
--- DetectorConverter.java	20 Apr 2007 00:16:54 -0000	1.12
+++ DetectorConverter.java	2 May 2007 01:58:19 -0000	1.13
@@ -7,7 +7,6 @@

 import org.jdom.Document;
 import org.jdom.Element;
 import org.jdom.JDOMException;

-import org.lcsim.detector.DetectorElement;

 import org.lcsim.detector.IDetectorElement;
 import org.lcsim.detector.ILogicalVolume;
 import org.lcsim.detector.IPhysicalVolume;

@@ -17,13 +16,21 @@

 import org.lcsim.detector.converter.lcdd.MaterialElementConverter;
 import org.lcsim.detector.converter.lcdd.MaterialMixtureConverter;
 import org.lcsim.detector.converter.lcdd.MaterialsConverter;

+import org.lcsim.detector.identifier.IIdentifierDictionary;
+import org.lcsim.detector.identifier.IIdentifierField;
+import org.lcsim.detector.identifier.IdentifierDictionary;
+import org.lcsim.detector.identifier.IdentifierDictionaryManager;
+import org.lcsim.detector.identifier.IdentifierField;
+import org.lcsim.detector.identifier.IdentifierHelper;

 import org.lcsim.detector.material.IMaterial;
 import org.lcsim.detector.material.MaterialStore;
 import org.lcsim.detector.solids.Box;
 import org.lcsim.detector.solids.Tube;
 import org.lcsim.geometry.Detector;

+import org.lcsim.geometry.Readout;

 import org.lcsim.geometry.compact.Constant;
 import org.lcsim.geometry.compact.Subdetector;

+import org.lcsim.geometry.util.IDDescriptor;

 
 public class DetectorConverter implements IDetectorConverter 
 {

@@ -68,34 +75,37 @@

         PhysicalVolumeNavigatorStore.getInstance().reset();
         PhysicalVolumeNavigatorStore.getInstance().createDefault(pvWorld);               
         

-        IDetectorElement deDet = new DetectorElement(detector.getName(), null, "/");
-        

+        // Set the Detector's DetectorElement.
+        IDetectorElement deDet = new DeDetector(detector);

         detector.setDetectorElement( deDet );

-        
-        //detector.setSupport("/");        
-        

+                       

         // Construct the tracking volume.
         buildTrackingVolume( pvWorld.getLogicalVolume(), detector );
         

-        detector.setWorldVolume(pvWorld);
-                                     
-        convertMaterials("/org/lcsim/material/elements.xml");
-        convertMaterials("/org/lcsim/material/materials.xml");
-        convertMaterials(doc);
-        
-        convertSubdetectors(detector);
-                                        

+        // Set the world volume.
+        detector.setWorldVolume( pvWorld );
+                                
+        // Convert materials.
+        convertMaterials( "/org/lcsim/material/elements.xml" );
+        convertMaterials( "/org/lcsim/material/materials.xml" );
+        convertMaterials( doc );
+        
+        // Convert Subdetectors.
+        convertSubdetectors( detector );
+                                
+        // Return the world volume.

         return pvWorld;
     }
       
 	private void convertMaterials(Document doc) throws JDOMException
 	{

-		(new MaterialsConverter()).convert(doc);

+		( new MaterialsConverter() ).convert( doc );

 	}
 	
 	private void convertMaterials(String resource) throws JDOMException, IOException
 	{
 		Document doc = CompactDocumentBuilder.build(resource);

+        //convertMaterials( doc );

 		
 		MaterialElementConverter elemCnv = new MaterialElementConverter();
 		MaterialMixtureConverter matCnv = new MaterialMixtureConverter();

@@ -121,16 +131,62 @@

 		{
 			Subdetector subdet = entry.getValue();
 			

-			ISubdetectorConverter cnv = getSubdetectorConverter(subdet.getClass());

+            // Lookup a registered converter for this Subdetector class.
+			ISubdetectorConverter cnv = getSubdetectorConverter( subdet.getClass() );
+            

 			if ( cnv != null )
 			{                

-                // Convert from a compact type to the
-                // generic detector description.
-				cnv.convert(subdet, detector);                          
-			}

+                // Build the IdentifierDictionary for this Subdetector.
+                // Subdetector converters need this to be done first.
+                IIdentifierDictionary iddict = createIdentifierDictionary( subdet );
+                
+                // Convert from a compact type to the generic detector description
+                // using a registered converter.
+				cnv.convert(subdet, detector);
+                
+                // Now assign the IdentifierHelper to the DetectorElement after it has been built.
+                if ( subdet.getDetectorElement() != null )
+                {
+                    subdet.getDetectorElement().setIdentifierHelper( new IdentifierHelper( iddict ) );
+                }
+			}            

 		}		
 	}
     

+    /**
+     * Creates an {@see IIdentifierDictionary} from an existing {@see org.lcsim.geometry.Subdetector}.
+     * 
+     * @see org.lcsim.geometry.Readout
+     * @see org.lcsim.detector.identifier
+     * @see org.lcsim.detector.identifier.IIdentifierDictionary
+     * @see org.lcsim.detector.identifier.IIdentifierDictionaryManager
+     * @see org.lcsim.detector.identifier.IIdentifierField
+     * 
+     * @param subdet The Subdetector.
+     */
+    private IIdentifierDictionary createIdentifierDictionary(Subdetector subdet)
+    {
+        Readout ro = subdet.getReadout();
+        IIdentifierDictionary iddict=null;
+        if ( ro != null )
+        {
+            iddict = new IdentifierDictionary(ro.getName());
+            IdentifierDictionaryManager.getInstance().addIdentifierDictionary( iddict );
+            
+            IDDescriptor desc = ro.getIDDescriptor();
+            for ( int i=0; i<desc.fieldCount(); i++ )
+            {
+                int nbits = desc.fieldLength(i);                
+                int start = desc.fieldStart(i);
+                boolean signed = desc.isSigned(i);
+                String name = desc.fieldName(i);
+                IIdentifierField field = new IdentifierField(name,nbits,start,signed);
+                iddict.addField(field);
+            }                                    
+        }   
+        return iddict;
+    }
+    

     private void buildTrackingVolume(ILogicalVolume world, Detector detector)
     {
         Map<String,Constant> constants = detector.getConstants();

diff -N ExpandedIdentifier.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ExpandedIdentifier.java	2 May 2007 01:58:19 -0000	1.1
@@ -0,0 +1,99 @@

+package org.lcsim.detector.identifier;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * COMMENT
+ *
+ * @author Jeremy McCormick
+ * @version $Id: ExpandedIdentifier.java,v 1.1 2007/05/02 01:58:19 jeremy Exp $
+ */
+
+public class ExpandedIdentifier
+implements IExpandedIdentifier
+{
+    List<Integer> values = new ArrayList<Integer>();
+    
+    public ExpandedIdentifier()
+    {}
+    
+    public ExpandedIdentifier( int[] values )
+    {
+        for ( int value : values )
+        {
+            this.values.add( value );
+        }
+    }
+    
+    public ExpandedIdentifier( List<Integer> values )
+    {
+        this.values.addAll( values );
+    }
+    
+    public ExpandedIdentifier( String values )
+    {
+        String[] buffer = values.split("/");
+        for ( String value : buffer )
+        {
+            addValue( Integer.parseInt( value ) );
+        }
+    }
+
+    public void addValue( int value)
+    {
+        values.add(value);        
+    }
+
+    public void clear()
+    {
+        values.clear();
+    }
+
+    public int getNumberOfFields()
+    {
+        return values.size();
+    }
+
+    public int getValue( int index )
+    {
+        return values.get( index );
+    }
+
+    public List<Integer> getValues()
+    {
+        return values;
+    }
+
+    public boolean isValid()
+    {
+        return values.size() != 0;        
+    }
+    
+    public String toString()
+    {
+        StringBuffer buff = new StringBuffer();
+        for ( Integer value : values )
+        {
+            buff.append("/" + value);
+        }
+        return buff.toString();
+    }       
+    
+    public boolean equals(IExpandedIdentifier id)
+    {
+        if ( id.getNumberOfFields() != this.getNumberOfFields() )
+        {
+            return false;
+        }
+        
+        for ( int i=0; i<this.getNumberOfFields(); i++)
+        {
+            if ( id.getValue(i) != this.getValue(i))
+            {
+                return false;
+            }            
+        }
+        return true;
+    }
+}

\ No newline at end of file

diff -N IExpandedIdentifier.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ IExpandedIdentifier.java	2 May 2007 01:58:19 -0000	1.1
@@ -0,0 +1,21 @@

+package org.lcsim.detector.identifier;
+
+import java.util.List;
+
+/**
+ * COMMENT
+ *
+ * @author Jeremy McCormick
+ * @version $Id: IExpandedIdentifier.java,v 1.1 2007/05/02 01:58:19 jeremy Exp $
+ */
+
+public interface IExpandedIdentifier
+{
+    public void addValue(int value);
+    public int getValue(int index);
+    public List<Integer> getValues();
+    public int getNumberOfFields();
+    public void clear();
+    public boolean isValid();
+    public boolean equals(IExpandedIdentifier id);
+}

diff -N IIdentifierDictionary.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ IIdentifierDictionary.java	2 May 2007 01:58:19 -0000	1.1
@@ -0,0 +1,19 @@

+package org.lcsim.detector.identifier;
+
+import java.util.Map;
+
+/**
+ * COMMENT
+ *
+ * @author Jeremy McCormick
+ * @version $Id: IIdentifierDictionary.java,v 1.1 2007/05/02 01:58:19 jeremy Exp $
+ */
+
+public interface IIdentifierDictionary
+{
+    public String getName();
+    public void addField(IIdentifierField field);
+    public IIdentifierField getField(String fieldName);  
+    public IIdentifierField getField(int index);
+    public Map<String,IIdentifierField> getFields();    
+}

\ No newline at end of file

diff -N IIdentifierDictionaryManager.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ IIdentifierDictionaryManager.java	2 May 2007 01:58:19 -0000	1.1
@@ -0,0 +1,13 @@

+package org.lcsim.detector.identifier;
+/**
+ * COMMENT
+ *
+ * @author Jeremy McCormick
+ * @version $Id: IIdentifierDictionaryManager.java,v 1.1 2007/05/02 01:58:19 jeremy Exp $
+ */
+
+public interface IIdentifierDictionaryManager
+{    
+    public IIdentifierDictionary getIdentifierDictionary(String name);
+    public void addIdentifierDictionary(IIdentifierDictionary dict);
+}

\ No newline at end of file

diff -N IIdentifierField.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ IIdentifierField.java	2 May 2007 01:58:19 -0000	1.1
@@ -0,0 +1,15 @@

+package org.lcsim.detector.identifier;
+/**
+ * COMMENT
+ *
+ * @author Jeremy McCormick
+ * @version $Id: IIdentifierField.java,v 1.1 2007/05/02 01:58:19 jeremy Exp $
+ */
+public interface IIdentifierField
+{
+    public String getLabel();
+    public int getNumberOfBits();
+    public int getOffset();
+    public long getMaskOn();
+    public boolean isSigned();
+}

\ No newline at end of file

diff -N IIdentifierHelper.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ IIdentifierHelper.java	2 May 2007 01:58:19 -0000	1.1
@@ -0,0 +1,17 @@

+package org.lcsim.detector.identifier;
+
+/**
+ * COMMENT
+ *
+ * @author Jeremy McCormick
+ * @version $Id: IIdentifierHelper.java,v 1.1 2007/05/02 01:58:19 jeremy Exp $
+ */
+
+public interface IIdentifierHelper
+{
+    public IIdentifierDictionary getIdentifierDictionary();
+    public IIdentifier pack(IExpandedIdentifier id);
+    //public IIdentifier pack(IExpandedIdentifier id, int start);
+    //public IIdentifier pack(IExpandedIdentifier id, int start, int nfields);
+    public IExpandedIdentifier unpack(IIdentifier id);
+}

\ No newline at end of file

diff -N Identifier.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Identifier.java	2 May 2007 01:58:19 -0000	1.1
@@ -0,0 +1,91 @@

+/**
+ * File:    Identifier.java
+ * Created: Apr 30, 2007 4:16:59 PM
+ * 
+ * Implementation of {@link IIdentifier}.
+ *
+ * @author Jeremy McCormick
+ * @version $Id: Identifier.java,v 1.1 2007/05/02 01:58:19 jeremy Exp $
+ */
+package org.lcsim.detector.identifier;
+
+/**
+ * Implementation of a 64-bit packed identifier.
+ * 
+ * @see DetectorElement
+ * @see IIdentifier
+ */
+public class Identifier
+implements IIdentifier
+{    
+    long value = unsetValue;
+    private static final long unsetValue = 0;
+    
+    Identifier()
+    {}
+    
+    Identifier(long value)
+    {
+        this.value = value;
+    }
+    
+    Identifier(int value)
+    {
+        this.value = (int)value;
+    }
+    
+    public long getValue()
+    {
+        return value;
+    }
+    
+    public void setValue( long value )
+    {
+        this.value = value;        
+    }
+    
+    public void clear()
+    {
+         value = unsetValue;
+    }
+
+    public boolean equals( IIdentifier id)
+    {
+        return id.getValue() == value;
+    }
+ 
+    public String getHexString()
+    {
+        return Long.toHexString(value);
+    }
+    
+    public String toString()
+    {
+        return getHexString();
+    }
+    
+    public void setHexString( String hexRep )
+    {
+        value = Long.parseLong(hexRep, 16);
+    }
+
+    public boolean isValid()
+    {
+        return value != unsetValue;
+    }
+
+    public boolean less( IIdentifier id)
+    {
+        return value < id.getValue();
+    }
+
+    public boolean greater( IIdentifier id)
+    {
+        return value > id.getValue();
+    }
+    
+    public boolean nequals( IIdentifier id)
+    {
+        return value != id.getValue();
+    }
+}

diff -N IdentifierDictionary.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ IdentifierDictionary.java	2 May 2007 01:58:19 -0000	1.1
@@ -0,0 +1,62 @@

+package org.lcsim.detector.identifier;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * COMMENT
+ *
+ * @author Jeremy McCormick
+ * @version $Id: IdentifierDictionary.java,v 1.1 2007/05/02 01:58:19 jeremy Exp $
+ */
+
+public class IdentifierDictionary implements IIdentifierDictionary
+{
+    Map<String,IIdentifierField> fields = new LinkedHashMap<String,IIdentifierField>();
+    private String name;
+    
+    public IdentifierDictionary(String name)
+    {
+        this.name = name;
+    }
+    
+    public String getName()
+    {
+        return name;
+    }
+    
+    public void addField(IIdentifierField field)
+    {
+        if ( fields.containsKey( field.getLabel() ) )
+        {
+            throw new IllegalArgumentException("Dictionary already has a field called <" + name + ">.");
+        }
+        fields.put(field.getLabel(),field);
+    }
+
+    public IIdentifierField getField(String fieldName)
+    {
+        return fields.get(fieldName);
+    }
+    
+    public IIdentifierField getField(int index)
+    {
+        return (IIdentifierField)fields.values().toArray()[index];
+    }
+
+    public Map<String,IIdentifierField> getFields()
+    {
+        return fields;
+    }      
+    
+    public String toString()
+    {
+        StringBuffer str = new StringBuffer();
+        str.append(getName() + '\n');
+        for ( IIdentifierField field : getFields().values() )
+        {
+            str.append("    " + field.toString());
+        }
+        return str.toString();
+    }
+}

\ No newline at end of file

diff -N IdentifierDictionaryManager.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ IdentifierDictionaryManager.java	2 May 2007 01:58:19 -0000	1.1
@@ -0,0 +1,36 @@

+package org.lcsim.detector.identifier;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * COMMENT
+ *
+ * @author Jeremy McCormick
+ * @version $Id: IdentifierDictionaryManager.java,v 1.1 2007/05/02 01:58:19 jeremy Exp $
+ */
+
+public class IdentifierDictionaryManager
+implements IIdentifierDictionaryManager
+{
+    Map<String,IIdentifierDictionary> dicts = new HashMap<String,IIdentifierDictionary>();
+    private static final IIdentifierDictionaryManager instance = new IdentifierDictionaryManager();
+    
+    private IdentifierDictionaryManager()
+    {}
+    
+    public void addIdentifierDictionary(IIdentifierDictionary dict)
+    {
+        dicts.put(dict.getName(), dict);
+    }
+
+    public IIdentifierDictionary getIdentifierDictionary(String name)
+    {
+        return dicts.get(name);        
+    }       
+    
+    public static IIdentifierDictionaryManager getInstance()
+    {
+        return instance;
+    }       
+}

\ No newline at end of file

diff -N IdentifierField.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ IdentifierField.java	2 May 2007 01:58:19 -0000	1.1
@@ -0,0 +1,54 @@

+package org.lcsim.detector.identifier;
+
+/**
+ * COMMENT
+ *
+ * @author Jeremy McCormick
+ * @version $Id: IdentifierField.java,v 1.1 2007/05/02 01:58:19 jeremy Exp $
+ */
+
+public class IdentifierField implements IIdentifierField
+{
+    private int numberOfBits;
+    private int offset;
+    private boolean isSigned;
+    private String label;
+    
+    public IdentifierField(String label, int numberOfBits, int offset, boolean isSigned)
+    {
+        this.label = label;
+        this.numberOfBits = numberOfBits;
+        this.offset = offset;
+        this.isSigned = isSigned;        
+    }
+    
+    public String getLabel()
+    {
+        return label;
+    }
+
+    public long getMaskOn()
+    {
+        return (1L << getNumberOfBits()) - 1;
+    }
+
+    public int getNumberOfBits()
+    {
+        return numberOfBits;
+    }
+
+    public int getOffset()
+    {
+        return offset;
+    }
+
+    public boolean isSigned()
+    {
+        return isSigned;
+    }
+    
+    public String toString()
+    {
+        return getLabel() + ":" + getOffset() + ":" + getNumberOfBits() + ":" + isSigned() + "\n";
+    }
+}

\ No newline at end of file

diff -u -r1.2 -r1.3
--- IIdentifier.java	4 Mar 2007 05:03:00 -0000	1.2
+++ IIdentifier.java	2 May 2007 01:58:19 -0000	1.3
@@ -1,17 +1,32 @@

 package org.lcsim.detector.identifier;
 

-import java.util.BitSet;
-

 /**

- * An interface for comparable identifiers.

+ * An interface defining comparable 64-bit identifiers
+ * using for uniquely defining components of the
+ * detector.
+ * 
+ * @see DetectorElement

  * 
  * @author jeremym

- *

+ * @version $Id: IIdentifier.java,v 1.3 2007/05/02 01:58:19 jeremy Exp $

  */
 public interface IIdentifier
 {
     /**

+     * Get the value of this identifier as a long.
+     */
+    long getValue();
+    
+    /**
+     * Set the value of this identifier from a long.
+     * 
+     * @param id
+     */
+    void setValue(long id);
+    
+    /**

      * True if the identifiers are equivalent. 

+     * 

      * @param id
      * @return
      */

@@ -19,6 +34,7 @@

     
     /**
      * True if the identifiers are not equivalent.

+     * 

      * @param id
      * @return
      */

@@ -26,6 +42,7 @@

     
     /**
      * True if this identifier is greater.

+     * 

      * @param id
      * @return
      */

@@ -33,67 +50,37 @@

     
     /**
      * True if this identifier is less.

+     * 

      * @param id
      * @return
      */
 	public boolean less(IIdentifier id);   
     

-	/**
-	 * The return value can express the magnitude
-	 * of difference, such as number of bits
-	 * that are different or number of different fields,
-	 * for an id with fields.
-	 * 
-	 * @param id
-	 * @return
-	 */
-	public int compare(IIdentifier id);
-
-	/**
-	 * Get a raw BitSet encoding of this id.
-	 * @return
-	 */
-	public BitSet getBitSet();
-	
-	/**
-	 * Get an integer list of fields representing
-	 * the field values.
-	 *  
-	 * @return
-	 */
-	public int[] fields();
-	
-	/**
-	 * Get field value.
-	 * @param i
-	 * @return
-	 */
-	public int field(int i);
-	
-	/** 
-	 * @param name
-	 * @return
-	 */
-	public int fieldName(String name);		
-	
-    // size in bits
-	public int getSizeInBits();
-    

     /**
      * Get a raw hex string representation.

+     * 

      * @return
      */

-	public String hexString();

+	public String getHexString();

-    // Setup from hex string.

+    /**
+     * Set the value from a raw hex string.
+     * 
+     * @param hexRep
+     */

 	public void setHexString(String hexRep);
     

-    // set value from another IIdentifier
-	//public void setIdentifier(IIdentifier id);
-
-    // clear state

+	/**
+     * Clear the state of this identifier. 
+	 */

 	public void clear();
 

-    // is id in valid state

+	/**
+     * True if this ID has been set; 
+     * False if it has not been set
+     * or was set and then cleared. 
+     *  
+     * @return
+	 */

 	public boolean isValid();
 }

\ No newline at end of file

diff -u -r1.18 -r1.19
--- Subdetector.java	20 Apr 2007 00:50:23 -0000	1.18
+++ Subdetector.java	2 May 2007 01:58:20 -0000	1.19
@@ -24,6 +24,13 @@

     public boolean isBarrel();
     public boolean isEndcap();
         

+    /**
+     * 
+     * @param localPos
+     * @return
+     * @deprecated Use {@link org.lcsim.detector.IGeometryInfo#getLocalToGlobal()}
+     */
+    @Deprecated

     public double[] transformLocalToGlobal(double[] localPos);
     
     public IDetectorElement getDetectorElement();

diff -u -r1.11 -r1.12
--- Layer.java	20 Mar 2007 00:47:19 -0000	1.11
+++ Layer.java	2 May 2007 01:58:20 -0000	1.12
@@ -16,7 +16,10 @@

  * a subdetector.
  *
  * @author jeremym

+ * 
+ * @deprecated Use {@link org.lcsim.detector.IDetectorElement} functionality instead.

  */

+@Deprecated 

 public class Layer
 {
     List<LayerSlice> slices;

diff -u -r1.4 -r1.5
--- DiskTrackerTest.java	20 Apr 2007 00:16:54 -0000	1.4
+++ DiskTrackerTest.java	2 May 2007 01:58:20 -0000	1.5
@@ -97,15 +97,22 @@

                 "DiskTracker_negative_sensor1",
                 "DiskTrackerTest"
         };

-        

+             

         /*
         for (IDetectorElement de : DetectorElementStore.getInstance())
         {

+            System.out.println("isDescendant of detector <" + de.getName() + "> - " + detector.getDetectorElement().isDescendant(de));
+            

             if ( de.hasGeometryInfo() )
             {

-                System.out.println(de.getName() + " " + de.getGeometry().getPosition());

+                System.out.println(de.getName());
+                if ( de.getParent() != null )
+                {
+                    System.out.println("    " + de.getParent().getName());
+                }

             }

-        }*/

+        }
+        */

                 
         for ( int i=0; i<zpoints.length; i++ )
         {           

@@ -121,7 +128,7 @@

                     );
             
             IDetectorElement srch = detector.getDetectorElement().findDetectorElement(zpoint);

-           

+                                   

             assertTrue("Wrong path <" + path.toString() + "> at z = " + zpoints[i] + ".  Expected <" + pathAnswerKey[i] + ">.",
                     srch.getName().equals(deAnswerKey[i]));
         }

diff -N IdentifierHelperTest.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ IdentifierHelperTest.java	2 May 2007 01:58:20 -0000	1.1
@@ -0,0 +1,62 @@

+package org.lcsim.detector.identifier;
+
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * COMMENT
+ *
+ * @author Jeremy McCormick
+ * @version $Id: IdentifierHelperTest.java,v 1.1 2007/05/02 01:58:20 jeremy Exp $
+ */
+
+public class IdentifierHelperTest
+extends TestCase
+{
+    public IdentifierHelperTest(String name)
+    {
+        super(name);
+    }
+    
+    public static junit.framework.Test suite()
+    {
+        return new TestSuite(IdentifierHelperTest.class);
+    }
+    
+    public void testIdHelper()
+    {
+        IIdentifierDictionary iddict = new IdentifierDictionary("test");
+        iddict.addField(new IdentifierField("field1",32,0,false));
+        iddict.addField(new IdentifierField("field2",32,32,true));
+        
+        IIdentifierHelper helper = new IdentifierHelper( iddict );
+        
+        IExpandedIdentifier expId = new ExpandedIdentifier();
+        expId.addValue(1);
+        expId.addValue(-1);
+        
+        IIdentifier compactId = helper.pack( expId );
+        
+        IExpandedIdentifier expIdCheck = helper.unpack(compactId);
+        
+        assertTrue( expId.equals( expIdCheck ));
+        
+        System.out.println("compactId - " + compactId.toString());
+        System.out.println("expId - " + expId.toString());
+        System.out.println("expIdCheck - " + expIdCheck.toString());
+        System.out.println();
+        
+        expId.clear();
+        expId.addValue(1);
+        expId.addValue(1);
+        
+        compactId = helper.pack(expId);
+        expIdCheck = helper.unpack( compactId );
+        
+        assertTrue( expId.equals( expIdCheck ));
+        
+        System.out.println("compactId - " + compactId.toString());
+        System.out.println("expId - " + expId.toString());        
+        System.out.println("expIdCheck - " + expIdCheck.toString());
+    }
+}

\ No newline at end of file