modified: compact/hcal.xml

	modified:   reference_detector.xml

compact/hcal.xml

@@ -41,7 +41,7 @@
     <detector 
       id="HCalEndcapP_ID" 
       name="HcalEndcapP" 
-      type="topside_PolyhedraEndcapCalorimeter2" 
+      type="refdet_PolyhedraEndcapCalorimeter2" 
       readout="HcalEndcapHits" 
       vis="HcalEndcapVis" 
       calorimeterType="HAD_ENDCAP"
@@ -64,7 +64,7 @@
     <detector 
       id="HCalEndcapN_ID" 
       name="HcalEndcapN" 
-      type="topside_PolyhedraEndcapCalorimeter2" 
+      type="refdet_PolyhedraEndcapCalorimeter2" 
       readout="HcalEndcapHits" 
       vis="HcalEndcapVis" 
       calorimeterType="HAD_ENDCAP" reflect="true">

reference_detector.xml

@@ -109,9 +109,9 @@
   <include ref="compact/display.xml" />
   </display>
 
+  <include ref="ip6/beampipe.xml"/>
   <!--
   <include ref="reference_detector/vertex_tracker.xml"/>
-  <include ref="compact/beampipe.xml"/>
   <include ref="compact/silicon_tracker.xml"/>
   -->
   <include ref="compact/solenoid.xml"/>