diff -u -r1.3 -r1.4
--- CartesianGridXY.java	21 Sep 2009 21:13:19 -0000	1.3
+++ CartesianGridXY.java	21 Sep 2009 23:04:42 -0000	1.4
@@ -210,22 +210,6 @@

 			{
 				return false;
 			}

-		}	
-		// TODO: Implement Trapezoid bounds check here.
-		else if (de.getGeometry().getLogicalVolume().getSolid() instanceof Trd)
-		{
-			Trd sensorTrd = (Trd)de.getGeometry().getLogicalVolume().getSolid();
-			// Check coordinate values against trd bounds.
-			// FIXME: Y goes to Z?  Need to double-check where this is being converted.
-			if (sensorTrd.inside(new BasicHep3Vector(xPos, 0, yPos)) == Inside.INSIDE)
-			{
-				return true;
-			}
-			// TODO: Handle edge case with partial cells.  (How???)
-			else
-			{
-				return false;
-			}

 		}
 		else
 		{

diff -u -r1.1 -r1.2
--- CartesianGridXZ.java	21 Sep 2009 21:13:51 -0000	1.1
+++ CartesianGridXZ.java	21 Sep 2009 23:04:42 -0000	1.2
@@ -154,7 +154,7 @@

 		Hep3Vector localPosition = de.getGeometry().transformGlobalToLocal(pos);
 		ExpandedIdentifier geomId = new ExpandedIdentifier(de.getExpandedIdentifier());
 		geomId.setValue(xIndex, getXBin(localPosition.x()));

-		geomId.setValue(zIndex, getZBin(localPosition.y()));

+		geomId.setValue(zIndex, getZBin(localPosition.z()));

 		return getSubdetector().getDetectorElement().getIdentifierHelper().pack(geomId).getValue();
 	}
 	

@@ -198,22 +198,7 @@

 		IDetectorElement de = deSrch.get(0);
 		double xPos = computePosition(xVal, gridSizeX);
 		double zPos = computePosition(zVal, gridSizeZ);

-		if (de.getGeometry().getLogicalVolume().getSolid() instanceof Box)
-		{			
-			Box sensorBox = (Box)de.getGeometry().getLogicalVolume().getSolid();
-			// Check coordinate values against box bounds.
-			if (sensorBox.inside(new BasicHep3Vector(xPos, 0, zPos)) == Inside.INSIDE)
-			{
-				return true;
-			}
-			// TODO: Handle edge case with partial cells.  (How???)
-			else
-			{
-				return false;
-			}
-		}	
-		// TODO: Implement Trapezoid bounds check here.
-		else if (de.getGeometry().getLogicalVolume().getSolid() instanceof Trd)

+		if (de.getGeometry().getLogicalVolume().getSolid() instanceof Trd)

 		{
 			Trd sensorTrd = (Trd)de.getGeometry().getLogicalVolume().getSolid();
 			// Check coordinate values against trd bounds.