 |
 |
| Commit in GeomConverter on MAIN | |||
| src/org/lcsim/geometry/compact/CompactReader.java | +154 | -170 | 1.47 -> 1.48 |
| resources/org/lcsim/schemas/compact/1.0/compact.xsd | +2 | -1 | 1.7 -> 1.8 |
| +156 | -171 | ||
add file attribute to gdmlFile element to reference local files
diff -u -r1.47 -r1.48 --- CompactReader.java 12 Mar 2011 00:37:28 -0000 1.47 +++ CompactReader.java 11 Dec 2012 21:59:45 -0000 1.48 @@ -1,7 +1,9 @@
package org.lcsim.geometry.compact;
+import java.io.File;
import java.io.IOException; import java.io.InputStream;
+import java.net.MalformedURLException;
import java.net.URL; import java.util.HashMap; import java.util.Iterator;
@@ -17,240 +19,219 @@
import org.lcsim.units.clhep.Constants; import org.lcsim.util.xml.ClasspathEntityResolver; import org.lcsim.util.xml.ElementFactory;
-import org.lcsim.util.xml.JDOMExpressionFactory;
import org.lcsim.util.xml.ElementFactory.ElementCreationException;
+import org.lcsim.util.xml.JDOMExpressionFactory;
/** * A tool for reading xml files containing compact detector descriptions.
- * - * This class does not create subclass objects. For example, CylindricalBarrelCalorimeter - * is inserted into Detector as a generic Subdetector. To get subclasses, use the - * org.lcsim.geometry.GeometryReader class, which extends this. - *
+ * + * This class does not create subclass objects. For example, CylindricalBarrelCalorimeter is inserted into + * Detector as a generic Subdetector. To get subclasses, use the org.lcsim.geometry.GeometryReader class, + * which extends this. + *
* @author tonyj
- * @version $Id: CompactReader.java,v 1.47 2011/03/12 00:37:28 jeremy Exp $ - *
+ * @version $Id: CompactReader.java,v 1.48 2012/12/11 21:59:45 jeremy Exp $ + *
*/
-public class CompactReader
-{
+public class CompactReader {
private ElementFactory factory;
private JDOMExpressionFactory expr;
private Document doc;
private XMLMaterialManager xmat;
-
+
/**
* Create a CompactReader using a DefaultElementFactory.
*/
- public CompactReader()
- {
+ public CompactReader() {
this(new CompactElementFactory());
}
+
/**
* Create a CompactReader using the specified ElementFactory.
+ *
* @param factory The ElementFactory to be used for creating elements as the file is parsed.
*/
- public CompactReader(ElementFactory factory)
- {
+ public CompactReader(ElementFactory factory) {
this.factory = factory;
}
-
+
/**
* Read a compact geometry XML file.
+ *
* @param in The input stream to read.
* @throws java.io.IOException If an IO error occurs while reading the stream.
* @throws org.jdom.JDOMException If invalid XML is found while reading the file.
- * @throws org.lcsim.geometry.compact.ElementFactory.ElementCreationException If the ElementFactory throws an ElementCreationException.
+ * @throws org.lcsim.geometry.compact.ElementFactory.ElementCreationException If the ElementFactory throws + * an ElementCreationException.
* @return The parsed detector description.
*/
- public Detector read(InputStream in) throws IOException, JDOMException, ElementCreationException
- {
+ public Detector read(InputStream in) throws IOException, JDOMException, ElementCreationException {
expr = new JDOMExpressionFactory();
-
+
// Setup CLHEP units in the expression evaluator.
registerCLHEPConstants(expr);
-
+
SAXBuilder builder = new SAXBuilder();
- builder.setFactory(expr); -
+ builder.setFactory(expr); +
// Enable schema validation
builder.setValidation(true);
builder.setFeature("http://apache.org/xml/features/validation/schema", true);
-
+
// Use a classpath entity resolver to get the schemas from the jar file.
builder.setEntityResolver(new ClasspathEntityResolver());
-
+
doc = builder.build(in);
-
+
Element lccdd = doc.getRootElement();
- Detector det = factory.createElement(Detector.class,lccdd,null); -
+ Detector det = factory.createElement(Detector.class, lccdd, null); +
readHeader(lccdd, det);
readConstants(lccdd, det);
readRegions(lccdd, det);
readLimits(lccdd, det);
readMaterials(lccdd, det);
- Map<String,Readout> readoutMap = readReadouts(lccdd, det);
+ Map<String, Readout> readoutMap = readReadouts(lccdd, det);
readVisAttributes(lccdd, det);
- readSubdetectors(lccdd, det, readoutMap);
+ readSubdetectors(lccdd, det, readoutMap);
readFields(lccdd, det);
readIncludes(lccdd, det);
-
+
return det;
}
-
- private void readConstants(Element lccdd, Detector det) throws JDOMException, ElementCreationException
- {
- Element define = lccdd.getChild("define");
- for (Iterator i = define.getChildren("constant").iterator(); i.hasNext(); )
- {
+
+ private void readConstants(Element lccdd, Detector det) throws JDOMException, ElementCreationException {
+ Element define = lccdd.getChild("define");
+ for (Iterator i = define.getChildren("constant").iterator(); i.hasNext();) {
Element constant = (Element) i.next();
- Constant c = factory.createElement(Constant.class,constant,null); - expr.addConstant(c.getName(),c.getValue());
+ Constant c = factory.createElement(Constant.class, constant, null); + expr.addConstant(c.getName(), c.getValue());
det.addConstant(c);
}
}
-
- private void readHeader(Element lccdd, Detector det) throws JDOMException, ElementCreationException
- {
+
+ private void readHeader(Element lccdd, Detector det) throws JDOMException, ElementCreationException {
Element info = lccdd.getChild("info");
- det.setHeader(factory.createElement(Header.class,info,null));
+ det.setHeader(factory.createElement(Header.class, info, null));
}
-
- private void readRegions(Element lccdd, Detector det) throws JDOMException, ElementCreationException
- {
+
+ private void readRegions(Element lccdd, Detector det) throws JDOMException, ElementCreationException {
Element regions = lccdd.getChild("regions");
- if ( regions != null )
- {
- for(Iterator i = regions.getChildren("region").iterator(); i.hasNext(); )
- {
+ if (regions != null) {
+ for (Iterator i = regions.getChildren("region").iterator(); i.hasNext();) {
Element region = (Element) i.next();
Region r = factory.createElement(Region.class, region, null);
det.addRegion(r);
}
}
}
- private void readLimits(Element lccdd, Detector det) throws JDOMException, ElementCreationException
- {
+
+ private void readLimits(Element lccdd, Detector det) throws JDOMException, ElementCreationException {
Element limits = lccdd.getChild("limits");
- if ( limits != null )
- {
- for ( Iterator i = limits.getChildren("limitset").iterator(); i.hasNext(); )
- {
+ if (limits != null) {
+ for (Iterator i = limits.getChildren("limitset").iterator(); i.hasNext();) {
Element limitset = (Element) i.next();
LimitSet ls = factory.createElement(LimitSet.class, limitset, null);
det.addLimitSet(ls);
}
}
}
- private Map<String,Readout> readReadouts(Element lccdd, Detector det) throws JDOMException, ElementCreationException
- {
- Map<String,Readout> readoutMap = new HashMap<String,Readout>();
+
+ private Map<String, Readout> readReadouts(Element lccdd, Detector det) throws JDOMException, ElementCreationException {
+ Map<String, Readout> readoutMap = new HashMap<String, Readout>();
Element readouts = lccdd.getChild("readouts");
- for (Iterator i = readouts.getChildren("readout").iterator(); i.hasNext();)
- {
+ for (Iterator i = readouts.getChildren("readout").iterator(); i.hasNext();) {
Element readout = (Element) i.next();
-
+
Readout r = null;
try {
r = createReadout(readout);
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
throw new RuntimeException(e);
}
- - readoutMap.put(r.getName(),r);
+ + readoutMap.put(r.getName(), r);
det.addReadout(r);
}
return readoutMap;
}
-
- private Readout createReadout(Element readoutElement) throws Exception
- {
- Readout readout = factory.createElement(Readout.class,readoutElement,null);
+
+ private Readout createReadout(Element readoutElement) throws Exception {
+ Readout readout = factory.createElement(Readout.class, readoutElement, null);
Element segmentation = readoutElement.getChild("segmentation");
-
- // Setup an IDDecoder with segmentation for a calorimeter.
- if (segmentation != null)
- {
+
+ // Setup an IDDecoder with segmentation for a calorimeter.
+ if (segmentation != null) {
String type = segmentation.getAttributeValue("type");
Segmentation seg = factory.createElement(Segmentation.class, segmentation, type);
readout.setSegmentation(seg);
}
// Use a generic IDDecoder.
- else
- {
- readout.setIDDecoder( new BaseIDDecoder() );
+ else {
+ readout.setIDDecoder(new BaseIDDecoder());
}
-
+
return readout;
}
-
- private void readSubdetectors(Element lccdd, Detector det, Map<String,Readout> readoutMap) throws JDOMException, ElementCreationException
- {
+
+ private void readSubdetectors(Element lccdd, Detector det, Map<String, Readout> readoutMap) throws JDOMException, ElementCreationException {
Element detectors = lccdd.getChild("detectors");
- for (Iterator i = detectors.getChildren("detector").iterator(); i.hasNext(); )
- {
+ for (Iterator i = detectors.getChildren("detector").iterator(); i.hasNext();) {
Element detector = (Element) i.next();
String type = detector.getAttributeValue("type");
- - Subdetector sub = factory.createElement(Subdetector.class,detector,type);
+ + Subdetector sub = factory.createElement(Subdetector.class, detector, type);
String readout = detector.getAttributeValue("readout");
- if (readout != null)
- {
+ if (readout != null) {
Readout r = readoutMap.get(readout);
- if (r== null) throw new JDOMException("Unknown readout "+readout);
+ if (r == null)
+ throw new JDOMException("Unknown readout " + readout);
sub.setReadout(r);
- } -
+ } +
String visref = detector.getAttributeValue("vis");
- if (visref != null)
- {
- VisAttributes vis = det.getVisAttributes().get(visref);
- if (vis==null) throw new JDOMException("Unknown vis " + visref + " for subdetector " + sub.getName() + " in compact description.");
- sub.setVisAttributes(vis);
+ if (visref != null) {
+ VisAttributes vis = det.getVisAttributes().get(visref);
+ if (vis == null)
+ throw new JDOMException("Unknown vis " + visref + " for subdetector " + sub.getName() + " in compact description.");
+ sub.setVisAttributes(vis);
}
-
+
det.addSubdetector(sub);
}
}
-
- private void readFields(Element lccdd, Detector det) throws JDOMException, ElementCreationException
- {
+
+ private void readFields(Element lccdd, Detector det) throws JDOMException, ElementCreationException {
Element fields = lccdd.getChild("fields");
- if (fields != null)
- {
- for (Iterator i = fields.getChildren("field").iterator(); i.hasNext(); )
- {
+ if (fields != null) {
+ for (Iterator i = fields.getChildren("field").iterator(); i.hasNext();) {
Element f = (Element) i.next();
String type = f.getAttributeValue("type");
- - Field field = factory.createElement(Field.class,f,type);
+ + Field field = factory.createElement(Field.class, f, type);
det.addField(field);
}
}
- }
-
- private void readMaterials(org.jdom.Element compact, Detector det)
- {
- // Setup XMLMatMgr's default data. This needs to be called before
+ }
+
+ private void readMaterials(org.jdom.Element compact, Detector det) {
+ // Setup XMLMatMgr's default data. This needs to be called before
// the compact materials are loaded in order to resolve references.
XMLMaterialManager.setup();
-
+
// Create XMLMatMgr for this detector's materials.
- if (compact.getChild("materials") != null)
- {
+ if (compact.getChild("materials") != null) {
xmat = new XMLMaterialManager(compact.getChild("materials"));
-
+
// FIXME Need to call this here???
- //matmgr.addReferencesFromCompact(lccdd);
+ // matmgr.addReferencesFromCompact(lccdd);
}
- - // Set the detector's XMLMaterialManager, so it is accessible to
+ + // Set the detector's XMLMaterialManager, so it is accessible to
// clients such as the LCDD converter.
det.setXMLMaterialManager(xmat);
- } -
+ } +
/**
* Create the VisAttributes objects from vis elements in the display block.
*
@@ -259,76 +240,79 @@
* @throws JDOMException
* @throws ElementCreationException
*/
- private void readVisAttributes(Element lccdd, Detector det) throws JDOMException, ElementCreationException
- {
-
+ private void readVisAttributes(Element lccdd, Detector det) throws JDOMException, ElementCreationException {
+
Element display = lccdd.getChild("display");
- if ( display != null )
- {
- for ( Iterator i = display.getChildren("vis").iterator(); i.hasNext(); )
- {
+ if (display != null) {
+ for (Iterator i = display.getChildren("vis").iterator(); i.hasNext();) {
Element vis = (Element) i.next();
- assert(vis != null);
+ assert (vis != null);
VisAttributes v = factory.createElement(VisAttributes.class, vis, null);
det.addVisAttributes(v);
- } -
+ } +
// Add an invisible vis settings that shows daughters.
VisAttributes invisible = new VisAttributes("InvisibleWithDaughters");
invisible.setVisible(false);
invisible.setShowDaughters(true);
det.addVisAttributes(invisible);
-
+
// Add an invisible vis settings that shows daughters.
VisAttributes invisibleNoDau = new VisAttributes("InvisibleNoDaughters");
invisibleNoDau.setVisible(false);
invisibleNoDau.setShowDaughters(false);
- det.addVisAttributes(invisibleNoDau); - }
+ det.addVisAttributes(invisibleNoDau); + }
}
-
+
// TODO: Should be protected or private but need to fix some external code first.
- public static void registerCLHEPConstants(JDOMExpressionFactory f)
- {
- Constants constants = Constants.getInstance();
- for (Entry<String,Double> unit : constants.entrySet())
- {
- //System.out.println("adding constant " + unit.getKey() + "=" +unit.getValue());
- f.addConstant(unit.getKey(),unit.getValue());
- }
- }
-
- protected void resetDocument()
- {
- doc = null;
- }
-
- public Document getDocument()
- {
+ public static void registerCLHEPConstants(JDOMExpressionFactory f) {
+ Constants constants = Constants.getInstance();
+ for (Entry<String, Double> unit : constants.entrySet()) {
+ // System.out.println("adding constant " + unit.getKey() + "=" +unit.getValue());
+ f.addConstant(unit.getKey(), unit.getValue());
+ }
+ }
+
+ protected void resetDocument() {
+ doc = null;
+ }
+
+ public Document getDocument() {
return doc;
}
-
- void readIncludes(Element lccdd, Detector det)
- {
+
+ void readIncludes(Element lccdd, Detector det) {
Element includes = lccdd.getChild("includes");
-
+
if (includes == null)
return;
-
- for (Object o : includes.getChildren("gdmlFile"))
- {
- Element gdmlFile = (Element)o;
- String ref = gdmlFile.getAttributeValue("ref");
-
- //System.out.println("merging in " + ref);
-
- try {
- det.addGDMLReference(new URL(ref));
- }
- catch (Exception x)
- {
- throw new RuntimeException(x);
+
+ for (Object o : includes.getChildren("gdmlFile")) {
+ Element gdmlFile = (Element) o;
+
+ if (gdmlFile.getAttribute("ref") != null) {
+
+ String ref = gdmlFile.getAttributeValue("ref");
+
+ // System.out.println("merging in " + ref);
+
+ try {
+ det.addGDMLReference(new URL(ref));
+ } catch (Exception x) {
+ throw new RuntimeException(x);
+ }
+ } else if (gdmlFile.getAttribute("file") != null) {
+ File file = new File(gdmlFile.getAttributeValue("file"));
+ try {
+ URL url = new URL(file.toURI().toURL().toString());
+ det.addGDMLReference(url);
+ } catch (MalformedURLException e) {
+ throw new RuntimeException(e);
+ }
+ } else {
+ throw new RuntimeException("Missing ref or file attribute on gdmlFile element.");
}
}
- }
+ }
}
diff -u -r1.7 -r1.8 --- compact.xsd 8 Dec 2010 23:07:23 -0000 1.7 +++ compact.xsd 11 Dec 2012 21:59:45 -0000 1.8 @@ -267,7 +267,8 @@
<xs:sequence>
<xs:element name="gdmlFile" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
- <xs:attribute name="ref" type="xs:anyURI" use="required"/>
+ <xs:attribute name="ref" type="xs:anyURI" use="optional" />
+ <xs:attribute name="file" type="xs:string" use="optional" />
</xs:complexType>
</xs:element>
</xs:sequence>
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1