GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd

CylindricalEndcapCalorimeter2.java added at 1.1

diff -N CylindricalEndcapCalorimeter2.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ CylindricalEndcapCalorimeter2.java	23 Sep 2010 22:58:03 -0000	1.1
@@ -0,0 +1,127 @@

+package org.lcsim.geometry.compact.converter.lcdd;
+
+import org.jdom.Element;
+import org.jdom.JDOMException;
+import org.lcsim.geometry.compact.converter.lcdd.util.Cone;
+import org.lcsim.geometry.compact.converter.lcdd.util.LCDD;
+import org.lcsim.geometry.compact.converter.lcdd.util.Material;
+import org.lcsim.geometry.compact.converter.lcdd.util.PhysVol;
+import org.lcsim.geometry.compact.converter.lcdd.util.Rotation;
+import org.lcsim.geometry.compact.converter.lcdd.util.SensitiveDetector;
+import org.lcsim.geometry.compact.converter.lcdd.util.Solids;
+import org.lcsim.geometry.compact.converter.lcdd.util.Structure;
+import org.lcsim.geometry.compact.converter.lcdd.util.Tube;
+import org.lcsim.geometry.compact.converter.lcdd.util.Volume;
+import org.lcsim.geometry.layer.LayerStack;
+import org.lcsim.geometry.layer.Layering;
+
+public class CylindricalEndcapCalorimeter2 extends LCDDSubdetector
+{
+    CylindricalEndcapCalorimeter2(Element c) throws JDOMException
+    {
+        super(c);
+    }
+
+    void addToLCDD(LCDD lcdd, SensitiveDetector sens) throws JDOMException
+    {
+        // Get subdetector id and name.
+        int id = node.getAttribute("id").getIntValue();
+        String subdetectorName = node.getAttributeValue("name");
+
+        // Get important references from LCDD.
+        Material air = lcdd.getMaterial("Air");
+        Solids solids = lcdd.getSolids();
+        Structure structure = lcdd.getStructure();
+        Volume motherVolume = lcdd.pickMotherVolume(this);
+
+        // Get the subdetector dimensions.
+        Element dimensions = node.getChild("dimensions");
+        double zmin = dimensions.getAttribute("zmin").getDoubleValue();
+        double rmin = dimensions.getAttribute("rmin").getDoubleValue();
+        double rmax = dimensions.getAttribute("rmax").getDoubleValue();
+        double innerAngle = dimensions.getAttribute("angle").getDoubleValue();
+
+        // Make layering object.
+        LayerStack layers = Layering.makeLayering(this.node).getLayerStack();
+
+        // Get thickness of calorimeter in z dimension determined by layering.
+        double thickness = layers.getTotalThickness();
+
+        // Compute radius at last zplane of envelope.
+        double rmin2 = rmin + (thickness * Math.tan(innerAngle));
+
+        // Make the subdetector's envelope cone.
+        // Note: Z measurement is full length, which will be divided by two for half-length by GDML.
+        Cone envelopeCone = new Cone(subdetectorName + "_envelope_cone", rmin, rmin2, rmax, rmax, thickness);
+        solids.addSolid(envelopeCone);
+
+        // Make the calorimeter envelope volume.
+        Volume envelopeVolume = new Volume(subdetectorName + "_volume", envelopeCone, air);
+
+        // Set the absolute z coordinate of the layer front face for layer loop.
+        double layerZ = -thickness / 2;
+
+        // The rmin of the layer which will decrease along z.
+        double layerRmin = rmin;
+                
+        // Loop over and build the layers into the detector envelope.
+        for (int i = 0, l = layers.getNumberOfLayers(); i < l; i++)
+        {
+            System.out.println(" layer " + i);
+            System.out.println("  z = " + layerZ);
+            
+            // Get this layer's thickness.
+            double layerThickness = layers.getLayer(i).getThickness();
+
+            // Compute change in layer inner radius.
+            double layerdx = Math.tan(innerAngle) * layerThickness;
+
+            // Add dx to inner radius.
+            layerRmin += layerdx;
+
+            // Make layer tube.
+            // Note: This shape wants the z half-length instead of full z length. 
+            Tube layerTube = new Tube(subdetectorName + "_layer" + i + "_tube", layerRmin, rmax, layerThickness / 2);
+            solids.addSolid(layerTube);
+
+            // Make layer volume.
+            Volume layerVolume = new Volume(subdetectorName + "_layer" + i + "_volume", layerTube, air);
+
+            // TODO: Make slices loop here.
+
+                        
+            structure.addVolume(layerVolume);
+
+            // Make layer placement into envelope.
+            PhysVol layerPhysVol = new PhysVol(layerVolume);
+            layerPhysVol.addPhysVolID("layer", i);
+            System.out.println("  layerCenter = " + (layerZ + layerThickness / 2));
+            layerPhysVol.setZ(layerZ + layerThickness / 2);  
+            envelopeVolume.addPhysVol(layerPhysVol);
+
+            // Set z to edge of next layer.
+            layerZ += layerThickness;            
+        }
+
+        // Add envelope's logical volume to structure.
+        structure.addVolume(envelopeVolume);
+
+        // Make rotation for positive endcap.
+        Rotation positiveEndcapRotation = new Rotation(subdetectorName + "_rotation_positive");
+        // positiveEndcapRotation.setZ(zrot);
+        lcdd.getDefine().addRotation(positiveEndcapRotation);
+
+        // Positive endcap placement.
+        PhysVol endcapPositivePhysVol = new PhysVol(envelopeVolume);
+        endcapPositivePhysVol.addPhysVolID("system", id);
+        endcapPositivePhysVol.addPhysVolID("barrel", 1);
+        endcapPositivePhysVol.setRotation(positiveEndcapRotation);
+        //endcapPositivePhysVol.setZ(zmin + thickness / 2);
+        motherVolume.addPhysVol(endcapPositivePhysVol);
+    }
+
+    public boolean isCalorimeter()
+    {
+        return true;
+    }
+}

Commit in `GeomConverter` on MAIN
`src/org/lcsim/geometry/compact/converter/lcdd/CylindricalEndcapCalorimeter2.java`	+127	added 1.1
`src/org/lcsim/geometry/compact/converter/lcdd/util/Cone.java`	+42	added 1.1
`src/org/lcsim/geometry/subdetector/CylindricalEndcapCalorimeter2.java`	+25	added 1.1
`testResources/org/lcsim/geometry/subdetector/CylindricalEndcapCalorimeter2Test.xml`	+39	added 1.1
	+233