Print

Print


Commit in GeomConverter/src/org/lcsim/geometry/compact/converter/html on MAIN
HtmlConverter.java+20-21.6 -> 1.7
minor additions to html converter

GeomConverter/src/org/lcsim/geometry/compact/converter/html
HtmlConverter.java 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- HtmlConverter.java	12 Jan 2011 20:36:39 -0000	1.6
+++ HtmlConverter.java	9 Feb 2011 01:09:55 -0000	1.7
@@ -8,6 +8,8 @@
 import java.util.Map;
 
 import org.jdom.Element;
+import org.lcsim.detector.IDetectorElement;
+import org.lcsim.detector.tracker.silicon.SiSensor;
 import org.lcsim.geometry.Calorimeter;
 import org.lcsim.geometry.compact.Constant;
 import org.lcsim.geometry.compact.Detector;
@@ -22,16 +24,22 @@
 import org.lcsim.geometry.layer.LayerStack;
 import org.lcsim.geometry.subdetector.AbstractLayeredSubdetector;
 import org.lcsim.geometry.subdetector.PolyconeSupport;
+import org.lcsim.geometry.subdetector.SiTrackerBarrel;
+import org.lcsim.geometry.subdetector.SiTrackerEndcap;
+import org.lcsim.geometry.subdetector.SiTrackerEndcap2;
 import org.lcsim.geometry.subdetector.TubeSegment;
 
 /**
  * Convert a compact description to an html information page.
  * 
  * @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: HtmlConverter.java,v 1.6 2011/01/12 20:36:39 jeremy Exp $
+ * @version $Id: HtmlConverter.java,v 1.7 2011/02/09 01:09:55 jeremy Exp $
  */
 // TODO add css
-public class HtmlConverter
+// TODO add converter for MultiLayerTracker to layer table
+// TODO add Subdetectors by type lookup table
+// TODO order of Subdetector details needs to make more sense; similar things together (readout, geom, etc.)
+class HtmlConverter
 {
     static DecimalFormat layerForm = new DecimalFormat( "#.##" );
     static DecimalFormat lenForm = new DecimalFormat( "#.######" );
@@ -508,6 +516,16 @@
             
             addLabeledRow( tbl, "Z Planes", planesTbl );
         }
+        // TODO Need "default" setup to get detailed tracking parameters (strip pitches, etc.).
+        else if ( subdet instanceof SiTrackerBarrel || subdet instanceof SiTrackerEndcap || subdet instanceof SiTrackerEndcap2)
+        {            
+            IDetectorElement de = subdet.getDetectorElement();
+
+            List<SiSensor> sensors = de.findDescendants( SiSensor.class );            
+            int nsensors = sensors.size();      
+                                   
+            addLabeledRow( tbl, "Sensors", Integer.toString( nsensors ) );
+        }
     }
 
     private static void defines( Element parent, Detector detector )
CVSspam 0.2.8