diff -u -r1.5 -r1.6
--- SiTrackerEndcap2Converter.java	6 Dec 2008 00:26:48 -0000	1.5
+++ SiTrackerEndcap2Converter.java	15 Dec 2008 23:35:31 -0000	1.6
@@ -84,7 +84,7 @@

                 reflect = true;
             
             IDetectorElement subdetDetElem = subdet.getDetectorElement();            

-            DetectorIdentifierHelper helper = (DetectorIdentifierHelper)subdetDetElem.getIdentifierHelper();

+            DetectorIdentifierHelper helper = (DetectorIdentifierHelper)subdetDetElem.getIdentifierHelper();            

             int nfields = helper.getIdentifierDictionary().getNumberOfFields();
             IDetectorElement endcapPos = null;
             IDetectorElement endcapNeg = null;

@@ -132,19 +132,17 @@

                 layerPosId.setValue(helper.getFieldIndex("system"), subdet.getSystemID());
                 layerPosId.setValue(helper.getFieldIndex("barrel"), helper.getEndcapPositiveValue());
                 layerPosId.setValue(helper.getFieldIndex("layer"), layerId);

-                IDetectorElement layerPos = new DetectorElement(endcapPos.getName() + "_layer" + layerId, endcapPos);
-                layerPos.setIdentifier(helper.pack(layerPosId));

+                IDetectorElement layerPos = new DetectorElement(endcapPos.getName() + "_layer" + layerId, endcapPos, helper.pack(layerPosId));

                 
                 // Negative endcap layer.
                 IDetectorElement layerNeg = null;
                 if (reflect)
                 {
                     IExpandedIdentifier layerNegId = new ExpandedIdentifier(nfields);

-                    layerPosId.setValue(helper.getFieldIndex("system"), subdet.getSystemID());
-                    layerPosId.setValue(helper.getFieldIndex("barrel"), helper.getEndcapNegativeValue());
-                    layerPosId.setValue(helper.getFieldIndex("layer"), layerId);
-                    layerNeg = new DetectorElement(endcapNeg.getName() + "_layer" + layerId, endcapNeg);
-                    layerNeg.setIdentifier(helper.pack(layerNegId));                    

+                    layerNegId.setValue(helper.getFieldIndex("system"), subdet.getSystemID());
+                    layerNegId.setValue(helper.getFieldIndex("barrel"), helper.getEndcapNegativeValue());
+                    layerNegId.setValue(helper.getFieldIndex("layer"), layerId);
+                    layerNeg = new DetectorElement(endcapNeg.getName() + "_layer" + layerId, endcapNeg, helper.pack(layerNegId));

                 }                                                
                 
                 int moduleNumber = 0;

@@ -312,7 +310,7 @@

                             {
                                 throw new RuntimeException(endcap.getName() + " is not a positive or negative endcap!");
                             }

-                            expId.setValue(iddict.getFieldIndex("layer"), layer.getIdentifierHelper().getValue(layer.getIdentifier(), "layer"));

+                            expId.setValue(iddict.getFieldIndex("layer"), layer.getIdentifierHelper().getValue(layer.getIdentifier(), "layer"));                                                        

                             expId.setValue(iddict.getFieldIndex("module"), ((SiTrackerModule)module).getModuleId());
                             expId.setValue(iddict.getFieldIndex("sensor"), sensorId);