LISTSERV 16.5 - LCD-CVS Archives

GeomConverter/src/org/lcsim/geometry/compact

Detector.java 1.10 -> 1.11

diff -u -r1.10 -r1.11
--- Detector.java	18 Jul 2005 18:00:03 -0000	1.10
+++ Detector.java	18 Jul 2005 22:04:10 -0000	1.11
@@ -1,9 +1,7 @@

 package org.lcsim.geometry.compact;

-
-import java.util.ArrayList;

 import java.util.HashMap;

-import java.util.List;

 import java.util.Map;

+import java.util.Set;

 import org.jdom.Element;
 import org.lcsim.material.XMLMaterialManager;

@@ -13,111 +11,139 @@

  */
 public class Detector
 {

-   private Header header;
-   private Map<String,Constant> constants = new HashMap<String,Constant>();
-   private Map<String,Subdetector> subdetectors = new HashMap<String,Subdetector>();
-   private Map<String,Readout> readouts = new HashMap<String,Readout>();
-   private Map<String,Field> fields = new HashMap<String,Field>();   
-   
-   protected XMLMaterialManager materialMgr;
-   
-   /**
-    * Called by the reader to create a new Detector
-    * @param element The JDOM element corresponding to the detector definition in the XML file.
-    */
-   protected Detector(Element element)
-   {       
-        materialMgr = XMLMaterialManager.create(XMLMaterialManager.materials() );        
-   }
-   
-   /**
-    * Called by the reader to associate a header with this detector
-    * @param header The header.
-    */
-   protected void setHeader(Header header)
-   {
-      this.header = header;
-   }
-   /**
-    * Get the header associated with this detector.
-    * @return The header
-    */
-   public Header getHeader()
-   {
-      return header;
-   }
-   
-   /**
-    * Get the detector name from the header.
-    * @return the detector name
-    */
-   public String getDetectorName()
-   {
-       return getHeader().getDetectorName();
-   }
-   
-   /**
-    * Called by the reader to add a constant to this detector.
-    * @param c The constant to add.
-    */
-   protected void addConstant(Constant c)
-   {
-      constants.put(c.getName(),c);
-   }
-   /**
-    * Get the constants associated with this detector.
-    * @return A map of containing all of the constants, indexed by name.
-    */
-   public Map<String,Constant> getConstants()
-   {
-      return constants;
-   }
-   /**
-    * Called by the reader to add a new Readout to this detector.
-    * @param r The readout to add.
-    */
-   protected void addReadout(Readout r)
-   {
-      //System.out.println("geometry.compact.Detector.addReadout() - " + r.getName() );
-      readouts.put(r.getName(),r);
-   }
-   /**
-    * Get the readouts associated with this detector.
-    * @return A map of containing all of the readouts, indexed by name.
-    */
-   public Map<String, Readout> getReadouts()
-   {
-      return readouts;
-   }
-   /**
-    * Called by the reader to add a sub-detector to this detector.
-    * @param sub The sub-detector to add.
-    */
-   protected void addSubdetector(Subdetector sub)
-   {
-      subdetectors.put(sub.getName(),sub);
-   }
-   /**
-    * Get the sub-detectors associated with this detector.
-    * @return A map of containing all of the sub-detectors, indexed by name.
-    */
-   public Map<String,Subdetector> getSubdetectors()
-   {
-      return subdetectors;
-   }
-   
-   protected void addField(Field field)
-   {
-      fields.put(field.getName(),field);
-   }
-   
-   public Map<String,Field> getFields()
-   {
-      return fields;
-   }        
-   
-   public XMLMaterialManager getMaterialManager()
-   {

+    private Header header;
+    private Map<String,Constant> constants = new HashMap<String,Constant>();
+    private Map<String,Subdetector> subdetectors = new HashMap<String,Subdetector>();
+    private Map<String,Readout> readouts = new HashMap<String,Readout>();
+    private Map<String,Field> fields = new HashMap<String,Field>();
+    
+    protected XMLMaterialManager materialMgr;
+    
+    /**
+     * Called by the reader to create a new Detector
+     * @param element The JDOM element corresponding to the detector definition in the XML file.
+     */
+    protected Detector(Element element)
+    {
+        materialMgr = XMLMaterialManager.create(XMLMaterialManager.materials() );
+    }
+    
+    /**
+     * Called by the reader to associate a header with this detector
+     * @param header The header.
+     */
+    protected void setHeader(Header header)
+    {
+        this.header = header;
+    }
+    /**
+     * Get the header associated with this detector.
+     * @return The header
+     */
+    public Header getHeader()
+    {
+        return header;
+    }
+    
+    /**
+     * Get the detector name from the header.
+     * @return the detector name
+     */
+    public String getDetectorName()
+    {
+        return getHeader().getDetectorName();
+    }
+    
+    /**
+     * Called by the reader to add a constant to this detector.
+     * @param c The constant to add.
+     */
+    protected void addConstant(Constant c)
+    {
+        constants.put(c.getName(),c);
+    }
+    /**
+     * Get the constants associated with this detector.
+     * @return A map of containing all of the constants, indexed by name.
+     */
+    public Map<String,Constant> getConstants()
+    {
+        return constants;
+    }
+    /**
+     * Called by the reader to add a new Readout to this detector.
+     * @param r The readout to add.
+     */
+    protected void addReadout(Readout r)
+    {
+        //System.out.println("geometry.compact.Detector.addReadout() - " + r.getName() );
+        readouts.put(r.getName(),r);
+    }
+    /**
+     * Get the readouts associated with this detector.
+     * @return A map of containing all of the readouts, indexed by name.
+     */
+    public Map<String, Readout> getReadouts()
+    {
+        return readouts;
+    }
+    
+    /**
+     * Convenience method to get readout by name.
+     **/
+    public Readout getReadout(String rn)
+    {
+        return readouts.get(rn);
+    }
+    
+    /**
+     * Called by the reader to add a sub-detector to this detector.
+     * @param sub The sub-detector to add.
+     */
+    protected void addSubdetector(Subdetector sub)
+    {
+        subdetectors.put(sub.getName(),sub);
+    }
+    
+    /*
+     * Convenience method to retrieve subdetector by name.
+     * @param subdetector with this name (null if doesn't exist)
+     */
+    public Subdetector getSubdetector(String name)
+    {
+        return subdetectors.get(name);
+    }
+
+    /**
+     * Convenience method to retrieve set of detector names.
+     * @return set of subdetector name strings
+     */
+    public Set<String> getSubdetectorNames()
+    {
+        return getSubdetectors().keySet();
+    }
+    
+    /**
+     * Get the sub-detectors associated with this detector.
+     * @return A map of containing all of the sub-detectors, indexed by name.
+     */
+    public Map<String,Subdetector> getSubdetectors()
+    {
+        return subdetectors;
+    }
+    
+    protected void addField(Field field)
+    {
+        fields.put(field.getName(),field);
+    }
+    
+    public Map<String,Field> getFields()
+    {
+        return fields;
+    }
+    
+    public XMLMaterialManager getMaterialManager()
+    {

         return materialMgr;

-   }

+    }

\ No newline at end of file

-{ - protected Element node; - LCDDSubdetector(Element c) throws JDOMException - { - super(c); - node = c; - } - abstract void addToLCDD(LCDD lcdd, SensitiveDetector sens) throws JDOMException; - public Element getElement() - {

+{ + protected Element node; + protected Layering layers; + + LCDDSubdetector(Element c) throws JDOMException + { + super(c); + node = c; + + /* make compact layering descr for thickness calcs in addToLCDD */ + if ( layers == null ) + { + layers = org.lcsim.geometry.layer.Layering.makeLayering(c); + } + } + + abstract void addToLCDD(LCDD lcdd, SensitiveDetector sens) throws JDOMException; + + public Element getElement() + {

- - public GeometryReaderTest(String testName) - { - super(testName); - } - - public static Test suite() - { - return new TestSuite(GeometryReaderTest.class); - } - - public void testRead() throws IOException, JDOMException, ElementCreationException - { - InputStream in = GeometryReaderTest.class.getResourceAsStream("/org/lcsim/geometry/compact/sdjan03_compact.xml"); - GeometryReader reader = new GeometryReader(); - Detector det = reader.read(in); - assertEquals(10,det.getSubdetectors().size()); - } -}

+ private static final String detName = "GeometryReaderTest"; + private static final String detLoc = detName + ".xml"; + + Detector detector; + int nDetectors = 10; + int nConstants = 10; + int nTrackerLayers = 5; + int nTrackerEndcapLayers = 10; + int nFields = 1; + int nEMLayers = 30; + int nHADLayers = 34; + + public GeometryReaderTest(String testName) + { + super(testName); + } + + public static Test suite() + { + return new TestSuite(GeometryReaderTest.class); + } + + protected void setUp() throws Exception + { + try + { + InputStream in = GeometryReaderTest.class.getResourceAsStream(detLoc); + GeometryReader reader = new GeometryReader(); + detector = reader.read(in); + } + catch (Exception e) + { + throw new RuntimeException("GeometryReaderTest.setUp() - GeometryReader failed.", e); + } + } + + public void testSizes() + { + assertEquals(nDetectors, detector.getSubdetectors().size() ); + assertEquals(nDetectors, detector.getReadouts().size() ); + assertEquals(nConstants, detector.getConstants().size() ); + assertEquals(nFields, detector.getFields().size() ); + } + + public void testAttributes() + { + assertEquals("GeometryReaderTest", detector.getName() ); + + org.lcsim.geometry.Subdetector subdetector = null; + for ( String sn : detector.getSubdetectorNames() ) + { + System.out.println("subdet: " + sn); + + subdetector = detector.getSubdetector(sn); + assert(sn != null); + + Layering layers = subdetector.getLayering(); + assert(layers != null); + + System.out.println("layer count: " + layers.getLayerCount() ); + + if ( sn.equals("BarrelVertex") || sn.equals("BarrelTracker") || + sn.equals("EndcapVertex") ) + { + assertEquals(layers.getLayerCount(), nTrackerLayers); + } + + if ( sn.equals("EndcapTracker") ) + { + assertEquals(layers.getLayerCount(), nTrackerEndcapLayers ); + } + + if ( sn.equals("EMBarrel") || sn.equals("EMEndcap") ) + { + assertEquals(layers.getLayerCount(), nEMLayers); + } + + if ( sn.equals("HADBarrel") || sn.equals("HADEndcap") ) + { + assertEquals(layers.getLayerCount(), nHADLayers); + } + } + } +}

Commit in `GeomConverter` on MAIN
`src/org/lcsim/geometry/compact/Detector.java`	+135	-109	1.10 -> 1.11
`src/org/lcsim/geometry/compact/converter/lcdd/CylindricalEndcapCalorimeter.java`	+2	-1	1.10 -> 1.11
`/ForwardDetector.java`	+1	-1	1.6 -> 1.7
`/LCDDSubdetector.java`	+24	-14	1.5 -> 1.6
`src/org/lcsim/geometry/layer/LayerFromCompactCnv.java`	+8	-5	1.2 -> 1.3
`test/org/lcsim/geometry/GeometryReaderTest.java`	+85	-23	1.3 -> 1.4
	+255	-153