GeomConverter/src/org/lcsim/geometry
diff -u -r1.21 -r1.22
--- Subdetector.java 22 May 2007 20:02:06 -0000 1.21
+++ Subdetector.java 11 Sep 2007 19:21:03 -0000 1.22
@@ -21,9 +21,9 @@
*/
@Deprecated
public Layering getLayering();
- //public ParameterSet getParameterSet();
+
public VisAttributes getVisAttributes();
-
+
public boolean isTracker();
public boolean isCalorimeter();
public boolean isBarrel();
@@ -38,4 +38,6 @@
public double[] transformLocalToGlobal(double[] localPos);
public IDetectorElement getDetectorElement();
+
+ public boolean isInsideTrackingVolume();
}
\ No newline at end of file
GeomConverter/src/org/lcsim/geometry/compact
diff -u -r1.19 -r1.20
--- Subdetector.java 22 May 2007 20:02:06 -0000 1.19
+++ Subdetector.java 11 Sep 2007 19:21:03 -0000 1.20
@@ -15,7 +15,6 @@
* @author Jeremy McCormick <[log in to unmask]>
*/
public class Subdetector
-//extends DetectorElement
implements org.lcsim.geometry.Subdetector
{
private boolean reflect;
@@ -26,6 +25,7 @@
private VisAttributes vis;
private Element node;
private IDetectorElement de;
+ private boolean insideTrackingVolume=false;
protected Subdetector(Element element) throws JDOMException
{
@@ -42,8 +42,30 @@
systemID = 0;
if (id != null) systemID = id.getIntValue();
- // Setup the generic parameters
- //_parameters = new ParameterSet(element);
+ // Check if inside tracking volume.
+ Attribute insideAttrib = node.getAttribute("insideTrackingVolume");
+ try
+ {
+ if ( insideAttrib == null )
+ {
+ if ( isTracker() )
+ {
+ insideTrackingVolume = true;
+ }
+ else
+ {
+ insideTrackingVolume = false;
+ }
+ }
+ else
+ {
+ insideTrackingVolume = insideAttrib.getBooleanValue();
+ }
+ }
+ catch (org.jdom.DataConversionException dce)
+ {
+ throw new RuntimeException("Error converting insideTrackingVolume attribute.", dce);
+ }
}
protected void setReadout(Readout r)
@@ -152,4 +174,9 @@
{
this.de = de;
}
+
+ public boolean isInsideTrackingVolume()
+ {
+ return insideTrackingVolume;
+ }
}
\ No newline at end of file
GeomConverter/src/org/lcsim/geometry/subdetector
diff -u -r1.9 -r1.10
--- AbstractSubdetector.java 15 Mar 2007 02:09:15 -0000 1.9
+++ AbstractSubdetector.java 11 Sep 2007 19:21:03 -0000 1.10
@@ -11,6 +11,7 @@
import hep.graphics.heprep.HepRepFactory;
import hep.graphics.heprep.HepRepType;
+import org.jdom.Attribute;
import org.jdom.Element;
import org.jdom.JDOMException;
import org.lcsim.detector.IDetectorElement;
@@ -28,13 +29,13 @@
abstract class AbstractSubdetector
extends org.lcsim.geometry.compact.Subdetector
implements HepRepProvider
-{
+{
/** Creates a new instance of AbstractSubdetector */
public AbstractSubdetector(Element node) throws JDOMException
{
- super(node);
+ super(node);
}
-
+
/** HepRepProvider: optional impl for subclass */
/** FIXME: Should live in org.lcsim.geometry.heprep or equivalent. */
public void appendHepRep(HepRepFactory factory, HepRep heprep)