3 modified files
GeomConverter/src/org/lcsim/detector/converter/compact
diff -u -r1.14 -r1.15
--- DetectorConverter.java 2 May 2007 23:46:10 -0000 1.14
+++ DetectorConverter.java 8 May 2007 00:53:30 -0000 1.15
@@ -138,8 +138,8 @@
if ( cnv != null )
{
// Build the IdentifierDictionary for this Subdetector.
- // Subdetector converters need this to be done first.
- IIdentifierDictionary iddict = createIdentifierDictionary( subdet );
+ // Subdetector converters may need this to be done first.
+ IIdentifierDictionary iddict = createIdentifierDictionary( subdet );
// Convert from a compact type to the generic detector description
// using a registered converter.
@@ -165,7 +165,7 @@
*
* @param subdet The Subdetector.
*/
- private IIdentifierDictionary createIdentifierDictionary(Subdetector subdet)
+ protected static IIdentifierDictionary createIdentifierDictionary(Subdetector subdet)
{
Readout ro = subdet.getReadout();
IIdentifierDictionary iddict=null;
GeomConverter/src/org/lcsim/detector/converter/compact
diff -u -r1.3 -r1.4
--- ISubdetectorConverter.java 5 Apr 2007 23:24:21 -0000 1.3
+++ ISubdetectorConverter.java 8 May 2007 00:53:30 -0000 1.4
@@ -3,9 +3,6 @@
import org.lcsim.geometry.compact.Detector;
import org.lcsim.geometry.compact.Subdetector;
-//import org.lcsim.geometry.Detector;
-//import org.lcsim.geometry.Subdetector;
-
public interface ISubdetectorConverter
{
public void convert(Subdetector subdet, Detector detector);
GeomConverter/src/org/lcsim/detector/converter/compact
diff -u -r1.10 -r1.11
--- SiTrackerBarrelConverter.java 8 May 2007 00:30:59 -0000 1.10
+++ SiTrackerBarrelConverter.java 8 May 2007 00:53:30 -0000 1.11
@@ -21,6 +21,9 @@
import org.lcsim.detector.Transform3D;
import org.lcsim.detector.identifier.ExpandedIdentifier;
import org.lcsim.detector.identifier.IIdentifier;
+import org.lcsim.detector.identifier.IIdentifierDictionary;
+import org.lcsim.detector.identifier.IdentifierDictionaryManager;
+import org.lcsim.detector.identifier.IdentifierUtil;
import org.lcsim.detector.material.IMaterial;
import org.lcsim.detector.material.MaterialStore;
import org.lcsim.detector.solids.Box;
@@ -502,8 +505,13 @@
// sensor
expId.addValue(sensorId);
- // Create the package id.
- IIdentifier id = subdet.getDetectorElement().getIdentifierHelper().pack( expId );
+ // Get the identifier dictionary. (Subdetector doesn't have this ref yet.)
+ IIdentifierDictionary iddict =
+ IdentifierDictionaryManager.getInstance().
+ getIdentifierDictionary( subdet.getReadout().getName() );
+
+ // Create the packed id using util method. (No IdentifierHelper made yet.)
+ IIdentifier id = IdentifierUtil.pack( expId, iddict );
//System.out.println(pv.getName() + " is sens");
//System.out.println("path : " + modulePath.toString() + "/" + pv.getName());
CVSspam 0.2.8