GeomConverter/src/org/lcsim/detector/converter/compact
diff -u -r1.14 -r1.15
--- CylindricalEndcapCalorimeterConverter.java 20 Nov 2008 18:34:57 -0000 1.14
+++ CylindricalEndcapCalorimeterConverter.java 18 Mar 2009 02:54:35 -0000 1.15
@@ -7,6 +7,7 @@
import org.lcsim.detector.LogicalVolume;
import org.lcsim.detector.PhysicalVolume;
import org.lcsim.detector.RotationPassiveEuler;
+import org.lcsim.detector.RotationPassiveXYZ;
import org.lcsim.detector.Transform3D;
import org.lcsim.detector.Translation3D;
import org.lcsim.detector.material.IMaterial;
@@ -55,7 +56,8 @@
DetectorElement reflectedEndcap=null;
if ( cal.getReflect() )
{
- IRotation3D reflect = new RotationPassiveEuler(Math.PI,0,0);
+ //IRotation3D reflect = new RotationPassiveEuler(Math.PI,0,0);
+ IRotation3D reflect = new RotationPassiveXYZ(0,Math.PI,0);
new PhysicalVolume
(
@@ -101,20 +103,23 @@
// Create an endcap layer.
String pathName = "/" + cal.getName() + "_positive" + "/" + layerName + "/" + sliceName;
new DetectorElement(
- cal.getName() + "_positive_layer" + layerNumber,
+ cal.getName() + "_positive_sensor" + layerNumber,
endcap,
pathName);
+ //System.out.println("made " + e.getName());
// Create the reflected endcap layer.
if ( reflectedEndcap != null )
{
pathName = "/" + cal.getName() + "_negative" + "/" + layerName + "/" + sliceName;
new DetectorElement(
- cal.getName() + "_negative_layer" + layerNumber,
+ cal.getName() + "_negative_sensor" + layerNumber,
reflectedEndcap,
- pathName);
+ pathName);
+ //System.out.println("made " + e.getName());
}
+
// Increment the layer number.
++layerNumber;
}
@@ -155,8 +160,9 @@
String name = cal.getName();
- double thickness = cal.getZMax() - cal.getZMin();
- double zLayer = -thickness/2;
+ double totalThickness = cal.getZMax() - cal.getZMin();
+ totalThickness = -totalThickness;
+ double zLayer = totalThickness/2;
for (int i=0; i<layering.getNumberOfLayers(); i++)
{
@@ -166,7 +172,7 @@
name + "layer" + i + "_tube",
innerRadius,
outerRadius,
- layer.getThickness()
+ layer.getThickness() / 2
);
ILogicalVolume lvLayer =
@@ -184,7 +190,8 @@
envelope,
i);
- double zSlice = zLayer;
+ //double zSlice = zLayer;
+ double zSlice = -layer.getThickness()/2;
for (int j=0; j<layer.getNumberOfSlices(); j++)
{
@@ -194,7 +201,7 @@
cal.getName() + "_layer" + i + "_slice" + j,
cal.getInnerRadius(),
cal.getOuterRadius(),
- slice.getThickness() / 2
+ slice.getThickness() / 2
);
ILogicalVolume lvSlice = new LogicalVolume(