Author: [log in to unmask]
Date: Tue Oct  6 11:36:57 2015
New Revision: 3667

Log:
Delete classes that were moved to HPS.

Removed:
    projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/EcalCrystal.java
    projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSEcal2Converter.java
    projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSEcal3Converter.java
    projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSEcalAPI.java
    projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSEcalConverter.java
    projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSEcalDetectorElement.java
    projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSMuonCalorimeterConverter.java
    projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSTracker2Converter.java
    projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSTrackerConverter.java
    projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/subdetector/HpsTracker2.java
    projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/subdetector/SvtStereoLayer.java
    projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/tracker/silicon/HpsTestRunSiSensor.java
    projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSEcal.java
    projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSEcal2.java
    projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSEcal3.java
    projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSMuonCalorimeter.java
    projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSMuonCalorimeter2.java
    projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSTracker.java
    projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSTracker2.java
    projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/subdetector/HPSEcal.java
    projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/subdetector/HPSEcal2.java
    projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/subdetector/HPSEcal3.java
    projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/subdetector/HPSMuonCalorimeter.java
    projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/subdetector/HPSTracker.java
    projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/subdetector/HPSTracker2.java
    projects/lcsim/trunk/detector-framework/src/test/java/org/lcsim/detector/converter/compact/HPSEcalAPITest.java
    projects/lcsim/trunk/detector-framework/src/test/java/org/lcsim/detector/converter/compact/HPSMuonCalorimeterTest.java
    projects/lcsim/trunk/detector-framework/src/test/java/org/lcsim/detector/converter/compact/HPSTracker2ConverterTest.java
    projects/lcsim/trunk/detector-framework/src/test/java/org/lcsim/detector/converter/compact/HpsTestRunSiSensorConverterTest.java
    projects/lcsim/trunk/detector-framework/src/test/java/org/lcsim/geometry/subdetector/HPSEcal3Test.java
    projects/lcsim/trunk/detector-framework/src/test/resources/org/lcsim/geometry/subdetector/HPSEcal3Test.xml
    projects/lcsim/trunk/detector-framework/src/test/resources/org/lcsim/geometry/subdetector/HPSEcalTest.xml
    projects/lcsim/trunk/detector-framework/src/test/resources/org/lcsim/geometry/subdetector/HPSMuonCalorimeter2Test.xml
    projects/lcsim/trunk/detector-framework/src/test/resources/org/lcsim/geometry/subdetector/HPSMuonCalorimeterTest.xml
    projects/lcsim/trunk/detector-framework/src/test/resources/org/lcsim/geometry/subdetector/HPSTest.xml
    projects/lcsim/trunk/detector-framework/src/test/resources/org/lcsim/geometry/subdetector/HPSTracker2Test.xml
    projects/lcsim/trunk/detector-framework/src/test/resources/org/lcsim/geometry/subdetector/HpsTestRunSiSensorConverterTest.xml
Modified:
    projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/DetectorConverter.java
    projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/GeometryReader.java

Modified: projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/DetectorConverter.java
 =============================================================================
--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/DetectorConverter.java	(original)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/DetectorConverter.java	Tue Oct  6 11:36:57 2015
@@ -86,8 +86,10 @@
 
     public DetectorConverter() {
 
-        //System.out.println("DetectorConverter initializing ...");
-
+        System.out.println("DetectorConverter initializing ...");
+    }
+
+    public void registerSubdetectorConverters() {
         Reflections reflect = new Reflections("org.lcsim.detector.converter.compact");
         Set<Class<? extends AbstractSubdetectorConverter>> converters = reflect
                 .getSubTypesOf(AbstractSubdetectorConverter.class);

Modified: projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/GeometryReader.java
 =============================================================================
--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/GeometryReader.java	(original)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/GeometryReader.java	Tue Oct  6 11:36:57 2015
@@ -14,44 +14,39 @@
 import org.lcsim.detector.DetectorStore;
 
 /**
+ * The GeometryReader extends the CompactReader and creates specific types based on the type attribute of an XML
+ * element. The type string must match a class within the registered package for that base class. Currently supported
+ * base classes with specific types are Subdetector, Segmentation, and Field.
+ * <p>
+ * For example, this compact XML will instantiate a Subdetector with specific type of 'CylindricalBarrelCalorimeter'.<br/> 
+ * <pre>
+ * <detector type="CylindricalBarrelCalorimeter" ... /> Support added for detailed geometry representation.
+ * </pre>
  * 
- * The GeometryReader extends the CompactReader and creates specific types based on the
- * type attribute of an XML element. The type string must match a class within the
- * registered package for that base class. Currently supported base classes with specific
- * types are Subdetector, Segmentation, and Field.
- * 
- * For example, this compact XML will instantiate a Subdetector with specific type of
- * 'CylindricalBarrelCalorimeter'.
- * 
- * <detector type="CylindricalBarrelCalorimeter" ... />
- * 
- * Support added for detailed geometry representation. --JM, 15 March 2007
- * 
- * @author Tony Johnson
- * @author Jeremy McCormick
+ * @author Tony Johnson, SLAC
+ * @author Jeremy McCormick, SLAC
  */
-public class GeometryReader extends CompactReader
-{
+public class GeometryReader extends CompactReader {
+
     boolean buildDetailed = true;
 
-    public GeometryReader()
-    {
-        super( new GeometryFactory() );
+    public GeometryReader() {
+        super(new GeometryFactory());
     }
 
-    public Detector read( InputStream in ) throws IOException, JDOMException, ElementCreationException
-    {
+    public Detector read(InputStream in) throws IOException, JDOMException, ElementCreationException {
+        
         // Build a compact description with support for specific types.
-        Detector detector = ( Detector ) super.read( in );
+        Detector detector = (Detector) super.read(in);
 
         // Clear existing detector store.
         DetectorStore.getInstance().clear();
 
         // Build the detailed detector description.
-        if ( buildDetailed )
-        {
+        if (buildDetailed) {
             DetectorConverter cnv = new DetectorConverter();
-            cnv.convert( detector, getDocument() );
+            cnv.registerSubdetectorConverters();
+            cnv.convert(detector, getDocument());
         }
 
         // Clear the cached document.
@@ -60,25 +55,21 @@
         return detector;
     }
 
-    public boolean buildDetailed()
-    {
+    public boolean buildDetailed() {
         return buildDetailed;
     }
 
-    public void setBuildDetailed( boolean buildDetailed )
-    {
+    public void setBuildDetailed(boolean buildDetailed) {
         this.buildDetailed = buildDetailed;
     }
 
-    static class GeometryFactory extends CompactElementFactory
-    {
-        GeometryFactory()
-        {
+    static class GeometryFactory extends CompactElementFactory {
+        GeometryFactory() {
             super();
-            register( Detector.class );
-            register( Subdetector.class, "org.lcsim.geometry.subdetector" );
-            register( Segmentation.class, "org.lcsim.geometry.segmentation" );
-            register( Field.class, "org.lcsim.geometry.field" );
+            register(Detector.class);
+            register(Subdetector.class, "org.lcsim.geometry.subdetector");
+            register(Segmentation.class, "org.lcsim.geometry.segmentation");
+            register(Field.class, "org.lcsim.geometry.field");
         }
     }
 }

########################################################################
Use REPLY-ALL to reply to list

To unsubscribe from the LCDET-SVN list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCDET-SVN&A=1