GeomConverter/src/org/lcsim/detector/converter/compact
diff -u -r1.41 -r1.42
--- DetectorConverter.java 5 Feb 2009 21:43:23 -0000 1.41
+++ DetectorConverter.java 12 Mar 2009 23:43:10 -0000 1.42
@@ -274,7 +274,8 @@
return pvWorld;
}
- // Converts the subdetectors in a detector to a map of subsystems to system id.
+ // Converts the subdetectors in a detector to a map of subsystems to system id.
+ // TODO: Must be a better way to setup these associations in the DetectorIdentifierHelper.
public static final SystemMap makeSystemMap(Detector d)
{
SystemMap m = new SystemMap();
@@ -285,6 +286,7 @@
int sys = subdet.getSystemID();
+ // Based on naming conventions from sid01 and sid02.
if (!name.contains("Support") && !(subdet instanceof PolyconeSupport))
{
if (name.contains("VertexBarrel"))
@@ -335,7 +337,7 @@
{
m.put("muonEndcap", sys);
}
- else if (name.contains("LuminosityMonitor"))
+ else if (name.contains("LuminosityMonitor") || name.contains("LumiCal"))
{
m.put("lumi", sys);
}