GeomConverter/src/org/lcsim/geometry/compact/converter
diff -u -r1.1 -r1.2
--- SiTrackerModuleComponentParameters.java 3 Dec 2008 00:53:45 -0000 1.1
+++ SiTrackerModuleComponentParameters.java 12 Feb 2009 00:18:25 -0000 1.2
@@ -1,20 +1,21 @@
package org.lcsim.geometry.compact.converter;
-//FIXME: Duplicates class in org.lcsim.detector.converter.compact.SiTrackerEndcapConverter to avoid dependency.
-
+// TODO: Move to different package.
public class SiTrackerModuleComponentParameters
{
String materialName;
double thickness;
boolean sensitive;
int componentNumber;
+ String vis;
- public SiTrackerModuleComponentParameters(double thickness, String materialName, int componentNumber, boolean sensitive)
+ public SiTrackerModuleComponentParameters(double thickness, String materialName, int componentNumber, boolean sensitive, String vis)
{
this.thickness = thickness;
this.materialName = materialName;
this.sensitive = sensitive;
this.componentNumber = componentNumber;
+ this.vis = vis;
}
public double getThickness()
@@ -36,4 +37,9 @@
{
return componentNumber;
}
+
+ public String getVis()
+ {
+ return vis;
+ }
}
GeomConverter/src/org/lcsim/geometry/compact/converter
diff -u -r1.1 -r1.2
--- SiTrackerModuleParameters.java 3 Dec 2008 00:53:45 -0000 1.1
+++ SiTrackerModuleParameters.java 12 Feb 2009 00:18:25 -0000 1.2
@@ -6,16 +6,23 @@
import org.jdom.Element;
import org.jdom.JDOMException;
-// FIXME: Duplicates class in org.lcsim.detector.converter.compact.SiTrackerEndcapConverter to avoid dependency.
+// TODO: Move to different package.
+
public class SiTrackerModuleParameters
extends ArrayList<SiTrackerModuleComponentParameters>
{
double thickness=0.;
String name;
double dimensions[] = new double[3];
+ String vis;
+
public SiTrackerModuleParameters(Element element)
{
name = element.getAttributeValue("name");
+
+ if (element.getAttribute("vis") != null)
+ this.vis = element.getAttribute("vis").getValue();
+
int cntr=0;
for (Object o : element.getChildren("module_component"))
{
@@ -30,7 +37,10 @@
boolean sensitive = false;
if (e.getAttribute("sensitive") != null)
sensitive = e.getAttribute("sensitive").getBooleanValue();
- add(new SiTrackerModuleComponentParameters(thickness, materialName, cntr, sensitive));
+ String componentVis = null;
+ if (e.getAttribute("vis") != null)
+ componentVis = e.getAttribute("vis").getValue();
+ add(new SiTrackerModuleComponentParameters(thickness, materialName, cntr, sensitive, componentVis));
}
catch (JDOMException x)
{
@@ -83,4 +93,9 @@
throw new RuntimeException("Invalid dimensions index: " + i);
return dimensions[i];
}
+
+ public String getVis()
+ {
+ return vis;
+ }
}
\ No newline at end of file