2 added + 2 modified, total 4 files
GeomConverter/test/org/lcsim/detector/converter/compact
diff -N MultiLayerTrackerTest.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ MultiLayerTrackerTest.java 12 Jul 2007 06:56:30 -0000 1.1
@@ -0,0 +1,76 @@
+package org.lcsim.detector.converter.compact;
+
+import hep.physics.vec.BasicHep3Vector;
+import hep.physics.vec.Hep3Vector;
+
+import java.io.InputStream;
+
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.lcsim.detector.DetectorElementStore;
+import org.lcsim.detector.IDetectorElement;
+import org.lcsim.detector.IDetectorElementContainer;
+import org.lcsim.detector.IPhysicalVolumeNavigator;
+import org.lcsim.detector.IPhysicalVolumePath;
+import org.lcsim.geometry.Detector;
+import org.lcsim.geometry.GeometryReader;
+import org.lcsim.geometry.Subdetector;
+
+/**
+ *
+ * Perform tests on the detailed geometry of an
+ *
+ * @see org.lcsim.geometry.subdetector.MultiLayerTracker
+ *
+ * @author Jeremy McCormick <[log in to unmask]>
+ *
+ */
+public class MultiLayerTrackerTest
+extends TestCase
+{
+ private Detector detector;
+
+ public MultiLayerTrackerTest(String name)
+ {
+ super(name);
+ }
+
+ public static junit.framework.Test suite()
+ {
+ return new TestSuite(MultiLayerTrackerTest.class);
+ }
+
+ private static final String resource =
+ "/org/lcsim/detector/converter/compact/MultiLayerTrackerTest.xml";
+
+ public void setUp()
+ {
+ InputStream in =
+ this.getClass().
+ getResourceAsStream(resource);
+
+ GeometryReader reader = new GeometryReader();
+
+ try {
+ detector = reader.read(in);
+ }
+ catch ( Throwable x )
+ {
+ throw new RuntimeException(x);
+ }
+ }
+
+ public void testLayers()
+ {
+ Subdetector compact = detector.getSubdetector("MultiLayerTracker");
+ IDetectorElement subdet = compact.getDetectorElement();
+ IDetectorElementContainer layers = subdet.getChildren();
+ assertEquals("Expected number of sensors is wrong!",layers.size(),2);
+ IDetectorElement layer = layers.get(0);
+ assertEquals(layer.getIdentifierHelper().getValue(layer.getIdentifier(), "system"),compact.getIDDecoder().getSystemNumber());
+ assertEquals(layer.getIdentifierHelper().getValue(layer.getIdentifier(), "barrel"),0);
+ assertTrue(layers.get(0).getIdentifierHelper().getValue(layers.get(0).getIdentifier(), "layer") == 0);
+ assertTrue(layers.get(1).getIdentifierHelper().getValue(layers.get(1).getIdentifier(), "layer") == 1);
+ }
+}
GeomConverter/test/org/lcsim/detector/converter/compact
diff -N MultiLayerTrackerTest.xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ MultiLayerTrackerTest.xml 12 Jul 2007 06:56:30 -0000 1.1
@@ -0,0 +1,41 @@
+<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+ <info name="subdetectors_test">
+ <comment/>
+ </info>
+ <!-- Constants -->
+ <define>
+ <constant name="cm" value="10"/>
+ <!-- world -->
+ <constant name="world_side" value="30000"/>
+ <constant name="world_x" value="world_side"/>
+ <constant name="world_y" value="world_side"/>
+ <constant name="world_z" value="world_side"/>
+ <!-- tracking region -->
+ <constant name="tracking_region_radius" value="0.1*cm"/>
+ <constant name="tracking_region_zmax" value="0.1*cm"/>
+ </define>
+ <materials>
+ </materials>
+ <display>
+ <vis name="TestVis" alpha="1.0" r="1.0" g="0.0" b="0.0" drawingStyle="wireframe" lineStyle="unbroken" showDaughters="true" visible="true" />
+ </display>
+ <detectors>
+ <detector id="1" name="MultiLayerTracker" type="MultiLayerTracker" readout="MultiLayerTracker_RO" vis="TestVis">
+ <layer id="1" inner_r="20.0" outer_z="100.0">
+ <slice material="G10" thickness="3.0"/>
+ <slice material="Silicon" thickness="2.0" sensitive="yes"/>
+ </layer>
+ <layer id="2" inner_r="30" outer_z="100.0">
+ <slice material="G10" thickness="3.0"/>
+ <slice material="Silicon" thickness="2.0" sensitive="yes"/>
+ </layer>
+ </detector>
+ </detectors>
+ <readouts>
+ <readout name="MultiLayerTracker_RO">
+ <id>layer:10,system:3,barrel:3</id>
+ </readout>
+ </readouts>
+ <fields>
+ </fields>
+</lccdd>
GeomConverter/test/org/lcsim/detector/converter/compact
diff -u -r1.5 -r1.6
--- DiskTrackerTest.java 2 May 2007 01:58:20 -0000 1.5
+++ DiskTrackerTest.java 12 Jul 2007 06:56:30 -0000 1.6
@@ -10,10 +10,12 @@
import org.lcsim.detector.DetectorElementStore;
import org.lcsim.detector.IDetectorElement;
+import org.lcsim.detector.IDetectorElementContainer;
import org.lcsim.detector.IPhysicalVolumeNavigator;
import org.lcsim.detector.IPhysicalVolumePath;
import org.lcsim.geometry.Detector;
import org.lcsim.geometry.GeometryReader;
+import org.lcsim.geometry.Subdetector;
/**
*
@@ -59,6 +61,22 @@
}
}
+ public void testLayers()
+ {
+ Subdetector compact = detector.getSubdetector("DiskTracker");
+ IDetectorElement subdet = compact.getDetectorElement();
+ for (IDetectorElement endcap : subdet.getChildren())
+ {
+ IDetectorElementContainer layers = endcap.getChildren();
+ assertEquals("Expected number of sensors is wrong!",layers.size(),2);
+ IDetectorElement layer = layers.get(0);
+ assertEquals(layer.getIdentifierHelper().getValue(layer.getIdentifier(), "system"),compact.getIDDecoder().getSystemNumber());
+ int barrel=layer.getIdentifierHelper().getValue(layer.getIdentifier(), "barrel");
+ assertTrue(barrel == 1 || barrel == 2);
+ assertTrue(layer.getIdentifierHelper().getValue(layer.getIdentifier(), "layer") == 0);
+ }
+ }
+
/**
* Scan the geometry with some points along the z axis.
* Check that the points are within the correct geometric
@@ -133,4 +151,4 @@
srch.getName().equals(deAnswerKey[i]));
}
}
-}
\ No newline at end of file
+}
GeomConverter/test/org/lcsim/detector/converter/compact
diff -u -r1.2 -r1.3
--- DiskTrackerTest.xml 26 Mar 2007 19:36:55 -0000 1.2
+++ DiskTrackerTest.xml 12 Jul 2007 06:56:30 -0000 1.3
@@ -32,10 +32,10 @@
<readouts>
<readout name="DiskTrackerHits">
- <id>layer:10,system:3,barrel:3</id>
+ <id>system:3,layer:10,barrel:3</id>
</readout>
</readouts>
<fields>
</fields>
-</lccdd>
\ No newline at end of file
+</lccdd>
CVSspam 0.2.8
