GeomConverter/test/org/lcsim/detector/converter/compact
diff -u -r1.8 -r1.9
--- DiskTrackerTest.java 8 Dec 2007 01:55:51 -0000 1.8
+++ DiskTrackerTest.java 25 Mar 2009 00:27:35 -0000 1.9
@@ -52,7 +52,8 @@
GeometryReader reader = new GeometryReader();
- try {
+ try
+ {
detector = reader.read(in);
}
catch ( Throwable x )
@@ -114,11 +115,11 @@
String[] deAnswerKey = new String[] {
"DiskTrackerTest",
- "DiskTracker_positive_layer1",
- "DiskTracker_positive_layer0",
+ "DiskTracker_positive_layer0_sensor1",
+ "DiskTracker_positive_layer0_sensor0",
"DiskTrackerTest",
- "DiskTracker_negative_layer0",
- "DiskTracker_negative_layer1",
+ "DiskTracker_negative_layer0_sensor0",
+ "DiskTracker_negative_layer0_sensor1",
"DiskTrackerTest"
};
@@ -127,15 +128,16 @@
Hep3Vector zpoint = new BasicHep3Vector(0,0,zpoints[i]);
IPhysicalVolumePath path = navigator.getPath(zpoint);
-
- assertTrue(
+
+ assertEquals(
"Wrong path <" + path.toString() + "> at z = " + zpoints[i] + ". Expected <" + pathAnswerKey[i] + ">.",
- path.toString().equals(pathAnswerKey[i])
+ path.toString(),
+ pathAnswerKey[i]
);
IDetectorElement srch = detector.getDetectorElement().findDetectorElement(zpoint);
- assertTrue("Wrong path <" + path.toString() + "> at z = " + zpoints[i] + ". Expected <" + pathAnswerKey[i] + ">.",
+ assertTrue("Wrong DE <" + srch.getName() + "> at z = " + zpoints[i] + ". Expected <" + deAnswerKey[i] + ">.",
srch.getName().equals(deAnswerKey[i]));
}
}