lcsim/src/org/lcsim/util/event
diff -u -r1.1 -r1.2
--- DetectorConditionsConverter.java 7 Mar 2005 07:48:03 -0000 1.1
+++ DetectorConditionsConverter.java 15 Mar 2007 02:15:54 -0000 1.2
@@ -1,13 +1,15 @@
package org.lcsim.util.event;
import java.io.InputStream;
-import org.lcsim.conditions.CachedConditions;
+
import org.lcsim.conditions.ConditionsConverter;
import org.lcsim.conditions.ConditionsManager;
import org.lcsim.conditions.RawConditions;
import org.lcsim.geometry.Detector;
import org.lcsim.geometry.GeometryReader;
+import org.lcsim.detector.converter.compact.DetectorConverter;
+
/**
*
@@ -22,7 +24,18 @@
{
InputStream in = conditions.getInputStream();
GeometryReader reader = new GeometryReader();
- return reader.read(in);
+ Detector detector = reader.read(in);
+
+ // Build the detailed geometry model.
+ // FIXME: Should be called from someplace else?
+ // --JM 14 March 2007
+ DetectorConverter cnv = new DetectorConverter();
+ cnv.convert(
+ detector,
+ manager.getRawConditions(name).getInputStream()
+ );
+
+ return detector;
}
catch (Exception x)
{
