GeomConverter/src/org/lcsim/detector/converter/compact

diff -u -r1.3 -r1.4
--- PolyhedraEndcapCalorimeterConverter.java	5 Feb 2009 21:43:23 -0000	1.3
+++ PolyhedraEndcapCalorimeterConverter.java	24 Mar 2009 21:50:18 -0000	1.4
@@ -268,22 +268,32 @@

             } 
         }
         

-        for (IDetectorElement module : subdet.getDetectorElement().getChildren())

+        int sensorNum = 0;
+        for (IDetectorElement endcap : subdet.getDetectorElement().getChildren())

         {

-        	for (IPhysicalVolume layer : module.getGeometry().getLogicalVolume().getDaughters())
-        	{
-        		for (IPhysicalVolume slice : layer.getLogicalVolume().getDaughters())
-        		{
-        			if (slice.isSensitive())
-        			{
-        				String sliceDetElemName = module.getName() + "_" + layer.getName() + "_" + slice.getName();
-        				new DetectorElement(
-        						sliceDetElemName, 
-        						module, 
-        						"/" + module.getGeometry().getPhysicalVolume().getName() + "/" + layer.getName() + "/" + slice.getName());
-        			}
-        		}
-        	}

+            for (IDetectorElement module : endcap.getChildren())
+            {
+                for (IPhysicalVolume layer : module.getGeometry().getLogicalVolume().getDaughters())
+                {
+                    for (IPhysicalVolume slice : layer.getLogicalVolume().getDaughters())
+                    {
+                        if (slice.isSensitive())
+                        {
+                            String sliceDetElemName = 
+                                subdet.getName()
+                                + "_module" + module.getGeometry().getPhysicalVolume().getCopyNumber()
+                                + "_layer" + layer.getCopyNumber()
+                                + "_sensor" + sensorNum;
+                            //String sliceDetElemName = subdet.getName() + "_" + module.getName() + "_" + layer.getName() + "_" + slice.getName();
+                            new DetectorElement(
+                                    sliceDetElemName, 
+                                    endcap, 
+                                    "/" + module.getName() + "/" + layer.getName() + "/" + slice.getName());
+                            ++sensorNum;
+                        }
+                    }
+                }
+            }

         }
 	}