6 modified files
GeomConverter/src/org/lcsim/geometry/compact
diff -u -r1.8 -r1.9
--- Segmentation.java 15 Sep 2009 23:22:45 -0000 1.8
+++ Segmentation.java 14 Oct 2009 22:36:42 -0000 1.9
@@ -1,7 +1,6 @@
package org.lcsim.geometry.compact;
import org.jdom.Element;
-import org.lcsim.geometry.IDDecoder;
import org.lcsim.geometry.util.BaseIDDecoder;
/**
GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
diff -u -r1.10 -r1.11
--- CylindricalBarrelCalorimeter.java 22 Feb 2009 00:19:12 -0000 1.10
+++ CylindricalBarrelCalorimeter.java 14 Oct 2009 22:36:42 -0000 1.11
@@ -47,7 +47,7 @@
Volume envelopeVolume = new Volume(detectorName+"_envelope_volume");
envelopeVolume.setMaterial(air);
envelopeVolume.setSolid(envelope);
-
+
int n = 0;
for (Iterator i = node.getChildren("layer").iterator(); i.hasNext();)
{
@@ -117,9 +117,11 @@
motherVolume.addPhysVol(physvol);
solids.addSolid(envelope);
- structure.addVolume(envelopeVolume);
-
- setVisAttributes(lcdd, node, envelopeVolume);
+
+ // Set envelope volume attributes.
+ setAttributes(lcdd, node, envelopeVolume);
+
+ structure.addVolume(envelopeVolume);
}
public boolean isCalorimeter()
GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
diff -u -r1.17 -r1.18
--- CylindricalEndcapCalorimeter.java 22 Feb 2009 00:19:12 -0000 1.17
+++ CylindricalEndcapCalorimeter.java 14 Oct 2009 22:36:42 -0000 1.18
@@ -50,8 +50,8 @@
solids.addSolid(envelope);
Volume envelopeVolume = new Volume(detectorName+"_envelope_volume");
envelopeVolume.setMaterial(air);
- envelopeVolume.setSolid(envelope);
-
+ envelopeVolume.setSolid(envelope);
+
int n = 0;
for (Iterator i = node.getChildren("layer").iterator(); i.hasNext();)
{
@@ -146,7 +146,10 @@
physvol2.addPhysVolID("barrel",2);
motherVolume.addPhysVol(physvol2);
}
- setVisAttributes(lcdd, node, envelopeVolume);
+
+ // Set envelope volume attributes.
+ setAttributes(lcdd, node, envelopeVolume);
+
structure.addVolume(envelopeVolume);
}
GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
diff -u -r1.20 -r1.21
--- EcalBarrel.java 18 Sep 2009 20:51:22 -0000 1.20
+++ EcalBarrel.java 14 Oct 2009 22:36:42 -0000 1.21
@@ -35,7 +35,7 @@
* that is similar to the "ecal02" subdetector in the Mokka database.
*
* @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: EcalBarrel.java,v 1.20 2009/09/18 20:51:22 jeremy Exp $
+ * @version $Id: EcalBarrel.java,v 1.21 2009/10/14 22:36:42 jeremy Exp $
*/
public class EcalBarrel extends LCDDSubdetector
{
@@ -119,7 +119,7 @@
envelopeVolume.setSolid(polyhedra);
Material air = lcdd.getMaterial("Air");
envelopeVolume.setMaterial(air);
-
+
// Set the rotation to make a side lay "flat".
double zrot = Math.PI / nsides;
Rotation rot = new Rotation(name + "_rotation");
@@ -253,6 +253,9 @@
envelopeVolume.setVisAttributes(lcdd.getVisAttributes(node.getAttributeValue("vis")));
}
+ // Set envelope volume attributes.
+ setAttributes(lcdd, node, envelopeVolume);
+
lcdd.getStructure().addVolume(envelopeVolume);
}
GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
diff -u -r1.19 -r1.20
--- PolyhedraBarrelCalorimeter.java 9 Sep 2009 17:32:19 -0000 1.19
+++ PolyhedraBarrelCalorimeter.java 14 Oct 2009 22:36:42 -0000 1.20
@@ -138,7 +138,7 @@
Volume envelopeVolume = new Volume(detName + "_envelope");
envelopeVolume.setSolid(polyhedra);
envelopeVolume.setMaterial(air);
-
+
PhysVol envelopePhysvol = new PhysVol(envelopeVolume);
envelopePhysvol.setRotation(rot);
envelopePhysvol.addPhysVolID("system", id);
@@ -333,7 +333,7 @@
setVisAttributes(lcdd,staves,sectVolume);
}
}
-
+
// Add the section volume to the structure.
structure.addVolume(sectVolume);
@@ -378,6 +378,9 @@
// Set vis of envelope.
setVisAttributes(lcdd, node, envelopeVolume);
+ // Set envelope volume attributes.
+ setAttributes(lcdd, node, envelopeVolume);
+
// Add the subdetector envelope to the structure.
structure.addVolume(envelopeVolume);
}
GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
diff -u -r1.10 -r1.11
--- PolyhedraEndcapCalorimeter2.java 20 Feb 2009 22:19:42 -0000 1.10
+++ PolyhedraEndcapCalorimeter2.java 14 Oct 2009 22:36:42 -0000 1.11
@@ -56,7 +56,7 @@
PolyhedraRegular envelopeSolid = new PolyhedraRegular(subdetectorName + "_envelope", numsides, rmin, rmax, subdetectorThickness);
solids.addSolid(envelopeSolid);
Volume envelopeVolume = new Volume(subdetectorName + "_volume", envelopeSolid, air);
-
+
int layerNumber = 0;
int layerType = 0;
double layerZ = -subdetectorThickness/2;
@@ -146,6 +146,9 @@
// The envelope volume is complete.
structure.addVolume(envelopeVolume);
+
+ // Set envelope volume attributes.
+ setAttributes(lcdd, node, envelopeVolume);
// Positive endcap.
CVSspam 0.2.8
