LISTSERV 16.5 - LCD-CVS Archives

-{ - CalorimeterIDDecoder getCalorimeterIDDecoder(); - CalorimeterType getCalorimeterType(); - // Fixme: This would make sense, but is not provided by compact reader - // so cannot go here. - // double getSamplingFraction();

GeomConverter/src/org/lcsim/geometry/compact

ParameterSet.java 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- ParameterSet.java	18 Jan 2006 22:46:20 -0000	1.3
+++ ParameterSet.java	1 Feb 2006 01:33:16 -0000	1.4
@@ -6,147 +6,180 @@

 import org.jdom.Element;
 
 /**

- *
- * ParameterSet is used to store generic subdetector parameters 
- * within the compact Subdetector object.  Values are converted
- * from <parameter> elements within the <detector> element.  The
- * parameters can be of type Double, Integer, or String.
- *

+ * 
+ * ParameterSet is used to store generic subdetector parameters within the
+ * compact Subdetector object. Values are converted from <parameter> elements
+ * within the <detector> element. The parameters can be of type Double, Integer,
+ * or String.
+ *

  * @author jeremym

- * @version $Id: ParameterSet.java,v 1.3 2006/01/18 22:46:20 jeremy Exp $

+ * @version $Id: ParameterSet.java,v 1.4 2006/02/01 01:33:16 jeremy Exp $

  */
 public class ParameterSet
 {

-    /* Map for storing and looking up parameters by name. */
-    Map<String, Object> _parameters = new HashMap<String, Object>();
-    
-    /** Constructor taking the <detector> node for a subdetector. */
-    protected ParameterSet(Element node)
-    {        
-        convertFromXML(node);
-    }
-    
-    /** Convert <parameter> elements within <detector>. */
-    private void convertFromXML(Element node)
-    {
-        assert(node != null);
-        assert(node.getName().compareTo("detector") == 0);
-        
-        // Iterate over <parameter> elements
-        for ( Object object : node.getChildren("parameter") )
-        {
-            Element element = (Element) object;
-            
-            // Get name
-            String name = element.getAttributeValue("name");
-            assert(name != null);
-            
-            // Get parameter type
-            String type = element.getAttributeValue("type");
-            assert(type != null);
-            
-            // Get parameter value (can be null)
-            String value = element.getAttributeValue("value");
-            
-            // Get value from text data within the tag if no value attribute exists
-            if ( value == null )
-            {
-                value = element.getTextNormalize();                
-            }
-            
-            Object convert = null;
-            
-            // Convert to Double
-            if ( type.compareToIgnoreCase("double") == 0 )
-            {
-                convert = Double.parseDouble(value);
-            }
-            // Convert to Integer
-            else if ( type.compareToIgnoreCase("integer") == 0 || type.compareToIgnoreCase("int") == 0 )
-            {
-                convert = Integer.parseInt(value);
-            }
-            // Convert to String
-            else if ( type.compareToIgnoreCase("string") == 0 ) {                
-                convert = value;
-            }
-            // Type is invalid
-            else {
-                throw new RuntimeException("Unknown parameter type " + type);
-            }
-            
-            // add the parameter
-            addParameter(name, convert);
-            //System.out.println("added parameter " + name + "=" + convert.toString() );
-        }
-    }
-    
-    /** Constructor without Element argument. */
-    protected ParameterSet()
-    {}
-    
-    /** Add a parameter to the ParameterSet, checking that the type is valid. */
-    protected void addParameter(String name, Object object)
-    {
-        if ( object instanceof Double || object instanceof Integer || object instanceof String )
-        {
-            if ( _parameters.get(name) == null )
-            {
-                _parameters.put(name, object);
-            }
-            else
-            {
-                throw new RuntimeException("Parameter " + name + " already exists in this ParameterSet.");
-            }
-        }
-        else
-        {
-            throw new RuntimeException("Parameter " + name + " is not of type Double, Integer or String.");
-        }
-    }
-    
-    /** Return a named parameter as a generic java Object. */
-    public Object getParameter(String name, Class klass)
-    {
-        Object object = _parameters.get(name);
-        if ( object.getClass() == klass )
-        {
-            return object;
-        }
-        else
-        {
-            System.err.println("Found object but type does not match.");
-            return null;
-        }
-    }
-    
-    /** Checks if the parameter exists. */
-    public boolean exists(String name)
-    {
-        return _parameters.containsKey(name);
-    }        
-    
-    /** Return the list of parameter names. */
-    public Set<String> getParameterNames()
-    {
-        return _parameters.keySet();
-    }
-    
-    /** Return a named parameter of type Double. */
-    public Double getDouble(String name)
-    {
-        return (Double)getParameter(name, Double.class);
-    }
-    
-    /** Return a named parameter of type Integer. */
-    public Integer getInteger(String name)
-    {
-        return (Integer)getParameter(name, Integer.class);
-    }
-    
-    /** Return a named parameter of type String. */
-    public String getString(String name)
-    {
-        return (String)getParameter(name, String.class);
-    }

+	/* Map for storing and looking up parameters by name. */
+	Map<String, Object> _parameters = new HashMap<String, Object>();
+
+	/** Constructor taking the <detector> node for a subdetector. */
+	protected ParameterSet(Element node)
+	{
+		convertFromXML(node);
+	}
+
+	/** Convert <parameter> elements within <detector>. */
+	private void convertFromXML(Element node)
+	{
+		assert (node != null);
+		assert (node.getName().compareTo("detector") == 0);
+
+		// Iterate over <parameter> elements
+		for (Object object : node.getChildren("parameter"))
+		{
+			Element element = (Element) object;
+
+			// Get name
+			String name = element.getAttributeValue("name");
+			assert (name != null);
+
+			// Get parameter type
+			String type = element.getAttributeValue("type");
+
+			// Get parameter value (can be null)
+			String value = element.getAttributeValue("value");
+
+			// Get value from text data within the tag if no value attribute
+			// exists
+			if ( value == null )
+			{
+				value = element.getTextNormalize();
+			}
+
+			Object convert = null;
+
+			// Explicit type conversion
+			if ( type != null )
+			{
+				// Convert to Double
+				if ( type.compareToIgnoreCase("double") == 0 ||
+						type.compareToIgnoreCase("dbl") == 0 )
+				{
+					convert = Double.parseDouble(value);
+				}
+				// Convert to Integer
+				else if ( type.compareToIgnoreCase("integer") == 0
+						|| type.compareToIgnoreCase("int") == 0 )
+				{
+					convert = Integer.parseInt(value);
+				}
+				// Convert to String
+				else if ( type.compareToIgnoreCase("string") == 0 || 
+						type.compareToIgnoreCase("str") == 0)
+				{
+					convert = value;
+				}
+				// Type is invalid
+				else
+				{
+					throw new RuntimeException("Unknown type " + type + " for parameter " + name);
+				}
+			} 
+			// Implicit type conversion
+			else
+			{
+				try
+				{
+					// First try parsing as Double
+					convert = Double.parseDouble(value);
+				} 
+				catch (Exception e)
+				{
+
+					try
+					{
+						// Next try Int
+						convert = Integer.parseInt(value);
+					} 
+					catch (Exception ee)
+					{
+						// Lastly, default to String
+						convert = value;
+					}
+				}
+			}
+
+			// add the parameter
+			//System.out.println("adding parameter " + name + "=" + value + " of type " + type);
+			addParameter(name, convert);
+		}
+	}
+
+	/** Constructor without Element argument. */
+	protected ParameterSet()
+	{
+	}
+
+	/** Add a parameter to the ParameterSet, checking that the type is valid. */
+	protected void addParameter(String name, Object object)
+	{
+		if ( object instanceof Double || object instanceof Integer
+				|| object instanceof String )
+		{
+			if ( _parameters.get(name) == null )
+			{
+				_parameters.put(name, object);
+			} else
+			{
+				throw new RuntimeException("Parameter " + name
+						+ " already exists in this ParameterSet.");
+			}
+		} else
+		{
+			throw new RuntimeException("Parameter " + name
+					+ " is not of type Double, Integer or String.");
+		}
+	}
+
+	/** Return a named parameter as a generic java Object. */
+	public Object getParameter(String name, Class klass)
+	{
+		Object object = _parameters.get(name);
+		if ( object.getClass() == klass )
+		{
+			return object;
+		} else
+		{
+			System.err.println("Found object but type does not match.");
+			return null;
+		}
+	}
+
+	/** Checks if the parameter exists. */
+	public boolean exists(String name)
+	{
+		return _parameters.containsKey(name);
+	}
+
+	/** Return the list of parameter names. */
+	public Set<String> getParameterNames()
+	{
+		return _parameters.keySet();
+	}
+
+	/** Return a named parameter of type Double. */
+	public Double getDouble(String name)
+	{
+		return (Double) getParameter(name, Double.class);
+	}
+
+	/** Return a named parameter of type Integer. */
+	public Integer getInteger(String name)
+	{
+		return (Integer) getParameter(name, Integer.class);
+	}
+
+	/** Return a named parameter of type String. */
+	public String getString(String name)
+	{
+		return (String) getParameter(name, String.class);
+	}

+ * + * This enum specifies the general type of a calorimeter Subdetector. + * Valid types include HCal, ECal, Muon, and FCal. It can be used to modify + * the behavior of algorithms that should only be performed on hits from + * certain types of calorimeters. + *

- enum ECalorimeterType - { - FCAL, - ECAL, - HCAL, - MUON, - OTHER - } - - /** Creates a new instance of CalorimeterType */ - public CalorimeterType(String typeName)

+ _typeName = typeName; + } + + public static CalorimeterType convertStringToCalorimeterType(String str) + { + if ( str.compareToIgnoreCase("ecal") == 0 || str.compareToIgnoreCase("em") == 0 )

+ if ( caltype == ECAL ) + { + return "ECAL"; + } + else if ( caltype == FCAL ) + { + return "FCAL"; + } + else if ( caltype == HCAL) + { + return "HCAL"; + } + else if ( caltype == MUON) + { + return "MUON"; + } + + return "UNKNOWN"; + } +

+ + public boolean isHcal() + { + return this == HCAL; + } + + public boolean isEcal() + { + return this == ECAL; + } + + public boolean isMuon() + { + return this == MUON; + } + + public boolean isFcal() + { + return this == FCAL; + } + + public boolean isUnknown() + { + return this == UNKNOWN; + }

</detector> <detector id ="7" name="HAD_ENDCAP" reflect="true" type="CylindricalEndcapCalorimeter" readout="HcalEndcapHits"> <dimensions inner_r = "20.0*cm" inner_z = "184.0*cm" outer_r = "142.0*cm" />

</detector> <detector id="4" name="MUON_BARREL" type="CylindricalBarrelCalorimeter" readout="MuonBarrHits" detectorType="calorimeter"> <dimensions inner_r = "337.0*cm" outer_z = "287.0*cm" />

</detector> <detector id="8" name="MUON_ENDCAP" reflect="true" type="CylindricalEndcapCalorimeter" readout="MuonEndcapHits"> <dimensions inner_r = "20.0*cm" inner_z = "287.0*cm" outer_r = "636.0*cm" />

</detector> <detector id="9" name="LUM_ENDCAP" reflect="true" type="CylindricalEndcapCalorimeter" readout="LumEndcapHits"> <dimensions inner_r = "0.0001*cm" inner_z = "310.0*cm" outer_r = "9.2*cm" />

+/* + * CylindricalBarrelCalorimeterTest.java + * + * Created on June 15, 2005, 12:00 PM + */ + +package org.lcsim.geometry.subdetector; + +import java.io.InputStream; +import junit.framework.TestCase; +import junit.framework.TestSuite; +import org.lcsim.geometry.GeometryReader; +import org.lcsim.geometry.compact.Detector; +import org.lcsim.geometry.Calorimeter; + +/** + * + * @author jeremym + */ +public class CalorimeterTypeTest extends TestCase +{ + Detector det; + + /** Creates a new instance of CylindricalBarrelCalorimeterTest */ + public CalorimeterTypeTest() + { + } + + protected void setUp() throws java.lang.Exception + { + InputStream in = this.getClass().getResourceAsStream("/org/lcsim/geometry/compact/sdjan03_compact.xml"); + + GeometryReader reader = new GeometryReader(); + det = reader.read(in); + } + + public static junit.framework.Test suite() + { + return new TestSuite(CalorimeterTypeTest.class); + } + + public void testCalorimeterType() + { + Calorimeter ecalBarr = (Calorimeter)det.getSubdetector("EMBarrel"); + Calorimeter ecalEndcap = (Calorimeter)det.getSubdetector("EMEndcap"); + + Calorimeter hcalBarr = (Calorimeter)det.getSubdetector("HADBarrel"); + Calorimeter hcalEndcap = (Calorimeter)det.getSubdetector("HADEndcap"); + + Calorimeter muBarr = (Calorimeter)det.getSubdetector("MUON_BARREL"); + Calorimeter muEndcap = (Calorimeter)det.getSubdetector("MUON_ENDCAP"); + + assert(ecalBarr.getCalorimeterType().isEcal()); + assert(ecalBarr.getCalorimeterType() == CalorimeterType.ECAL); + + assert(ecalEndcap.getCalorimeterType().isEcal()); + assert(ecalEndcap.getCalorimeterType() == CalorimeterType.ECAL); + + assert(hcalBarr.getCalorimeterType().isHcal()); + assert(hcalBarr.getCalorimeterType() == CalorimeterType.HCAL); + + assert(hcalEndcap.getCalorimeterType().isHcal()); + assert(hcalEndcap.getCalorimeterType() == CalorimeterType.HCAL); + + assert(muBarr.getCalorimeterType().isMuon()); + assert(muBarr.getCalorimeterType() == CalorimeterType.MUON); + + assert(muEndcap.getCalorimeterType().isMuon()); + assert(muEndcap.getCalorimeterType() == CalorimeterType.MUON); + } +}

Commit in `GeomConverter` on MAIN
`src/org/lcsim/geometry/Calorimeter.java`	+4	-7	1.9 -> 1.10
`src/org/lcsim/geometry/compact/ParameterSet.java`	+172	-139	1.3 -> 1.4
`src/org/lcsim/geometry/compact/converter/lcdd/AbstractTestBeam.java`	+2	-2	1.4 -> 1.5
`/EcalBarrel.java`	+2	-2	1.3 -> 1.4
`src/org/lcsim/geometry/subdetector/AbstractCalorimeter.java`	+9	-7	1.3 -> 1.4
`/AbstractSubdetector.java`	+1	-4	1.4 -> 1.5
`/CalorimeterType.java`	+77	-36	1.1 -> 1.2
`/TestBeamCalorimeter.java`	+1	-1	1.4 -> 1.5
`test/org/lcsim/geometry/compact/sdjan03_compact.xml`	+9	-1	1.14 -> 1.15
`test/org/lcsim/geometry/subdetector/CalorimeterTypeTest.java`	+71		added 1.1
	+348	-199