LISTSERV 16.5 - LCD-CVS Archives

<module_component thickness="0.228" material="CarbonFiber_50D" /> <module_component thickness="3.175" material="Rohacell31_50D" /> <module_component thickness="0.228" material="CarbonFiber_50D" /> <module_component thickness="0.3" material="Silicon" sensitive="true" /> <module_component thickness="0.017" material="Silicon" /> <module_component thickness="0.1" material="Kapton" />

+ + for (Object n : node.getChildren("module")) + { + Element e = (Element)n; + moduleParameters.put(e.getAttributeValue("name"), new ModuleParameters(e)); + }

int sysId = node.getAttribute("id").getIntValue(); String subdetName = node.getAttributeValue("name"); for (Object o : node.getChildren("layer")) {

+ + Attribute moduleref = layerElement.getAttribute("module"); + + if (moduleref == null) + throw new RuntimeException("module reference is missing for layer number " + layerN); + + ModuleParameters module = moduleParameters.get(moduleref.getValue());

GeomConverter/src/org/lcsim/detector/converter/compact

SiTrackerEndcapConverter.java 1.22 -> 1.23

diff -u -r1.22 -r1.23
--- SiTrackerEndcapConverter.java	9 Apr 2008 13:46:34 -0000	1.22
+++ SiTrackerEndcapConverter.java	21 Apr 2008 20:01:18 -0000	1.23
@@ -5,8 +5,11 @@

 import hep.physics.vec.VecOp;
 
 import java.util.ArrayList;

+import java.util.HashMap;

 import java.util.List;

+import java.util.Map;

+import org.jdom.Attribute;

 import org.jdom.DataConversionException;
 import org.jdom.Element;
 import org.jdom.JDOMException;

@@ -21,7 +24,7 @@

 import org.lcsim.detector.ITranslation3D;
 import org.lcsim.detector.LogicalVolume;
 import org.lcsim.detector.PhysicalVolume;

-import org.lcsim.detector.Rotation3D;

+import org.lcsim.detector.RotationGeant;

 import org.lcsim.detector.RotationPassiveXYZ;
 import org.lcsim.detector.Transform3D;
 import org.lcsim.detector.Translation3D;

@@ -37,7 +40,6 @@

 import org.lcsim.detector.material.MaterialStore;
 import org.lcsim.detector.solids.Box;
 import org.lcsim.detector.solids.IPolyhedron;

-import org.lcsim.detector.solids.Point3D;

 import org.lcsim.detector.solids.Polygon3D;
 import org.lcsim.detector.solids.Trap;
 import org.lcsim.detector.solids.Trd;

@@ -56,7 +58,7 @@

  * Converter for SiTrackerEndcap.
  *
  * @author Jeremy McCormick, Tim Nelson

- * @version $Id: SiTrackerEndcapConverter.java,v 1.22 2008/04/09 13:46:34 tknelson Exp $

+ * @version $Id: SiTrackerEndcapConverter.java,v 1.23 2008/04/21 20:01:18 jeremy Exp $

  */
 
 public class SiTrackerEndcapConverter

@@ -72,7 +74,8 @@

     }
      */

-    private ModuleParameters moduleParameters = null;

+    //private ModuleParameters moduleParameters = null;
+	private Map<String, ModuleParameters> moduleParameters = new HashMap<String, ModuleParameters>();

     
     public IIdentifierHelper makeIdentifierHelper(Subdetector subdetector, SystemMap systemMap)
     {

@@ -116,7 +119,11 @@

         }
         
         // Set static module parameters.

-        moduleParameters = new ModuleParameters(node.getChild("module"));

