Print

Print


Commit in GeomConverter/src/org/lcsim on MAIN
detector/converter/compact/SiTrackerEndcap2Converter.java+5-11.4 -> 1.5
geometry/compact/converter/lcdd/SiTrackerEndcap2.java+10-21.5 -> 1.6
+15-3
2 modified files
JM: make phi0 and dz optional parameters

GeomConverter/src/org/lcsim/detector/converter/compact
SiTrackerEndcap2Converter.java 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- SiTrackerEndcap2Converter.java	4 Dec 2008 21:33:34 -0000	1.4
+++ SiTrackerEndcap2Converter.java	6 Dec 2008 00:26:48 -0000	1.5
@@ -152,7 +152,11 @@
                 {
                     Element ringElement = (Element) j.next();
                     double r = ringElement.getAttribute("r").getDoubleValue();
-                    double phi0 = ringElement.getAttribute("phi0").getDoubleValue();
+                    double phi0=0;
+                    if (ringElement.getAttribute("phi0") != null)
+                    {
+                        phi0 = ringElement.getAttribute("phi0").getDoubleValue();
+                    }
                     double zstart = ringElement.getAttribute("zstart").getDoubleValue();
                     double dz = Math.abs(ringElement.getAttribute("dz").getDoubleValue());
                     int nmodules = ringElement.getAttribute("nmodules").getIntValue();

GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
SiTrackerEndcap2.java 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- SiTrackerEndcap2.java	3 Dec 2008 00:53:45 -0000	1.5
+++ SiTrackerEndcap2.java	6 Dec 2008 00:26:48 -0000	1.6
@@ -63,9 +63,17 @@
             {
                 Element ringElement = (Element) j.next();
                 double r = ringElement.getAttribute("r").getDoubleValue();
-                double phi0 = ringElement.getAttribute("phi0").getDoubleValue();
+                double phi0=0;
+                if (ringElement.getAttribute("phi0") != null)
+                {
+                    phi0 = ringElement.getAttribute("phi0").getDoubleValue();
+                }
                 double zstart = ringElement.getAttribute("zstart").getDoubleValue();
-                double dz = Math.abs(ringElement.getAttribute("dz").getDoubleValue());
+                double dz=0;
+                if (ringElement.getAttribute("dz") != null)
+                {
+                    dz = Math.abs(ringElement.getAttribute("dz").getDoubleValue());
+                }
                 int nmodules = ringElement.getAttribute("nmodules").getIntValue();
                 String module = ringElement.getAttributeValue("module");
                 Volume moduleVolume = modules.get(module);
CVSspam 0.2.8