Print

Print


Commit in GeomConverter/src/org/lcsim/detector/converter/compact on MAIN
DiskTrackerConverter.java+13-141.11 -> 1.12
MultiLayerTrackerConverter.java+4-41.8 -> 1.9
+17-18
2 modified files
JM: Fix problem reported by Hans where ReadoutDriver was not working with DiskTracker or MultiLayerTracker collections.

GeomConverter/src/org/lcsim/detector/converter/compact
DiskTrackerConverter.java 1.11 -> 1.12
diff -u -r1.11 -r1.12
--- DiskTrackerConverter.java	7 Aug 2007 18:11:39 -0000	1.11
+++ DiskTrackerConverter.java	28 Aug 2007 03:07:35 -0000	1.12
@@ -151,30 +151,29 @@
                 {                    
                     String path = "/tracking_region/" + name + "_positive_layer" +i + "/slice" + j;
 
-                    DiskTrackerSensorLayer northEndcapLayer = 
-                        new DiskTrackerSensorLayer(
-                            name + "_positive_sensor" + sensorNum,
-                            endcapPos,
-                            path);
-
                     ExpandedIdentifier expid = makeExpandedIdentifier(decoder, systemNumber, 1, i);
 
                     IIdentifierDictionary iddict = IdentifierDictionaryManager.getInstance().getIdentifierDictionary( subdet.getReadout().getName() );
                     IIdentifier id = IdentifierUtil.pack(iddict, expid);
-                    northEndcapLayer.setIdentifier(id);
+                    DiskTrackerSensorLayer northEndcapLayer = 
+                        new DiskTrackerSensorLayer(
+                            name + "_positive_sensor" + sensorNum,
+                            endcapPos,
+                            path,
+                            id);
 
                     if ( tracker.getReflect() )
                     {
                         path = "/tracking_region/" + name + "_negative_layer" +i + "/slice" + j;
+                                
+                        expid = makeExpandedIdentifier(decoder, systemNumber, 2, i);
+                        id = IdentifierUtil.pack(iddict, expid);
                         DiskTrackerSensorLayer southEndcapLayer = 
                             new DiskTrackerSensorLayer(
                                 name + "_negative_sensor" + sensorNum,
                                 endcapNeg,
-                                path);
-                                
-                        expid = makeExpandedIdentifier(decoder, systemNumber, 2, i);
-                        id = IdentifierUtil.pack(iddict, expid);
-                        southEndcapLayer.setIdentifier(id);
+                                path,
+                                id);
                     }
                     
                     ++sensorNum;
@@ -218,9 +217,9 @@
     extends DetectorElement
     {
         DiskTrackerSensorLayer
-        (String name, IDetectorElement parent, String path)
+        (String name, IDetectorElement parent, String path, IIdentifier id)
         {
-            super(name,parent,path);            
+            super(name,parent,path,id);            
         }
     }
     

GeomConverter/src/org/lcsim/detector/converter/compact
MultiLayerTrackerConverter.java 1.8 -> 1.9
diff -u -r1.8 -r1.9
--- MultiLayerTrackerConverter.java	12 Jul 2007 06:54:42 -0000	1.8
+++ MultiLayerTrackerConverter.java	28 Aug 2007 03:07:36 -0000	1.9
@@ -101,13 +101,13 @@
                 if ( slice.isSensitive() )
                 {
                     String path = "/tracking_region/" + name + "_layer" +i + "/slice" + j;
-                    MultiLayerTrackerSensorLayer layerDetectorElement = new MultiLayerTrackerSensorLayer(name + "_layer" + layerNumber, tracker.getDetectorElement(), path);
                     
                     ExpandedIdentifier expid = makeExpandedIdentifier(subdet.getIDDecoder(),tracker.getIDDecoder().getSystemNumber(),i);
 
                     IIdentifierDictionary iddict = IdentifierDictionaryManager.getInstance().getIdentifierDictionary( subdet.getReadout().getName() );
                     IIdentifier id = IdentifierUtil.pack( iddict, expid );
-                    layerDetectorElement.setIdentifier(id);
+                    MultiLayerTrackerSensorLayer layerDetectorElement = new MultiLayerTrackerSensorLayer(name + "_layer" + layerNumber, tracker.getDetectorElement(), path, id);
+                    //layerDetectorElement.setIdentifier(id);
 
                     ++layerNumber;
                 }
@@ -152,9 +152,9 @@
     public class MultiLayerTrackerSensorLayer
     extends DetectorElement
     {
-        MultiLayerTrackerSensorLayer(String name, IDetectorElement parent, String path)
+        MultiLayerTrackerSensorLayer(String name, IDetectorElement parent, String path, IIdentifier id)
         {
-            super(name,parent,path);
+            super(name,parent,path,id);
         }
     }
     
CVSspam 0.2.8