Skip to content
Snippets Groups Projects
Commit 7404f5e4 authored by Sylvester Joosten's avatar Sylvester Joosten
Browse files

setup system to finetune geoviewer independently

parent fdfdd14d
Branches
Tags
1 merge request!191setup system to finetune geoviewer independently
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 1
− 0
View file @ 7404f5e4
...@@ -110,6 +110,7 @@ dump_geometry: ...@@ -110,6 +110,7 @@ dump_geometry:
- mkdir -p geo - mkdir -p geo
## subsystem views ## subsystem views
- | - |
mv ${DETECTOR_PATH}/compact/display_geoviewer.xml ${DETECTOR_PATH}/compact/display.xml
for xml in ${DETECTOR_PATH}/compact/subsystem_views/*.xml; do for xml in ${DETECTOR_PATH}/compact/subsystem_views/*.xml; do
geo_name=`basename $xml .xml`_geo.root geo_name=`basename $xml .xml`_geo.root
cp $xml ${DETECTOR_PATH}/geo.xml cp $xml ${DETECTOR_PATH}/geo.xml
......
compact/dirc.xml
+ 8
− 8
View file @ 7404f5e4
...@@ -21,12 +21,12 @@ ...@@ -21,12 +21,12 @@
</comment> </comment>
<define> <define>
<constant name="DIRC_rmin" value="BarrelTracking_rmax-11*cm"/> <constant name="DIRCFake_rmin" value="BarrelTracking_rmax-11*cm"/>
<constant name="DIRC_rotation" value="pi" comment="Allows DIRC flip"/> <constant name="DIRC_rotation" value="pi" comment="Allows DIRC flip"/>
<!-- <constant name="cb_DIRC_length" value="DIRCLength"/> --> <!-- <constant name="cb_DIRC_length" value="DIRCLength"/> -->
<!-- CLEANUP THIS if not sure. This is from the initial implementation <!-- CLEANUP THIS if not sure. This is from the initial implementation
<constant name="DIRC_length" value="285.500*cm"/> <constant name="DIRC_length" value="285.500*cm"/>
<constant name="DIRC_rmin" value="82.00*cm"/>--> <constant name="DIRCFake_rmin" value="82.00*cm"/>-->
<!-- Prism --> <!-- Prism -->
<constant name="DIRCPrism_width" value="360*mm"/> <constant name="DIRCPrism_width" value="360*mm"/>
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
<constant name="DIRCPrism_height" value="DIRCPrism_long_edge"/> <constant name="DIRCPrism_height" value="DIRCPrism_long_edge"/>
<!-- DIRC length --> <!-- DIRC length -->
<constant name="DIRC_length" value="DIRCFull_length - DIRCPrism_length"/> <constant name="DIRCMain_length" value="DIRC_length"/>
<constant name="DIRC_offset" value="(CentralTracking_length - DIRC_length)/2.0 - DIRCExtra_offset"/> <constant name="DIRCFake_offset" value="DIRC_offset-20*cm"/>
<!-- Box - main DIRC modules --> <!-- Box - main DIRC modules -->
<constant name="DIRCBox_count" value="16" comment="Number of DIRC boxes per... DIRC. 16 - default"/> <constant name="DIRCBox_count" value="16" comment="Number of DIRC boxes per... DIRC. 16 - default"/>
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
<!-- Bar - Each DIRC box consists of N "bars" --> <!-- Bar - Each DIRC box consists of N "bars" -->
<!-- BarAssembly - Bars + Glue --> <!-- BarAssembly - Bars + Glue -->
<constant name="DIRCBarAssm_length" value="DIRC_length - DIRCPrism_length - DIRCMirror_thickness - DIRCLens_thickness - DIRCFd_thickness" comment="Length of bars+glue assembly"/> <constant name="DIRCBarAssm_length" value="DIRCMain_length - DIRCPrism_length - DIRCMirror_thickness - DIRCLens_thickness - DIRCFd_thickness" comment="Length of bars+glue assembly"/>
<constant name="DIRCBar_count" value="11" comment="Number of bars per box"/> <constant name="DIRCBar_count" value="11" comment="Number of bars per box"/>
<constant name="DIRCBar_gap" value="0.15 * mm"/> <constant name="DIRCBar_gap" value="0.15 * mm"/>
<constant name="DIRCBar_height" value="17 * mm"/> <constant name="DIRCBar_height" value="17 * mm"/>
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
RMax is calculated according to "rectangle inside ring" problem solution RMax is calculated according to "rectangle inside ring" problem solution
https://math.stackexchange.com/questions/4222684/calculate-rectangle-inside-ring-parameters/4222691#4222691 https://math.stackexchange.com/questions/4222684/calculate-rectangle-inside-ring-parameters/4222691#4222691
</comment> </comment>
<constant name="DIRC_rmax" value="sqrt( (DIRC_rmin+DIRCPrism_height)^2 + 0.25*(DIRCPrism_height)^2 )"/> <constant name="DIRCFake_rmax" value="sqrt( (DIRCFake_rmin+DIRCPrism_height)^2 + 0.25*(DIRCPrism_height)^2 )"/>
</define> </define>
<materials> <materials>
...@@ -121,8 +121,8 @@ ...@@ -121,8 +121,8 @@
<detectors> <detectors>
<detector id="BarrelDIRC_ID" name="cb_DIRC" type="cb_DIRC" readout="DIRCBarHits" vis="DIRCTube"> <detector id="BarrelDIRC_ID" name="cb_DIRC" type="cb_DIRC" readout="DIRCBarHits" vis="DIRCTube">
<dimensions rmin="DIRC_rmin" rmax="DIRC_rmax" length="DIRC_length" radius="DIRCRadius" dx="DIRCBars_DX" dy="DIRCBars_DY" number="DIRCNum" deltaphi="DIRCDPhi"/> <dimensions rmin="DIRCFake_rmin" rmax="DIRCFake_rmax" length="DIRCMain_length" radius="DIRCRadius" dx="DIRCBars_DX" dy="DIRCBars_DY" number="DIRCNum" deltaphi="DIRCDPhi"/>
<position x="0" y="0" z="DIRC_offset"/> <position x="0" y="0" z="DIRCFake_offset"/>
<rotation theta="DIRC_rotation"/> <rotation theta="DIRC_rotation"/>
<module name="DircBox" R="DIRCRadius" repeat="DIRCBox_count" width="DIRCPrism_width + 1*mm" height="DIRCPrism_height*2" length="DIRCBarAssm_length + 550*mm" vis="DIRCBox"> <module name="DircBox" R="DIRCRadius" repeat="DIRCBox_count" width="DIRCPrism_width + 1*mm" height="DIRCPrism_height*2" length="DIRCBarAssm_length + 550*mm" vis="DIRCBox">
<!-- Mirror (at the end of the module) --> <!-- Mirror (at the end of the module) -->
......
compact/display.xml
+ 5
− 0
View file @ 7404f5e4
...@@ -94,6 +94,11 @@ ...@@ -94,6 +94,11 @@
<vis name="DRICH_mirror_vis" alpha="1.0" r="0.5" g="0.5" b="0.5" showDaughters="true" visible="true" /> <vis name="DRICH_mirror_vis" alpha="1.0" r="0.5" g="0.5" b="0.5" showDaughters="true" visible="true" />
<vis name="DRICH_sensor_vis" alpha="1.0" r="0.0" g="1.0" b="0.0" showDaughters="true" visible="true" /> <vis name="DRICH_sensor_vis" alpha="1.0" r="0.0" g="1.0" b="0.0" showDaughters="true" visible="true" />
<vis name="MRICH_aerogel_vis" alpha="1.0" r="0.0" g="1.0" b="1.0" showDaughters="true" visible="true" />
<vis name="MRICH_frame_vis" ref="AnlGold" showDaughters="true" visible="true" />
<vis name="MRICH_lens_vis" ref="AnlViolet" showDaughters="true" visible="true" />
<vis name="MRICH_mirror_vis" ref="AnlGray" showDaughters="true" visible="true" />
</display> </display>
<comment> <comment>
......
compact/display_geoviewer.xml 0 → 100644
+ 123
− 0
View file @ 7404f5e4
<display>
<comment>
See compact/colors.xml for list of colors.
</comment>
<vis name="InvisibleNoDaughters" showDaughters="false" visible="false"/>
<vis name="InvisibleWithDaughters" showDaughters="true" visible="false"/>
<comment>
Tracking Visualizations
</comment>
<vis name="TrackerVis" ref="AnlRed" />
<vis name="TrackerSupportVis" ref="AnlBlue" visible="true" showDaughters="true" />
<vis name="TrackerLayerVis" ref="AnlTeal" visible="true" showDaughters="true" />
<vis name="TrackerSubassemblyVis" ref="TrackerLayerVis"/>
<vis name="TrackerModuleVis" ref="TrackerLayerVis" visible="true" showDaughters="true" />
<vis name="VertexSupportVis" ref="AnlBlue" visible="true" showDaughters="true" />
<vis name="VertexLayerVis" ref="AnlTeal" visible="true" showDaughters="true" />
<vis name="VertexModuleVis" ref="TrackerLayerVis" visible="true" showDaughters="true" />
<vis name="TOFVis" ref="AnlGreen" showDaughters="true" visible="true"/>
<comment>
ECal Vis
</comment>
<vis name="EcalVis" ref="AnlGold" showDaughters="true" visible="true"/>
<vis name="EcalEndcapVis" ref="AnlGold" showDaughters="true" visible="true"/>
<vis name="EcalBarrelVis" ref="AnlGold" showDaughters="true" visible="true"/>
<vis name="EcalBarrelStaveVis" ref="AnlViolet" showDaughters="true" visible="true" />
<vis name="EcalBarrelEnvelopeVis" ref="AnlViolet" showDaughters="true" visible="true" />
<vis name="EcalBarrelSupportVis" ref="AnlOrange" showDaughters="true" visible="true"/>
<vis name="EcalBarrelLayerVis" ref="AnlBlue" showDaughters="true" visible="true"/>
<vis name="EcalBarrelSliceVis" ref="AnlBlue" showDaughters="false" visible="true"/>
<vis name="EcalBarrelFiberLayerVis" ref="AnlGold" showDaughters="false" visible="true" />
<vis name="EcalEndcapNModuleVis" ref="AnlTeal" showDaughters="false" visible="true"/>
<comment>
HCal Vis
</comment>
<vis name="HcalVis" ref="AnlViolet" showDaughters="true" visible="true"/>
<vis name="HcalBarrelVis" ref="AnlViolet" showDaughters="true" visible="true"/>
<vis name="HcalBarrelStaveVis" ref="AnlViolet" showDaughters="false" visible="true"/>
<vis name="HcalBarrelLayerVis" ref="AnlViolet" showDaughters="true" visible="true"/>
<vis name="HcalEndcapVis" ref="AnlViolet" showDaughters="false" visible="true"/>
<vis name="HcalEndcapLayerVis" ref="AnlViolet" showDaughters="true" visible="true"/>
<vis name="HcalSensorVis" ref="AnlRed" showDaughters="true" visible="true"/>
<vis name="HcalAbsorberVis" ref="AnlViolet" showDaughters="true" visible="true"/>
<comment>
Solenoid
</comment>
<vis name="SolenoidCoilVis" ref="AnlLight_Gray" showDaughters="true" visible="true" lineStyle="solid" drawingStyle="solid" />
<vis name="SolenoidCryostatVis" ref="AnlGray" showDaughters="true" visible="true" lineStyle="solid" drawingStyle="solid" />
<vis name="SolenoidYokeVis" ref="AnlLight_Gray" showDaughters="false" visible="true" lineStyle="solid" drawingStyle="solid" />
<comment>
PID Detectors
</comment>
<vis name="RICHVis" ref="AnlViolet" showDaughters="true"/>
<vis name="DIRCVis" ref="AnlTeal" showDaughters="true" visible="true"/>
<vis name="DIRCLayerVis" ref="AnlTeal" showDaughters="false" visible="true"/>
<vis name="DIRCModuleVis" ref="AnlBlue" showDaughters="true" visible="true"/>
<vis name="DIRCSupportVis" ref="VertexSupportVis" showDaughters="true" visible="true"/>
<vis name="DIRCFrameVis" ref="AnlOrange" showDaughters="true" visible="true"/>
<vis name="DIRCBarVis" ref="AnlTeal" showDaughters="true" visible="true"/>
<comment>
Beam line
</comment>
<vis name="BeamPipeVis" ref="AnlLight_Gray" showDaughters="true" visible="true"/>
<vis name="cb_SolenoidVis" alpha="0.4" r= "0.1" g="0.0" b="0.1" showDaughters="true" visible="true"/>
<vis name="ffi_ZDC_ECAL_Vis" alpha="0.1" r= "0.1" g="0.0" b="1.0" showDaughters="true" visible="true"/>
<vis name="ffi_ZDC_ECAL_module_Vis" alpha="1.0" r= "0.1" g="1.0" b="0.9" showDaughters="true" visible="true"/>
<vis name="ffi_ZDC_HCAL_Vis" alpha="0.1" r= "0.1" g="0.0" b="1.0" showDaughters="true" visible="true"/>
<vis name="cb_CTDVis" alpha="0.1" r= "0.1" g="0.0" b="1.0" showDaughters="true" visible="true"/>
<vis name="cb_CTD_Si_layerVis" alpha="1.0" r= "0.9" g="1.0" b="0.1" showDaughters="true" visible="true"/>
<vis name="ce_GEMVis" alpha="0.1" r= "0.1" g="0.0" b="1.0" showDaughters="true" visible="true"/>
<vis name="cb_GEM_layerVis" alpha="0.8" r= "0.8" g="0.4" b="0.3" showDaughters="true" visible="true"/>
<vis name="cb_VTX_BarrelVis" alpha="0.1" r= "0.1" g="0.0" b="1.0" showDaughters="true" visible="true"/>
<vis name="cb_VTX_Barrel_layerVis" alpha="2.0" r= "0.0" g="0.2" b="0.8" showDaughters="true" visible="true"/>
<vis name="ci_GEMVis" r= "0.8" g="0.4" b="0.3" alpha="0.8" showDaughters="true" visible="true"/>
<vis name="ci_HCALVis" r= "0.6" g="0" b="0.6" alpha="1.0" showDaughters="true" visible="true"/>
<vis name="DRICH_vessel_vis" alpha="1.0" ref="AnlGray" showDaughters="true" visible="true" />
<vis name="DRICH_gas_vis" alpha="1.0" r="1.0" g="0.0" b="0.0" showDaughters="true" visible="true" />
<vis name="DRICH_aerogel_vis" alpha="1.0" r="0.0" g="1.0" b="1.0" showDaughters="true" visible="true" />
<vis name="DRICH_filter_vis" alpha="1.0" r="1.0" g="1.0" b="0.0" showDaughters="true" visible="true" />
<vis name="DRICH_mirror_vis" alpha="1.0" r="0.5" g="0.5" b="0.5" showDaughters="true" visible="true" />
<vis name="DRICH_sensor_vis" alpha="1.0" r="0.0" g="1.0" b="0.0" showDaughters="true" visible="true" />
<vis name="MRICH_aerogel_vis" alpha="1.0" r="0.0" g="1.0" b="1.0" showDaughters="true" visible="true" />
<vis name="MRICH_frame_vis" ref="AnlGold" showDaughters="true" visible="true" />
<vis name="MRICH_lens_vis" ref="AnlViolet" showDaughters="true" visible="true" />
<vis name="MRICH_mirror_vis" ref="AnlGray" showDaughters="true" visible="true" />
<comment>
Deprecated colors used for IP6 vis
</comment>
<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="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"/>
<vis name="PurpleVis" alpha="1.0" r= "1.0" g="0.0" b="1.0" showDaughters="true" visible="true"/>
<vis name="DoubleRedG" alpha="0.5" r= "2.0" g=".10" b="0.0" showDaughters="true" visible="true"/>
<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="1.0" r= "0.75" g="0.75" b="0.75" showDaughters="true" visible="true"/>
<vis name="AnlRed_1" alpha="0.5" r="205/256" g="32/256" b="44/256"/>
</display>
compact/fake_dirc.xml
+ 1
− 1
View file @ 7404f5e4
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
sensitive="false" sensitive="false"
width="DIRCModule_width" width="DIRCModule_width"
thickness="DIRCSkinFront_thickness" thickness="DIRCSkinFront_thickness"
vis="VertexSupportVis" vis="DIRCSupportVis"
length="DIRCBar_length" /> length="DIRCBar_length" />
<module_component name="QuartzBar" <module_component name="QuartzBar"
material="Quartz" material="Quartz"
......
compact/mrich.xml
+ 4
− 4
View file @ 7404f5e4
...@@ -70,17 +70,17 @@ ...@@ -70,17 +70,17 @@
height="MRICHCarbonFrame_width" height="MRICHCarbonFrame_width"
length="MRICHCarbonFrame_length"> length="MRICHCarbonFrame_length">
<frame vis="AnlGray" thickness="MRICHCarbonFrame_thickness" material="CarbonFiber"/> <frame vis="AnlGray" thickness="MRICHCarbonFrame_thickness" material="CarbonFiber"/>
<aerogel vis="AnlTeal" <aerogel vis="MRICH_aerogel_vis"
length="MRICHAerogel_thickness" width="MRICHAerogel_width" length="MRICHAerogel_thickness" width="MRICHAerogel_width"
material="AerogelOptical"> material="AerogelOptical">
<frame vis="AnlGold_1" thickness="MRICHFoam_thickness" material="PolystyreneFoam" /> <frame vis="MRICH_frame_vis" thickness="MRICHFoam_thickness" material="PolystyreneFoam" />
</aerogel> </aerogel>
<lens vis="AnlViolet" thickness="MRICHFresnelLens_thickness" <lens vis="MRICH_lens_vis" thickness="MRICHFresnelLens_thickness"
pitch="MRICHFresnelLensGroove_pitch" focal_length="6.0*inch" pitch="MRICHFresnelLensGroove_pitch" focal_length="6.0*inch"
effective_diameter="MRICHFresnelLensEffectiveDiameter" effective_diameter="MRICHFresnelLensEffectiveDiameter"
width="MRICHAerogel_width" width="MRICHAerogel_width"
material="AcrylicOptical"/> material="AcrylicOptical"/>
<mirror vis="AnlGray" <mirror vis="MRICH_mirror_vis"
x1="MRICHMirror_width1" x2="MRICHMirror_width2" length="MRICHMirror_length" x1="MRICHMirror_width1" x2="MRICHMirror_width2" length="MRICHMirror_length"
surface="MRICH_MirrorOpticalSurface" thickness="MRICHMirror_thickness" surface="MRICH_MirrorOpticalSurface" thickness="MRICHMirror_thickness"
material="AluminumOxide"/> material="AluminumOxide"/>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment