3 modified files
GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
diff -u -r1.16 -r1.17
--- PolyhedraBarrelCalorimeter.java 2 Jun 2008 20:37:00 -0000 1.16
+++ PolyhedraBarrelCalorimeter.java 13 Feb 2009 09:47:49 -0000 1.17
@@ -66,6 +66,8 @@
// Subdetector name and ID.
String detName = node.getAttributeValue("name");
int id = node.getAttribute("id").getIntValue();
+
+ Element staves = node.getChild("staves");
double staveGap = 0.1;
if (node.getAttribute("staveGap") != null)
@@ -321,7 +323,13 @@
}
// Set the vis of the section.
- setVisAttributes(lcdd,node,sectVolume);
+ if (staves != null)
+ {
+ if (staves.getAttribute("vis") != null)
+ {
+ setVisAttributes(lcdd,staves,sectVolume);
+ }
+ }
// Add the section volume to the structure.
structure.addVolume(sectVolume);
GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
diff -u -r1.23 -r1.24
--- PolyhedraEndcapCalorimeter.java 12 Feb 2009 21:43:08 -0000 1.23
+++ PolyhedraEndcapCalorimeter.java 13 Feb 2009 09:47:49 -0000 1.24
@@ -73,6 +73,7 @@
Volume motherVolume = lcdd.pickMotherVolume(this);
Material air = lcdd.getMaterial("Air");
Define define = lcdd.getDefine();
+ Element staves = node.getChild("staves");
// Subdetector name and ID.
String detName = node.getAttributeValue("name");
@@ -278,11 +279,20 @@
//break;
}
+ // Set the vis of the section.
+ if (staves != null)
+ {
+ if (staves.getAttribute("vis") != null)
+ {
+ setVisAttributes(lcdd,staves,sectVolume);
+ }
+ }
+
// Add the section volume after layers created.
- if (node.getAttribute("vis") != null)
- {
- sectVolume.setVisAttributes(lcdd.getVisAttributes(node.getAttributeValue("vis")));
- }
+ //if (node.getAttribute("vis") != null)
+ //{
+ // sectVolume.setVisAttributes(lcdd.getVisAttributes(node.getAttributeValue("vis")));
+ //}
structure.addVolume(sectVolume);
GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
diff -u -r1.6 -r1.7
--- PolyhedraEndcapCalorimeter2.java 13 Feb 2009 00:32:55 -0000 1.6
+++ PolyhedraEndcapCalorimeter2.java 13 Feb 2009 09:47:49 -0000 1.7
@@ -14,7 +14,6 @@
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.VisAttributes;
import org.lcsim.geometry.compact.converter.lcdd.util.Volume;
import org.lcsim.geometry.layer.LayerStack;
import org.lcsim.geometry.layer.Layering;
@@ -36,6 +35,7 @@
Material air = lcdd.getMaterial("Air");
Define define = lcdd.getDefine();
Rotation identityRotation = define.getRotation("identity_rot");
+ Element staves = node.getChild("staves");
String subdetectorName = node.getAttributeValue("name");
int id = node.getAttribute("id").getIntValue();
CVSspam 0.2.8