Print

Print


Commit in GeomConverter/src/org/lcsim on MAIN
detector/converter/compact/DetectorConverter.java+1-11.3 -> 1.4
geometry/subdetector/DESubdetectorBox.java+4-31.2 -> 1.3
+5-4
2 modified files


GeomConverter/src/org/lcsim/detector/converter/compact
DetectorConverter.java 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- DetectorConverter.java	17 Mar 2007 00:10:41 -0000	1.3
+++ DetectorConverter.java	17 Mar 2007 00:21:12 -0000	1.4
@@ -121,7 +121,7 @@
                 detector.addChild(subdet);
 			}			
             else {
-                System.err.println("No ISubdetectorConverter for <" + subdet.getClass().getCanonicalName() + ">.");
+                System.err.println("WARNING: No ISubdetectorConverter for <" + subdet.getClass().getCanonicalName() + ">.");
             }
 		}		
 	}

GeomConverter/src/org/lcsim/geometry/subdetector
DESubdetectorBox.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- DESubdetectorBox.java	17 Mar 2007 00:10:42 -0000	1.2
+++ DESubdetectorBox.java	17 Mar 2007 00:21:12 -0000	1.3
@@ -1,7 +1,7 @@
 package org.lcsim.geometry.subdetector;
 
-import static org.lcsim.units.clhep.SystemOfUnits.m;
 import static org.lcsim.units.clhep.SystemOfUnits.cm;
+import static org.lcsim.units.clhep.SystemOfUnits.m;
 import hep.graphics.heprep.HepRep;
 import hep.graphics.heprep.HepRepFactory;
 import hep.physics.vec.BasicHep3Vector;
@@ -15,7 +15,7 @@
 import org.lcsim.detector.IPhysicalVolumePath;
 import org.lcsim.detector.LogicalVolume;
 import org.lcsim.detector.PhysicalVolume;
-import org.lcsim.detector.PhysicalVolumeNavigator;
+import org.lcsim.detector.PhysicalVolumeNavigatorStore;
 import org.lcsim.detector.Transform3D;
 import org.lcsim.detector.converter.heprep.DetectorElementToHepRepConverter;
 import org.lcsim.detector.material.IMaterial;
@@ -59,7 +59,8 @@
 				world.getLogicalVolume(),
 				0);
 		
-		IPhysicalVolumeNavigator nav = new PhysicalVolumeNavigator(world);
+		IPhysicalVolumeNavigator nav = 
+            PhysicalVolumeNavigatorStore.getInstance().createDefault(world);
 		IPhysicalVolumePath path = nav.getPath("/box1");
 		detelem = new DummyDE(path);	
 	}
CVSspam 0.2.8