GeomConverter/src/org/lcsim/geometry/subdetector
diff -u -r1.8 -r1.9
--- TestBeamCalorimeter.java 22 May 2007 20:02:07 -0000 1.8
+++ TestBeamCalorimeter.java 9 Dec 2009 01:38:29 -0000 1.9
@@ -3,20 +3,32 @@
import org.jdom.Element;
import org.jdom.JDOMException;
import org.lcsim.geometry.Calorimeter;
+import org.lcsim.geometry.Calorimeter.CalorimeterType;
/**
* @author Jeremy McCormick
*/
+// TODO: Need to make this class inherit from AbstractCalorimeter.
public class TestBeamCalorimeter extends AbstractTestBeam
- implements Calorimeter
+implements Calorimeter
{
+ CalorimeterType calType = CalorimeterType.UNKNOWN;
public TestBeamCalorimeter(Element node) throws JDOMException
{
super(node);
+ if (node.getAttribute("calorimeterType") != null)
+ {
+ calType = CalorimeterType.fromString(node.getAttributeValue("calorimeterType"));
+ }
}
public boolean isCalorimeter()
{
return true;
+ }
+
+ public CalorimeterType getCalorimeterType()
+ {
+ return calType;
}
}
\ No newline at end of file
