Commit in projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim on MAIN
detector/converter/compact/HPSTestRunTracker2014Converter.java+10-33277 -> 3278
                          /HPSTestRunTracker2014JavaBuilder.java+1-13277 -> 3278
geometry/compact/converter/lcdd/HPSTestRunTracker2014.java+1-13277 -> 3278
+12-5
3 modified files
Fix the converter instantiation.

projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact
HPSTestRunTracker2014Converter.java 3277 -> 3278
--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSTestRunTracker2014Converter.java	2014-08-19 21:28:33 UTC (rev 3277)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSTestRunTracker2014Converter.java	2014-08-19 22:39:37 UTC (rev 3278)
@@ -10,6 +10,7 @@
 import org.lcsim.detector.ILogicalVolume;
 import org.lcsim.detector.IPhysicalVolume;
 import org.lcsim.detector.DetectorIdentifierHelper.SystemMap;
+import org.lcsim.detector.PhysicalVolumeStore;
 import org.lcsim.detector.converter.compact.HPSTestRunTracker2014JavaBuilder.GhostJavaBaseGeom;
 import org.lcsim.detector.converter.compact.HPSTestRunTracker2014JavaBuilder.JavaBaseGeom;
 import org.lcsim.detector.identifier.ExpandedIdentifier;
@@ -49,16 +50,17 @@
 
 	public HPSTestRunTracker2014Converter() {
 		super();
-		builder = new HPSTestRunTracker2014JavaBuilder(_debug);
 		
+		
 
 	}
 	
 	public void convert(Subdetector subdet, Detector detector) {
 		
 		if(_debug) System.out.printf("%s: convert %s \n", getClass().getSimpleName(), subdet.getName());
-
 		
+		builder = new HPSTestRunTracker2014JavaBuilder(_debug);
+		
 		// check tracking material
 		trackingMaterial = MaterialStore.getInstance().get("Vacuum");
 		if(trackingMaterial==null) {
@@ -182,7 +184,12 @@
 				String modulePlacementName = geometryObject.getName();// builder.getSubdetector().getName() + "_" + moduleName + "_layer" + layer + "_module" + moduleNumber;
 				String modulePath = String.format("/%s/%s", trackingVolume.getName(), modulePlacementName);                                                        
                 
-				if(_debug) System.out.printf("%s: create SiTrackerModule with: placementname %s, modulePath %s, moduleNumber %d  \n", getClass().getSimpleName(),modulePlacementName, modulePath, moduleNumber);
+				if(_debug) {
+					System.out.printf("%s: create SiTrackerModule with: placementname %s, modulePath %s, moduleNumber %d  \n", getClass().getSimpleName(),modulePlacementName, modulePath, moduleNumber);
+					for(IPhysicalVolume v :  PhysicalVolumeStore.getInstance()) {
+						System.out.printf("%s: %s %s %s\n", getClass().getSimpleName(),v.getName(), v.getLogicalVolume().getName(), v.getMotherLogicalVolume().getName());
+					}
+				}
 
 				SiTrackerModule moduleDe = new SiTrackerModule(modulePlacementName, layerDe, modulePath, moduleNumber);
                 

projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact
HPSTestRunTracker2014JavaBuilder.java 3277 -> 3278
--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSTestRunTracker2014JavaBuilder.java	2014-08-19 21:28:33 UTC (rev 3277)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSTestRunTracker2014JavaBuilder.java	2014-08-19 22:39:37 UTC (rev 3278)
@@ -316,7 +316,7 @@
 
 		
 		protected void buildPhysVolume() {
-			if(isDebug()) System.out.printf("%s: build phys volume for %s\n", this.getClass().getSimpleName(),getName());
+			if(isDebug()) System.out.printf("%s: build phys volume for %s with mother %s \n", this.getClass().getSimpleName(),getName(),getMother().getName());
 			setPhysVolume(new PhysicalVolume(new Transform3D(pos, rot), name, volume, getMother().getVolume(),getComponentId()));
 		}
 		protected void buildBox(BaseGeometry base) {

projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd
HPSTestRunTracker2014.java 3277 -> 3278
--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSTestRunTracker2014.java	2014-08-19 21:28:33 UTC (rev 3277)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSTestRunTracker2014.java	2014-08-19 22:39:37 UTC (rev 3278)
@@ -61,7 +61,6 @@
 	public HPSTestRunTracker2014(Element node) throws JDOMException
 	{
 		super(node);
-		builder = new HPSTestRunTracker2014LCDDBuilder(_debug);
 		
 		
 		
@@ -94,6 +93,7 @@
 		**/
 		
 		
+		builder = new HPSTestRunTracker2014LCDDBuilder(_debug);
 		
 		
 		// ID of the detector.
SVNspam 0.1


Use REPLY-ALL to reply to list

To unsubscribe from the LCDET-SVN list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCDET-SVN&A=1