GeomConverter/test/org/lcsim/geometry
diff -u -r1.10 -r1.11
--- GeometryReaderTest.java 7 Feb 2006 17:16:10 -0000 1.10
+++ GeometryReaderTest.java 7 Feb 2006 18:47:54 -0000 1.11
@@ -8,57 +8,54 @@
import java.io.InputStream;
import org.lcsim.geometry.compact.Header;
-
/**
- *
+ *
+ * Checks that basic dimensions, quantities and analysis objects
+ * were created correctly from a compact XML file by the GeometryReader.
+ *
* @author jeremym
- *
- * Checks that basic dimensions, quantities and analysis objects
- * were created correctly by the GeometryReader from a compact
- * XML file (similar to sdjan03).
- *
*/
public class GeometryReaderTest extends TestCase
{
private static final String detName = "GeometryReaderTest";
private static final String detLoc = detName + ".xml";
-
+
Detector detector;
int nDetectors = 10;
int nConstants = 10;
-
+
int nTrackerLayers = 5;
int nTrackerEndcapLayers = 10;
int nFields = 1;
-
+
int nEMLayers = 30;
double EMThick = 150.0;
int nEMSlices = 5;
-
+
double EMBarrelir = 1270.0;
double EMBarreloz = 1840.0;
double EMBarrelor = EMBarrelir + EMThick;
-
+
double EMEndcapir = 200.0;
double EMEndcapiz = 1680.0;
double EMEndcapor = 1250.0;
double EMEndcapoz = EMEndcapiz + EMThick;
-
+
int nHADLayers = 34;
int nMuonLayers = 32;
-
+
double tol = 0.0001;
-
+
public GeometryReaderTest(String testName)
{
super(testName);
}
-
+
public static Test suite()
{
return new TestSuite(GeometryReaderTest.class);
}
-
+
protected void setUp() throws Exception
{
try
@@ -72,148 +69,149 @@
throw new RuntimeException("GeometryReaderTest.setUp() - GeometryReader failed.", e);
}
}
-
+
public void testHeader()
{
- Header hdr = detector.getHeader();
- assert(hdr.getDetectorName().equals("GeometryReaderTest") );
- assert(hdr.getTitle().equals("GeometryReaderTest from sdjan03") );
- assert(hdr.getComment().equals("Test comment.") );
- assert(hdr.getAuthor().equals("Jeremy McCormick") );
- assert(hdr.getURL().equals("http://www.example.com") );
+ Header hdr = detector.getHeader();
+ assert (hdr.getDetectorName().equals("GeometryReaderTest"));
+ assert (hdr.getTitle().equals("GeometryReaderTest from sdjan03"));
+ assert (hdr.getComment().equals("Test comment."));
+ assert (hdr.getAuthor().equals("Jeremy McCormick"));
+ assert (hdr.getURL().equals("http://www.example.com"));
}
-
+
public void testCollSizes()
{
- assertEquals(nDetectors, detector.getSubdetectors().size() );
- assertEquals(nDetectors, detector.getReadouts().size() );
- assertEquals(nConstants, detector.getConstants().size() );
- assertEquals(nFields, detector.getFields().size() );
+ assertEquals(nDetectors, detector.getSubdetectors().size());
+ assertEquals(nDetectors, detector.getReadouts().size());
+ assertEquals(nConstants, detector.getConstants().size());
+ assertEquals(nFields, detector.getFields().size());
}
-
+
public void testLayers()
{
- assertEquals(detName, detector.getName() );
-
+ assertEquals(detName, detector.getName());
+
org.lcsim.geometry.Subdetector subdetector = null;
- for ( String sn : detector.getSubdetectorNames() )
+ for (String sn : detector.getSubdetectorNames())
{
subdetector = detector.getSubdetector(sn);
- assert(sn != null);
-
- Layering layers = ((Layered)subdetector).getLayering();
- assert(layers != null);
-
- //System.out.println("layer count: " + layers.getLayerCount() );
-
+ assert (sn != null);
+
+ Layering layers = ((Layered) subdetector).getLayering();
+ assert (layers != null);
+
+ // System.out.println("layer count: " + layers.getLayerCount() );
+
int nLayers = -1;
int nSlices = -1;
-
- if ( sn.equals("BarrelVertex") || sn.equals("BarrelTracker") ||
- sn.equals("EndcapVertex") )
+
+ if (sn.equals("BarrelVertex") || sn.equals("BarrelTracker") || sn.equals("EndcapVertex"))
{
nLayers = nTrackerLayers;
}
-
- if ( sn.equals("EndcapTracker") )
+
+ if (sn.equals("EndcapTracker"))
{
nLayers = nTrackerEndcapLayers;
}
-
- if ( sn.equals("EMBarrel") || sn.equals("EMEndcap") )
+
+ if (sn.equals("EMBarrel") || sn.equals("EMEndcap"))
{
nLayers = nEMLayers;
nSlices = nEMSlices;
}
-
- if ( sn.equals("HADBarrel") || sn.equals("HADEndcap") )
+
+ if (sn.equals("HADBarrel") || sn.equals("HADEndcap"))
{
nLayers = nHADLayers;
}
-
- if ( sn.equals("MuonBarrel") || sn.equals("MuonEndcap") )
+
+ if (sn.equals("MuonBarrel") || sn.equals("MuonEndcap"))
{
nLayers = nMuonLayers;
}
-
+
/* look at basic attributes if got known subdet */
- if ( nLayers != -1 )
+ if (nLayers != -1)
{
/* has # of layers from above */
- assertEquals(layers.getLayerCount(), nLayers);
-
- for ( int i = 0; i < nLayers; i++)
- {
+ assertEquals(layers.getLayerCount(), nLayers);
+
+ for (int i = 0; i < nLayers; i++)
+ {
/* layer exists at this idx */
- assert(layers.getLayerStack().getLayer(i) != null);
-
+ assert (layers.getLayerStack().getLayer(i) != null);
+
/* has # of slices from above (if set) */
- if ( nSlices != -1 )
+ if (nSlices != -1)
{
- assert(layers.getLayerStack().getLayer(i).getSlices().size() == nSlices);
+ assert (layers.getLayerStack().getLayer(i).getSlices().size() == nSlices);
}
-
+
/* has a valid set of slices at each layer */
boolean gotLayers = false;
-
- for (LayerSlice slice : layers.getLayerStack().getLayer(i).getSlices() )
- {
- assert(slice != null);
- assert(slice.getMaterial() != null);
- assert(slice.getThickness() >= 0);
+
+ for (LayerSlice slice : layers.getLayerStack().getLayer(i).getSlices())
+ {
+ assert (slice != null);
+ assert (slice.getMaterial() != null);
+ assert (slice.getThickness() >= 0);
gotLayers = true;
}
-
+
/* got at least one layer */
- assert(gotLayers);
+ assert (gotLayers);
}
-
+
/* has Readout */
Readout readout = detector.getReadout(sn);
- assert(readout != null);
-
- /* has IDDecoder */
+ assert (readout != null);
+
+ /* has IDDecoder */
IDDecoder dec = subdetector.getIDDecoder();
- assert(dec != null);
-
+ assert (dec != null);
+
/* if tracker, test for TrackerIDDecoder */
-// if ( subdetector.isTracker() )
-// {
-// TrackerIDDecoder tdec = ((Tracker)subdetector).getTrackerIDDecoder();
-// assert(tdec != null);
-// }
+ // if ( subdetector.isTracker() )
+ // {
+ // TrackerIDDecoder tdec =
+ // ((Tracker)subdetector).getTrackerIDDecoder();
+ // assert(tdec != null);
+ // }
/* test for Segmentation */
- if (subdetector.isCalorimeter())
+ if (subdetector.isCalorimeter())
{
- //CalorimeterIDDecoder cdec = ((Calorimeter)subdetector).getCalorimeterIDDecoder();
-
+ // CalorimeterIDDecoder cdec =
+ // ((Calorimeter)subdetector).getCalorimeterIDDecoder();
+
/* test for segmentation */
- Segmentation seg = (Segmentation)subdetector.getIDDecoder();
- //((Segmentation)cdec);
- assert(seg != null);
+ Segmentation seg = (Segmentation) subdetector.getIDDecoder();
+ // ((Segmentation)cdec);
+ assert (seg != null);
}
}
}
}
-
+
public void testAttributes()
{
- for ( String sn : detector.getSubdetectorNames() )
+ for (String sn : detector.getSubdetectorNames())
{
Subdetector subdetector = detector.getSubdetector(sn);
-
- if ( sn.equals("EMBarrel") || sn.equals("EMEndcap") )
+
+ if (sn.equals("EMBarrel") || sn.equals("EMEndcap"))
{
- double totThick = ((Layered)subdetector).getLayering().getLayerStack().getTotalThickness();
-
+ double totThick = ((Layered) subdetector).getLayering().getLayerStack().getTotalThickness();
+
/* test thickness */
- assertEquals( totThick, EMThick, tol );
-
+ assertEquals(totThick, EMThick, tol);
+
CylindricalSubdetector cyl = (CylindricalSubdetector) subdetector;
- assert(cyl != null);
-
+ assert (cyl != null);
+
/* test barrel attributes */
- if ( sn.equals("EMBarrel") )
+ if (sn.equals("EMBarrel"))
{
assertEquals(cyl.getInnerRadius(), EMBarrelir, tol);
assertEquals(cyl.getZMax(), EMBarreloz, tol);
@@ -221,31 +219,34 @@
assertEquals(cyl.getOuterRadius(), EMBarrelor, tol);
}
/* test endcap attributes */
- else if ( sn.equals("EMEndcap") )
+ else if (sn.equals("EMEndcap"))
{
assertEquals(cyl.getInnerRadius(), EMEndcapir, tol);
assertEquals(cyl.getZMin(), EMEndcapiz, tol);
assertEquals(cyl.getOuterRadius(), EMEndcapor, tol);
assertEquals(cyl.getZMax(), EMEndcapoz, tol);
}
-
- /* test whether manually adding up slice thicknesses = total thickness */
+
+ /*
+ * test whether manually adding up slice thicknesses = total
+ * thickness
+ */
double compThick = 0;
int lnum = 0;
- int nlay = ((Layered)subdetector).getLayering().getLayerStack().getNumberOfLayers();
- for ( int i = 0; i < nlay; i++ )
+ int nlay = ((Layered) subdetector).getLayering().getLayerStack().getNumberOfLayers();
+ for (int i = 0; i < nlay; i++)
{
- Layer l = ((Layered)subdetector).getLayering().getLayerStack().getLayer(i);
-
- assert(l != null);
-
- for ( LayerSlice sl : l.getSlices() )
+ Layer l = ((Layered) subdetector).getLayering().getLayerStack().getLayer(i);
+
+ assert (l != null);
+
+ for (LayerSlice sl : l.getSlices())
{
compThick += sl.getThickness();
}
}
-
- assert(compThick == totThick);
+
+ assert (compThick == totThick);
}
}
}
GeomConverter/test/org/lcsim/geometry
diff -u -r1.3 -r1.4
--- GeometryReaderTest.xml 24 Jul 2005 06:47:43 -0000 1.3
+++ GeometryReaderTest.xml 7 Feb 2006 18:47:55 -0000 1.4
@@ -55,7 +55,7 @@
</materials>
<detectors>
- <detector id="0" name="VertexBarrel" type="MultiLayerTracker" readout="VtxBarrHits">
+ <detector id="1" name="VertexBarrel" type="MultiLayerTracker" readout="VtxBarrHits">
<layer id="1" inner_r = "vertex_inner_r" outer_z = "2.5*cm">
<slice material = "Silicon" thickness = "0.01*cm" sensitive = "yes" />
</layer>
@@ -73,7 +73,7 @@
</layer>
</detector>
- <detector id="1" name="BarrelTracker" type="MultiLayerTracker" readout="TkrBarrHits">
+ <detector id="2" name="BarrelTracker" type="MultiLayerTracker" readout="TkrBarrHits">
<layer id="1" inner_r = "20.0*cm" outer_z = "26.67*cm">
<slice material = "G10" thickness = "0.05*cm" />
<slice material = "Silicon" thickness = "0.02*cm" sensitive = "yes" />
@@ -96,7 +96,7 @@
</layer>
</detector>
- <detector id="2" name="EndcapTracker" type="DiskTracker" reflect="true" readout="TkrEndcapHits">
+ <detector id="3" name="EndcapTracker" type="DiskTracker" reflect="true" readout="TkrEndcapHits">
<layer id="1" inner_r = "4.0*cm" inner_z = "27.1*cm" outer_r = "20.50*cm">
<slice material = "Silicon" thickness = "0.02*cm" sensitive = "yes" />
</layer>
@@ -128,7 +128,7 @@
<slice material = "Silicon" thickness = "0.02*cm" sensitive = "yes" />
</layer>
</detector>
- <detector id="2" name="EMBarrel" type="CylindricalBarrelCalorimeter" readout="EcalBarrHits">
+ <detector id="4" name="EMBarrel" type="CylindricalBarrelCalorimeter" readout="EcalBarrHits">
<dimensions inner_r = "127.0*cm" outer_z = "184.0*cm" />
<layer repeat="30">
<slice material = "Tungsten" thickness = "0.25*cm" />
@@ -138,7 +138,7 @@
<slice material = "Air" thickness = "0.06*cm" />
</layer>
</detector>
- <detector id="6" name="EMEndcap" reflect="true" type="CylindricalEndcapCalorimeter" readout="EcalEndcapHits">
+ <detector id="5" name="EMEndcap" reflect="true" type="CylindricalEndcapCalorimeter" readout="EcalEndcapHits">
<dimensions inner_r = "20.0*cm" inner_z = "168.0*cm" outer_r = "125.0*cm" />
<layer repeat="30" >
<slice material = "Tungsten" thickness = "0.25*cm" />
@@ -148,35 +148,35 @@
<slice material = "Air" thickness = "0.06*cm" />
</layer>
</detector>
- <detector id="3" name="HADBarrel" type="CylindricalBarrelCalorimeter" readout="HcalBarrHits">
+ <detector id="6" name="HADBarrel" type="CylindricalBarrelCalorimeter" readout="HcalBarrHits">
<dimensions inner_r = "144.0*cm" outer_z = "286.0*cm" />
<layer repeat="34">
<slice material = "Steel235" thickness = "2.0*cm" />
<slice material = "Polystyrene" thickness = "1.0*cm" sensitive = "yes" />
</layer>
</detector>
- <detector id ="7" name="HADEndcap" reflect="true" type="CylindricalEndcapCalorimeter" readout="HcalEndcapHits">
+ <detector id="7" name="HADEndcap" reflect="true" type="CylindricalEndcapCalorimeter" readout="HcalEndcapHits">
<dimensions inner_r = "20.0*cm" inner_z = "184.0*cm" outer_r = "142.0*cm" />
<layer repeat="34" >
<slice material = "Steel235" thickness = "2.0*cm" />
<slice material = "Polystyrene" thickness = "1.0*cm" sensitive = "yes" />
</layer>
</detector>
- <detector id="4" name="MuonBarrel" type="CylindricalBarrelCalorimeter" readout="MuonBarrHits" detectorType="calorimeter">
+ <detector id="8" name="MuonBarrel" type="CylindricalBarrelCalorimeter" readout="MuonBarrHits" detectorType="calorimeter">
<dimensions inner_r = "337.0*cm" outer_z = "287.0*cm" />
<layer repeat="32">
<slice material = "Iron" thickness = "5.0*cm" />
<slice material = "Air" thickness = "1.5*cm" sensitive = "yes" />
</layer>
</detector>
- <detector id="8" name="MuonEndcap" reflect="true" type="CylindricalEndcapCalorimeter" readout="MuonEndcapHits">
+ <detector id="9" name="MuonEndcap" reflect="true" type="CylindricalEndcapCalorimeter" readout="MuonEndcapHits">
<dimensions inner_r = "20.0*cm" inner_z = "287.0*cm" outer_r = "636.0*cm" />
<layer repeat="32">
<slice material = "Iron" thickness = "5.0*cm" />
<slice material = "Air" thickness = "1.5*cm" sensitive = "yes" />
</layer>
</detector>
- <detector id="9" name="LumEndcap" reflect="true" type="CylindricalEndcapCalorimeter" readout="LumEndcapHits">
+ <detector id="10" name="LumEndcap" reflect="true" type="CylindricalEndcapCalorimeter" readout="LumEndcapHits">
<dimensions inner_r = "0.0001*cm" inner_z = "310.0*cm" outer_r = "9.2*cm" />
<layer repeat="1">
<slice material="Beryllium" thickness = "10.*cm" />
GeomConverter/test/org/lcsim/geometry/compact
diff -u -r1.15 -r1.16
--- sdjan03_compact.xml 1 Feb 2006 01:33:18 -0000 1.15
+++ sdjan03_compact.xml 7 Feb 2006 18:47:55 -0000 1.16
@@ -146,7 +146,7 @@
<slice material = "Silicon" thickness = "0.02*cm" sensitive = "yes" />
</layer>
</detector>
- <detector id="2" name="EMBarrel" type="CylindricalBarrelCalorimeter" readout="EcalBarrHits">
+ <detector id="3" name="EMBarrel" type="CylindricalBarrelCalorimeter" readout="EcalBarrHits">
<dimensions inner_r = "127.0*cm" outer_z = "184.0*cm" />
<layer repeat="30">
<slice material = "Tungsten" thickness = "0.25*cm" />
@@ -157,7 +157,7 @@
</layer>
<parameter name="CALTYPE">ECAL</parameter>
</detector>
- <detector id="6" name="EMEndcap" reflect="true" type="CylindricalEndcapCalorimeter" readout="EcalEndcapHits">
+ <detector id="4" name="EMEndcap" reflect="true" type="CylindricalEndcapCalorimeter" readout="EcalEndcapHits">
<dimensions inner_r = "20.0*cm" inner_z = "168.0*cm" outer_r = "125.0*cm" />
<layer repeat="30" >
<slice material = "Tungsten" thickness = "0.25*cm" />
@@ -168,7 +168,7 @@
</layer>
<parameter name="CALTYPE">ECAL</parameter>
</detector>
- <detector id="3" name="HADBarrel" type="CylindricalBarrelCalorimeter" readout="HcalBarrHits">
+ <detector id="5" name="HADBarrel" type="CylindricalBarrelCalorimeter" readout="HcalBarrHits">
<dimensions inner_r = "144.0*cm" outer_z = "286.0*cm" />
<layer repeat="34">
<slice material = "Steel235" thickness = "2.0*cm" />
@@ -185,7 +185,7 @@
</layer>
<parameter name="CALTYPE">HCAL</parameter>
</detector>
- <detector id ="7" name="HAD_ENDCAP" reflect="true" type="CylindricalEndcapCalorimeter" readout="HcalEndcapHits">
+ <detector id="6" name="HAD_ENDCAP" reflect="true" type="CylindricalEndcapCalorimeter" readout="HcalEndcapHits">
<dimensions inner_r = "20.0*cm" inner_z = "184.0*cm" outer_r = "142.0*cm" />
<layer repeat="34" >
<slice material = "Steel235" thickness = "2.0*cm" />
@@ -193,7 +193,7 @@
</layer>
<parameter name="CALTYPE">HCAL</parameter>
</detector>
- <detector id="4" name="MUON_BARREL" type="CylindricalBarrelCalorimeter" readout="MuonBarrHits" detectorType="calorimeter">
+ <detector id="7" name="MUON_BARREL" type="CylindricalBarrelCalorimeter" readout="MuonBarrHits" detectorType="calorimeter">
<dimensions inner_r = "337.0*cm" outer_z = "287.0*cm" />
<layer repeat="32">
<slice material = "Iron" thickness = "5.0*cm" />