GeomConverter/src/org/lcsim/detector/converter/heprep
diff -u -r1.12 -r1.13
--- DetectorElementToHepRepConverter.java 14 Nov 2007 19:34:51 -0000 1.12
+++ DetectorElementToHepRepConverter.java 9 Jan 2008 02:34:15 -0000 1.13
@@ -26,8 +26,14 @@
public class DetectorElementToHepRepConverter
{
- public static void convert(IDetectorElement detelem, HepRepFactory factory, HepRep heprep, boolean recurse)
+ public static void convert(IDetectorElement detelem, HepRepFactory factory, HepRep heprep, int currentDepth, int maxDepth)
{
+ //System.out.println("convert");
+ if (maxDepth != -1 && currentDepth > maxDepth)
+ return;
+
+ //System.out.println("converting " + detelem.getName());
+
HepRepInstanceTree instanceTree = heprep.getInstanceTreeTop("Detector","1.0");
HepRepTypeTree typeTree = heprep.getTypeTree("DetectorType","1.0");
@@ -91,7 +97,7 @@
{
for ( IDetectorElement child : detelem.getChildren() )
{
- DetectorElementToHepRepConverter.convert(child, factory, heprep, true);
+ DetectorElementToHepRepConverter.convert(child, factory, heprep, currentDepth + 1, maxDepth);
}
}
}
@@ -122,7 +128,7 @@
for (IDetectorElement de : DetectorElementStore.getInstance())
{
- DetectorElementToHepRepConverter.convert(de, factory, root, false);
+ DetectorElementToHepRepConverter.convert(de, factory, root, 0, -1);
}
// end detector
@@ -173,4 +179,4 @@
writer.write(root,"test");
writer.close();
}
-}
\ No newline at end of file
+}
GeomConverter/src/org/lcsim/geometry/subdetector
diff -u -r1.12 -r1.13
--- SiTrackerBarrel.java 11 May 2007 00:21:10 -0000 1.12
+++ SiTrackerBarrel.java 9 Jan 2008 02:34:15 -0000 1.13
@@ -19,7 +19,7 @@
* @see org.lcsim.detector.tracker.silicon
*
* @author Jeremy McCormick
- * @version $Id: SiTrackerBarrel.java,v 1.12 2007/05/11 00:21:10 jeremy Exp $
+ * @version $Id: SiTrackerBarrel.java,v 1.13 2008/01/09 02:34:15 jeremy Exp $
*/
public class SiTrackerBarrel extends AbstractTracker
{
@@ -30,12 +30,11 @@
public void appendHepRep(HepRepFactory factory, HepRep heprep)
{
- // Use the generic converter for DetectorElements.
- DetectorElementToHepRepConverter.convert(getDetectorElement(), factory, heprep, true);
+ DetectorElementToHepRepConverter.convert(getDetectorElement(), factory, heprep, 0, 1);
}
- public boolean isBarrel()
+ public boolean isBarrel()
{
return true;
}
-}
\ No newline at end of file
+}
GeomConverter/src/org/lcsim/geometry/subdetector
diff -u -r1.3 -r1.4
--- SiTrackerEndcap.java 1 Nov 2007 23:43:17 -0000 1.3
+++ SiTrackerEndcap.java 9 Jan 2008 02:34:16 -0000 1.4
@@ -5,6 +5,7 @@
import org.jdom.Element;
import org.jdom.JDOMException;
+import org.lcsim.detector.converter.heprep.DetectorElementToHepRepConverter;
public class SiTrackerEndcap extends AbstractTracker
{
@@ -20,6 +21,6 @@
public void appendHepRep(HepRepFactory factory, HepRep heprep)
{
- System.out.println("NOT IMPLEMENTED YET");
+ DetectorElementToHepRepConverter.convert(getDetectorElement(), factory, heprep, 0, 2);
}
-}
\ No newline at end of file
+}