diff --git a/compact/definitions.xml b/compact/definitions.xml index 750a8ab3309436f4690929947c059bdca708dae9..c7321b9729a1c651422d86b0627449cf6cac8872 100644 --- a/compact/definitions.xml +++ b/compact/definitions.xml @@ -423,6 +423,7 @@ </comment> <constant name="RICHZMin" value="SolenoidYokeEndcap_zmin + 1 * cm"/> <constant name="RICHRMin" value="15 * cm"/> + <constant name="RICHRMax" value="60 * cm"/> <constant name="RICHDepth" value="1 * m"/> diff --git a/compact/display.xml b/compact/display.xml index b2ad9891af9b6c0d03f7b08abd2cd7becf420054..ae6af1bf18fd1819d37492fc0e8484eee122e111 100644 --- a/compact/display.xml +++ b/compact/display.xml @@ -53,11 +53,11 @@ <comment> Deprecated colors. </comment> - <vis name="GreenVis" alpha="0.2" r= "0.0" g="1.0" b="0.0" showDaughters="true" visible="true"/> + <vis name="GreenVis" alpha="1.0" r= "0.0" g="1.0" b="0.0" showDaughters="true" visible="true"/> <vis name="RedVis" alpha="0.2" r= "1.0" g="0.0" b="0.0" showDaughters="true" visible="true"/> <vis name="RPVis" alpha="0.99" r= "1.0" g="0.0" b="0.0" showDaughters="true" visible="true"/> <vis name="RPLayerVis" alpha="0.99" r= "0.0" g="0.7" b="0.3" showDaughters="true" visible="true" lineStyle="solid" drawingStyle="solid" /> - <vis name="BlueVis" alpha="0.2" r= "0.0" g="0.0" b="1.0" showDaughters="true" visible="true"/> + <vis name="BlueVis" alpha="1.0" r= "0.0" g="0.0" b="1.0" showDaughters="true" visible="true"/> <vis name="OrangeVis" alpha="1.0" r= "1.0" g="0.45" b="0.0" showDaughters="true" visible="true"/> <vis name="RedGreenVis" alpha="0.5" r= "1.0" g="1.0" b="0.0" showDaughters="true" visible="true"/> <vis name="BlueGreenVis" alpha="0.5" r= "0.0" g="1.0" b="1.0" showDaughters="true" visible="true"/> @@ -66,5 +66,5 @@ <vis name="RBG015" alpha="0.5" r= "0.0" g=".2" b="1.0" showDaughters="true" visible="true"/> <vis name="RBG510" alpha="0.5" r= "1.0" g=".2" b="0.0" showDaughters="true" visible="true"/> <vis name="RBG" alpha="0.5" r= "1.0" g="1.0" b="1.0" showDaughters="true" visible="true"/> - <vis name="GrayVis" alpha="0.5" r= "0.75" g="0.75" b="0.75" showDaughters="true" visible="true"/> + <vis name="GrayVis" alpha="1.0" r= "0.75" g="0.75" b="0.75" showDaughters="true" visible="true"/> </display> diff --git a/compact/forward_rich.xml b/compact/forward_rich.xml index e129e31442127c8c958719955f4c34f465785f95..d94e9e162592d826ae9e7f1f14216cf6f39fc94f 100644 --- a/compact/forward_rich.xml +++ b/compact/forward_rich.xml @@ -4,8 +4,8 @@ </define> <detectors> - <detector id="ForwardRICH_ID" name="ForwardRICH" type="ForwardRICH" readout="ForwardRICHHits" vis="BlueVis"> - <dimensions z0="RICHZMin" length="RICHDepth+20*cm" rmin="RICHRMin" rmax1="RICHRMin+40*cm" rmax2="RICHRMin+80*cm"/> + <detector id="ForwardRICH_ID" name="ForwardRICH" type="refdet_ForwardRICH" readout="ForwardRICHHits" vis="BlueVis"> + <dimensions z0="RICHZMin" length="RICHDepth+20*cm" rmin="RICHRMin" rmax1="RICHRMax*cm" rmax2="RICHRMin+80*cm"/> <radiator material="N2cherenkov" /> <mcppmt zdiff="15.0*cm" rmin="SolenoidYokeEndcapP_rmin - 10*cm" rmax="SolenoidYokeEndcapP_rmin + 80*cm" rtol="1.0*cm" vis="BlueVis" module_size="10*cm" module_gap="0.2*cm" thickness="1.0*cm" material="Quartz" />