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

diff -u -r1.8 -r1.9
--- SiTrackerEndcapConverter.java	31 Oct 2007 00:33:54 -0000	1.8
+++ SiTrackerEndcapConverter.java	7 Nov 2007 00:33:20 -0000	1.9
@@ -31,7 +31,7 @@

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

- * @version $Id: SiTrackerEndcapConverter.java,v 1.8 2007/10/31 00:33:54 jeremy Exp $

+ * @version $Id: SiTrackerEndcapConverter.java,v 1.9 2007/11/07 00:33:20 jeremy Exp $

  */
 
 public class SiTrackerEndcapConverter

@@ -436,7 +436,7 @@

         for (ModuleComponentParameters component : moduleParameters)
         {
             double thickness = component.getThickness();

-            IMaterial material = component.getMaterial();

+            IMaterial material = MaterialStore.getInstance().get(component.getMaterialName());

             boolean sensitive = component.isSensitive();
             int componentNumber = component.getComponentNumber();
             

@@ -470,7 +470,7 @@

         for (ModuleComponentParameters component : moduleParameters)
         {
             double thickness = component.getThickness();

-            IMaterial material = component.getMaterial();

+            IMaterial material = MaterialStore.getInstance().get(component.getMaterialName());

             boolean sensitive = component.isSensitive();
             int componentNumber = component.getComponentNumber();
             

@@ -494,14 +494,16 @@

     public void makeTrapModule(ILogicalVolume module, int moduleTypeId)
     {
         Trap trap = (Trap)module.getSolid();

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

+        //double a1 = trap.getTanAlpha1();
+        //double a2 = trap.getTanAlpha2();
+        double a1 = trap.getAlpha1();
+        double a2 = trap.getAlpha2();

         double x1 = trap.getXHalfLength1();
         double x2 = trap.getXHalfLength2();
         double x3 = trap.getXHalfLength3();
         double x4 = trap.getXHalfLength4();
         double y1 = trap.getYHalfLength1();

-        double y2 = trap.getYHalfLength2();

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

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

@@ -511,7 +513,7 @@

         for (ModuleComponentParameters component : moduleParameters)
         {
             double thickness = component.getThickness();

-            IMaterial material = component.getMaterial();

+            IMaterial material = MaterialStore.getInstance().get(component.getMaterialName());

             boolean sensitive = component.isSensitive();
             int componentNumber = component.getComponentNumber();
             

@@ -537,48 +539,48 @@

         return SiTrackerEndcap.class;
     }
     

-    private static class ModuleComponentParameters

+    public static class ModuleComponentParameters

     {

-        IMaterial material;

+        String materialName;

         double thickness;
         boolean sensitive;
         int componentNumber;
 

-        public ModuleComponentParameters(double thickness, IMaterial material, int componentNumber, boolean sensitive)

+        public ModuleComponentParameters(double thickness, String materialName, int componentNumber, boolean sensitive)

         {
             this.thickness = thickness;

-            this.material = material;

+            this.materialName = materialName;

             this.sensitive = sensitive;
             this.componentNumber = componentNumber;
         }
         

-        double getThickness()

+        public double getThickness()

         {
             return thickness;
         }
         

-        IMaterial getMaterial()

+        public String getMaterialName()

         {

-            return material;

+            return materialName;

         }
         

-        boolean isSensitive()

+        public boolean isSensitive()

         {
             return sensitive;
         }
         

-        int getComponentNumber()

+        public int getComponentNumber()

         {
             return componentNumber;
         }
     }
     

-    private static class ModuleParameters

+    public static class ModuleParameters

     extends ArrayList<ModuleComponentParameters>
     {
         double thickness=0.;
         String name;

-        ModuleParameters(Element element)

+        public ModuleParameters(Element element)

         {
             name = element.getAttributeValue("name");
             int cntr=0;

@@ -588,14 +590,14 @@

                     
                     Element e = (Element)o;
                     

-                    double cThickness = e.getAttribute("thickness").getDoubleValue();

+                    double thickness = e.getAttribute("thickness").getDoubleValue();

-                    IMaterial cMaterial = MaterialStore.getInstance().get(e.getAttributeValue("material"));

+                    String materialName = e.getAttributeValue("material");

-                    boolean cSensitive = false;

+                    boolean sensitive = false;

                     if (e.getAttribute("sensitive") != null)

-                        cSensitive = e.getAttribute("sensitive").getBooleanValue();
-                    add(new ModuleComponentParameters(cThickness, cMaterial, cntr, cSensitive));

+                        sensitive = e.getAttribute("sensitive").getBooleanValue();
+                    add(new ModuleComponentParameters(thickness, materialName, cntr, sensitive));

                 }
                 catch (JDOMException x)
                 {

@@ -606,7 +608,7 @@

             calculateThickness();
         }
                 

-        void calculateThickness()

+        public void calculateThickness()

         {
             thickness = 0.; // reset thickness
             for (ModuleComponentParameters p : this)

@@ -615,7 +617,7 @@

             }
         }
         

-        double getThickness()

+        public double getThickness()

         {
             return thickness;
         }