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

diff -u -r1.25 -r1.26
--- SiTrackerBarrelConverter.java	3 Dec 2007 23:23:30 -0000	1.25
+++ SiTrackerBarrelConverter.java	5 Dec 2007 01:36:50 -0000	1.26
@@ -43,8 +43,8 @@

 import org.lcsim.detector.tracker.silicon.SiSensor;
 import org.lcsim.detector.tracker.silicon.SiSensorElectrodes;
 import org.lcsim.detector.tracker.silicon.SiStrips;

-import org.lcsim.detector.tracker.silicon.SiTrackerBarrelLayer;
-import org.lcsim.detector.tracker.silicon.SiTrackerBarrelModule;

+import org.lcsim.detector.tracker.silicon.SiTrackerLayer;
+import org.lcsim.detector.tracker.silicon.SiTrackerModule;

 import org.lcsim.geometry.compact.Detector;
 import org.lcsim.geometry.compact.Subdetector;
 import org.lcsim.geometry.subdetector.SiTrackerBarrel;

@@ -290,7 +290,7 @@

             // Layer DE.
             String layerPath = "/tracking_region/" + layer_name;
             IDetectorElement layerDE =

-                    new SiTrackerBarrelLayer(layer_name, subdet.getDetectorElement(), layerPath, nlayer);

+                    new SiTrackerLayer(layer_name, subdet.getDetectorElement(), layerPath, nlayer);

             
             // Get the rphi_layout element.
             Element rphi_layout = layer_element.getChild("rphi_layout");

@@ -436,7 +436,7 @@

                     String modulePath =
                             "/tracking_region/" + layer_name + "/" + module_place_name;
                     

-                    new SiTrackerBarrelModule(

+                    new SiTrackerModule(

                             module_place_name,
                             layerDE,
                             modulePath,

@@ -516,7 +516,7 @@

                             expId.setValue(iddict.getFieldIndex("layer"), layer.getGeometry().getPath().getLeafVolume().getCopyNumber());
                             
                             // Set the module id from the DetectorElement.

-                            expId.setValue(iddict.getFieldIndex("module"),((SiTrackerBarrelModule)module).getModuleId());

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

                             
                             // Set the sensor id for double-sided.
                             expId.setValue(iddict.getFieldIndex("sensor"),sensorId);

@@ -542,7 +542,7 @@

                         //System.out.println("path : " + modulePath.toString() + "/" + pv.getName());
                         String sensorPath = modulePath.toString() + "/" + pv.getName();
                         //String sensorName = subdet.getName() + "_layer" + layer.getGeometry().getPhysicalVolume().getCopyNumber() + "_module" + moduleId + "_sensor" + sensorId;

-                        String sensorName = subdet.getName() + "_layer" + layer.getGeometry().getPhysicalVolume().getCopyNumber() + "_module" + ((SiTrackerBarrelModule)module).getModuleId() + "_sensor" + sensorId;

+                        String sensorName = subdet.getName() + "_layer" + layer.getGeometry().getPhysicalVolume().getCopyNumber() + "_module" + ((SiTrackerModule)module).getModuleId() + "_sensor" + sensorId;

                         
                         SiSensor sensor = new SiSensor(sensorId,sensorName,module,sensorPath,id);
                         sensor.setIdentifier(id);

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

diff -u -r1.11 -r1.12
--- SiTrackerEndcapConverter.java	5 Dec 2007 01:26:58 -0000	1.11
+++ SiTrackerEndcapConverter.java	5 Dec 2007 01:36:50 -0000	1.12
@@ -45,7 +45,7 @@

 import org.lcsim.detector.tracker.silicon.SiSensor;
 import org.lcsim.detector.tracker.silicon.SiSensorElectrodes;
 import org.lcsim.detector.tracker.silicon.SiStrips;

-import org.lcsim.detector.tracker.silicon.SiTrackerBarrelModule;

+import org.lcsim.detector.tracker.silicon.SiTrackerModule;

 import org.lcsim.geometry.compact.Detector;
 import org.lcsim.geometry.compact.Subdetector;
 import org.lcsim.geometry.subdetector.SiTrackerEndcap;

@@ -54,7 +54,7 @@

  * Converter for SiTrackerEndcap.
  *
  * @author Jeremy McCormick, Tim Nelson

- * @version $Id: SiTrackerEndcapConverter.java,v 1.11 2007/12/05 01:26:58 jeremy Exp $

+ * @version $Id: SiTrackerEndcapConverter.java,v 1.12 2007/12/05 01:36:50 jeremy Exp $

  */
 
 public class SiTrackerEndcapConverter

@@ -148,7 +148,7 @@

                     String modulePath = wedgePath + "/" + module.getName();
                     String moduleName = wedgeName + "_module" + module.getCopyNumber();
                     //IDetectorElement moduleDE = new DetectorElement(moduleName,wedgeDE,detector.getNavigator().getPath(modulePath));

-                    IDetectorElement moduleDE = new SiTrackerBarrelModule(

+                    IDetectorElement moduleDE = new SiTrackerModule(

                             moduleName,
                             wedgeDE,
                             detector.getNavigator().getPath(modulePath).toString(),

@@ -158,7 +158,7 @@

                     String modulePathReflect = wedgePathReflect + "/" + module.getName();
                     String moduleNameReflect = wedgeNameReflect + "_module" + module.getCopyNumber();
                     //IDetectorElement moduleDEReflect = new DetectorElement(moduleNameReflect,wedgeDEReflect,detector.getNavigator().getPath(modulePathReflect));

-                    IDetectorElement moduleDEReflect = new SiTrackerBarrelModule(

+                    IDetectorElement moduleDEReflect = new SiTrackerModule(

                             moduleNameReflect,
                             wedgeDEReflect,
                             detector.getNavigator().getPath(modulePathReflect).toString(),

@@ -648,7 +648,7 @@

                                     expId.setValue(iddict.getFieldIndex("wedge"), wedge.getGeometry().getPath().getLeafVolume().getCopyNumber());
                                     
                                     // Set the module id from the DetectorElement.

-                                    expId.setValue(iddict.getFieldIndex("module"),((SiTrackerBarrelModule)module).getModuleId());

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

                                     
                                     // Set the sensor id for double-sided.
                                     expId.setValue(iddict.getFieldIndex("sensor"),sensorId);

@@ -677,7 +677,7 @@

                                 String sensorName = subdet.getName() + "_endcap" + id_helper.getValue(endcap.getIdentifier(), "barrel") +
                                         "_layer" + layer.getGeometry().getPhysicalVolume().getCopyNumber() +
                                         "_wedge" +  wedge.getGeometry().getPath().getLeafVolume().getCopyNumber() +

-                                        "_module" + ((SiTrackerBarrelModule)module).getModuleId() + "_sensor" + sensorId;

+                                        "_module" + ((SiTrackerModule)module).getModuleId() + "_sensor" + sensorId;

                                 
                                 System.out.println(sensorName + " -> " + expId);
                                 System.out.println(sensorName + " -> " + id);