uncomment rich in xml

src/ForwardRICH_geo.cpp

@@ -155,11 +155,12 @@ static Ref_t createDetector(Detector& desc, xml::Handle_t handle, SensitiveDetec
         if (mRmax > rmax) { rmax = mRmax; }
     }
     rmin = std::max(0., rmin - 0.1*cm);
+    rmax = 2.*halfLength/mirZ*rmax;
     Cone env1(halfLength, rmin, tRmax1 + 0.1*cm , rmin, rmax + 0.1*cm);
     // disk for detection plane
-    Tube env2(std::max(0., pRmin - 0.1*cm), pRmax + 0.1*cm, pThick + 0.1*cm, 0., 2.*M_PI);
+    Tube env2(std::max(0., pRmin - 0.1*cm), pRmax + pTol + pGap + 0.1*cm, pThick + 0.1*cm, 0., 2.*M_PI);
 
-    UnionSolid envShape(env1, env2, Position(0., 0., pZ + pThick/2.));
+    UnionSolid envShape(env1, env2, Position(0., 0., -halfLength + pZ + pThick/2.));
 
     Volume envVol(detName + "_envelope", envShape, desc.material("AirOptical"));
     // envVol.setVisAttributes(desc.visAttributes(detElem.visStr()));

topside.xml

@@ -113,9 +113,7 @@
   <include ref="topside/ecal.xml"/>
   <include ref="topside/hcal.xml"/>
   <include ref="topside/solenoid.xml"/>
-  <!--
   <include ref="topside/topside_rich.xml"/>
-  -->
   <include ref="topside/roman_pots.xml"/>
   <include ref="eic/forward_ion_beamline.xml"/>
   <!--

topside/topside_rich.xml

@@ -11,12 +11,12 @@
       <tank zdiff="5.0*cm" length="RICHDepth" gas="N2cherenkov" vis="GreenVis"
             rmin="RICHRMin" rmax1="RICHRMin+40*cm" rmax2="RICHRMin+80*cm" />
       <mirror zdiff="RICHDepth+7.0*cm" thickness="1*mm" material="PyrexGlass" vis="GrayVis">
-        <slice focus="50*cm" curve="300*cm" rmin="RICHRMin" rmax="RICHRMin+80*cm" phiw="59*degree" rotz="0*degree" />
-        <slice focus="50*cm" curve="300*cm" rmin="RICHRMin" rmax="RICHRMin+80*cm" phiw="59*degree" rotz="60*degree" />
-        <slice focus="50*cm" curve="300*cm" rmin="RICHRMin" rmax="RICHRMin+80*cm" phiw="59*degree" rotz="120*degree" />
-        <slice focus="50*cm" curve="300*cm" rmin="RICHRMin" rmax="RICHRMin+80*cm" phiw="59*degree" rotz="180*degree" />
-        <slice focus="50*cm" curve="300*cm" rmin="RICHRMin" rmax="RICHRMin+80*cm" phiw="59*degree" rotz="240*degree" />
-        <slice focus="50*cm" curve="300*cm" rmin="RICHRMin" rmax="RICHRMin+80*cm" phiw="59*degree" rotz="300*degree" />
+        <slice focus="50*cm" curve="0" rmin="RICHRMin" rmax="RICHRMin+80*cm" phiw="59*degree" rotz="0*degree" />
+        <slice focus="50*cm" curve="0" rmin="RICHRMin" rmax="RICHRMin+80*cm" phiw="59*degree" rotz="60*degree" />
+        <slice focus="50*cm" curve="0" rmin="RICHRMin" rmax="RICHRMin+80*cm" phiw="59*degree" rotz="120*degree" />
+        <slice focus="50*cm" curve="0" rmin="RICHRMin" rmax="RICHRMin+80*cm" phiw="59*degree" rotz="180*degree" />
+        <slice focus="50*cm" curve="0" rmin="RICHRMin" rmax="RICHRMin+80*cm" phiw="59*degree" rotz="240*degree" />
+        <slice focus="50*cm" curve="0" rmin="RICHRMin" rmax="RICHRMin+80*cm" phiw="59*degree" rotz="300*degree" />
       </mirror>
     </detector>
   </detectors>