+        for (Object n : node.getChildren("module"))
+        {
+        	Element e = (Element)n;
+        	moduleParameters.put(e.getAttributeValue("name"), new ModuleParameters(e));
+        }

         
         for (Object o : node.getChildren("layer"))
         {

@@ -307,12 +314,20 @@

         // Make the wedge LV.
         ILogicalVolume wedgeLV = makeWedge(detector, subdet, innerR, outerR, thickness, nwedges, layern);

+        Attribute moduleref = layerElement.getAttribute("module");
+        
+        if (moduleref == null)
+        	throw new RuntimeException("module reference is missing for layer number " + layern);
+        
+        ModuleParameters module = moduleParameters.get(moduleref.getValue());
+

         // Make the modules in the wedge.

-        makeModules(subdet, wedgeLV, layerElement.getChild("module_parameters"), layern);

+        makeModules(subdet, wedgeLV, layerElement.getChild("module_parameters"), module, layern);

         
         // Place the wedges in the layer.
         double r = (innerR + outerR) / 2;
         //String wedgeName = wedgeLV.getName();

         for (int i=0; i<nwedges; i++)
         {
             double phi = i * 2 * Math.PI / nwedges;

@@ -320,7 +335,8 @@

             double y = r * Math.sin(phi);
             
             Translation3D p = new Translation3D(x,y,0);

-            Rotation3D rot = new RotationPassiveXYZ(-Math.PI/2,0.,-Math.PI/2 - phi);

+            //Rotation3D rot = new RotationPassiveXYZ(-Math.PI/2,0.,-Math.PI/2 - phi);
+            IRotation3D rot = new RotationGeant(-Math.PI/2,-Math.PI/2 - phi,0.);

             Transform3D transform = new Transform3D(p,rot);
             new PhysicalVolume(
                     transform,

@@ -334,7 +350,7 @@

-    private void makeModules(Subdetector subdet, ILogicalVolume wedgeLV, Element moduleElement, int layern)

+    private void makeModules(Subdetector subdet, ILogicalVolume wedgeLV, Element moduleElement, ModuleParameters module, int layern)

     {
         double r_size;
         try

@@ -407,8 +423,7 @@

         for (int i=zcenters.size()-1; i >= 0; i--)
         {

-            int ntraps = (int)Math.ceil(  2*(xsizes1.get(i) - nboxes*xsize_box) / phi_size_max );
-

+            int ntraps = (int)Math.ceil(  2*(xsizes1.get(i) - nboxes*xsize_box) / phi_size_max );

             
             // Squares to fill extra space
             if (ntraps > 2)

@@ -435,7 +450,7 @@

                 ILogicalVolume sliceLV = new LogicalVolume(sliceName, sliceBox, sliceMaterial);
                 
                 // Build the module substructure.

-                makeBoxModule(sliceLV, imodule);

+                makeBoxModule(sliceLV, module, imodule);

                 
                 Transform3D trans = new Transform3D(new Translation3D(xcenter,0,zcenters.get(i)));

@@ -459,7 +474,7 @@

                 ILogicalVolume sliceLV = new LogicalVolume(sliceName, sliceTrd, sliceMaterial);
                 
                 // Build the module substructure.

-                makeTrdModule(sliceLV, imodule);

+                makeTrdModule(sliceLV, module, imodule);

                 
                 Transform3D trans = new Transform3D(new Translation3D(0,0,zcenters.get(i)));

@@ -495,7 +510,7 @@

                     
                     ILogicalVolume sliceLV = new LogicalVolume(sliceName, sliceTrap, sliceMaterial);

-                    makeTrapModule(sliceLV, imodule);

+                    makeTrapModule(sliceLV, module, imodule);

                     
                     Transform3D trans = new Transform3D(new Translation3D(ix*xcenter,0,zcenters.get(i)));

@@ -512,7 +527,7 @@

         }
     }

-    public void makeBoxModule(ILogicalVolume module, int moduleTypeId)

+    public void makeBoxModule(ILogicalVolume module, ModuleParameters moduleParameters, int moduleTypeId)

     {
         Box moduleBox = (Box)module.getSolid();
         double posY = -moduleBox.getYHalfLength();

@@ -543,7 +558,7 @@

         }
     }

-    public void makeTrdModule(ILogicalVolume module, int moduleTypeId)

+    public void makeTrdModule(ILogicalVolume module, ModuleParameters moduleParameters, int moduleTypeId)

     {
         Trd trd = (Trd)module.getSolid();
         double x1 = trd.getXHalfLength1();

@@ -577,11 +592,9 @@

         }
     }

-    public void makeTrapModule(ILogicalVolume module, int moduleTypeId)

+    public void makeTrapModule(ILogicalVolume module, ModuleParameters moduleParameters, int moduleTypeId)

     {
         Trap trap = (Trap)module.getSolid();

-        //double a1 = trap.getTanAlpha1();
-        //double a2 = trap.getTanAlpha2();

         double a1 = trap.getAlpha1();
         double a2 = trap.getAlpha2();
         double x1 = trap.getXHalfLength1();

@@ -589,11 +602,9 @@

         double x3 = trap.getXHalfLength3();
         double x4 = trap.getXHalfLength4();
         double y1 = trap.getYHalfLength1();

-        //double y2 = trap.getYHalfLength2();

         double z = trap.getZHalfLength();
         double theta = trap.getTheta();

-        double phi = trap.getPhi();
-

+        double phi = trap.getPhi();

         double posY = -y1;
         
         for (ModuleComponentParameters component : moduleParameters)

Commit in `GeomConverter` on MAIN
`testResources/org/lcsim/detector/converter/compact/SiTrackerEndcapTest.xml`	+7	-7	1.6 -> 1.7
`resources/org/lcsim/detector/db/SiTrackerEndcapTest00/compact.xml`	+6	-3	1.2 -> 1.3
`src/org/lcsim/geometry/compact/converter/lcdd/SiTrackerEndcap.java`	+28	-15	1.10 -> 1.11
`src/org/lcsim/detector/converter/compact/SiTrackerEndcapConverter.java`	+32	-21	1.22 -> 1.23
	+73	-46