From 1679b6b596baea398c100904d972cdffe31d63ae Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Fri, 21 May 2021 02:01:30 -0500
Subject: [PATCH] modified: CMakeLists.txt modified:
compact/gem_tracker_endcap.xml
---
CMakeLists.txt | 1 +
compact/gem_tracker_endcap.xml | 37 +++++++++++++++++++---------------
2 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 209c89a..49181b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,6 @@
cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
+set(CMAKE_CXX_STANDARD 17)
find_package( DD4hep REQUIRED COMPONENTS DDCore DDG4 )
#find_package(Acts REQUIRED COMPONENTS Core PluginIdentification PluginTGeo PluginDD4hep )
diff --git a/compact/gem_tracker_endcap.xml b/compact/gem_tracker_endcap.xml
index 224e20a..665eb7d 100644
--- a/compact/gem_tracker_endcap.xml
+++ b/compact/gem_tracker_endcap.xml
@@ -3,8 +3,13 @@
<comment> Endcap Tracker </comment>
<define>
- <constant name="GEMTrackerEndcap_zmin" value="BarrelTracking_length/2.0"/>
- <constant name="GEMTrackerEndcap_NLayers" value="1"/>
+ <constant name="GEMTrackerEndcap_ID" value="50"/>
+ <constant name="GEMTrackerEndcapN_ID" value="51"/>
+
+
+
+ <constant name="GEMTrackerEndcap_zmin" value="100.0*cm"/>
+ <constant name="GEMTrackerEndcap_NLayers" value="4"/>
<constant name="GEMTrackerEndcapFoilOpeningAngle" value="30.1*degree"/>
<constant name="GEMTrackerEndcapFoilX1" value="43.0 * mm"/>
@@ -70,9 +75,9 @@
name="GEMTrackerEndcap"
type="refdet_GEMTrackerEndcap"
readout="GEMTrackerEndcapHits"
- vis="AnlRed"
+ vis="BlueVis"
reflect="false">
- <module name="GEMModule1" vis="AnlProcess_Blue">
+ <module name="GEMModule1" vis="GreenVis">
<trd x1="GEMTrackerEndcapFoilX1/2.0" x2="GEMTrackerEndcapFoilX2/2.0" z="GEMTrackerEndcapFoilY/2"/>
<comment> Going from HV side to readout side</comment>
<module_component thickness="0.127 * mm" material="Mylar"/>
@@ -93,22 +98,22 @@
<module_component thickness="30.0*um" material="Kapton" name="readout" sensitive="true"/>
<module_component thickness=" 3.0*um" material="Copper" name="readout_Cu"/>
<module_component thickness="127.0*um" material="Mylar"/>
- <module_component thickness="200.0*um" material="Epoxy" sensitive="true" vis="AnlProcess_Blue"/>
+ <module_component thickness="200.0*um" material="Epoxy" sensitive="true" vis="GreenVis"/>
</module>
- <module name="GEMSupportModule1" vis="AnlProcess_Blue">
+ <module name="GEMSupportModule1" vis="OrangeVis">
<trd x1="GEMTrackerEndcapFoilX2/2.0" x2="GEMTrackerEndcapFoilX1/2.0" z="GEMTrackerEndcapFrameBotEdge_width"/>
<module_component thickness="GEMTrackerEndcapFrame_thickness" material="Mylar"/>
</module>
- <module name="GEMSupportModule2" vis="AnlProcess_Blue">
+ <module name="GEMSupportModule2" vis="OrangeVis">
<trd x1="GEMTrackerEndcapFrameSideEdge_width" x2="GEMTrackerEndcapFrameSideEdge_width" z="GEMTrackerEndcapFoilY/2"/>
<module_component thickness="4.0*mm" material="Mylar"/>
</module>
<layer id="1" >
- <ring vis="AnlRed"
+ <ring vis="PurpleVis"
r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0"
zstart="GEMTrackerEndcap_zmin + 0.5*GEMTrackerEndcapLayer_thickness"
nmodules="12" dz="10 * mm" module="GEMModule1" />
- <ring vis="AnlBlue" phi0="15.0*degree"
+ <ring vis="PurpleVis" phi0="15.0*degree"
r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0"
zstart="GEMTrackerEndcap_zmin + 0.5*GEMTrackerEndcapLayer_thickness"
nmodules="12" dz="0 * mm" module="GEMSupportModule2" />
@@ -120,9 +125,9 @@
name="GEMTrackerEndcapN"
type="refdet_GEMTrackerEndcap"
readout="GEMTrackerEndcapHits"
- vis="AnlRed"
+ vis="RedVis"
reflect="true">
- <module name="GEMModule1" vis="AnlProcess_Blue">
+ <module name="GEMModule1" vis="BlueVis">
<trd x1="GEMTrackerEndcapFoilX1/2.0" x2="GEMTrackerEndcapFoilX2/2.0" z="GEMTrackerEndcapFoilY/2"/>
<comment> Going from HV side to readout side</comment>
<module_component thickness="0.127 * mm" material="Mylar"/>
@@ -143,22 +148,22 @@
<module_component thickness="30.0*um" material="Kapton" name="readout" sensitive="true"/>
<module_component thickness=" 3.0*um" material="Copper" name="readout_Cu"/>
<module_component thickness="127.0*um" material="Mylar"/>
- <module_component thickness="200.0*um" material="Epoxy" sensitive="true" vis="AnlProcess_Blue"/>
+ <module_component thickness="200.0*um" material="Epoxy" sensitive="true" vis="GreenVis"/>
</module>
- <module name="GEMSupportModule1" vis="AnlProcess_Blue">
+ <module name="GEMSupportModule1" vis="OrangeVis">
<trd x1="GEMTrackerEndcapFoilX2/2.0" x2="GEMTrackerEndcapFoilX1/2.0" z="GEMTrackerEndcapFrameBotEdge_width"/>
<module_component thickness="GEMTrackerEndcapFrame_thickness" material="Mylar"/>
</module>
- <module name="GEMSupportModule2" vis="AnlProcess_Blue">
+ <module name="GEMSupportModule2" vis="OrangeVis">
<trd x1="GEMTrackerEndcapFrameSideEdge_width" x2="GEMTrackerEndcapFrameSideEdge_width" z="GEMTrackerEndcapFoilY/2"/>
<module_component thickness="4.0*mm" material="Mylar"/>
</module>
<layer id="1" >
- <ring vis="AnlRed"
+ <ring vis="PurpleVis"
r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0"
zstart="GEMTrackerEndcap_zmin + 0.5*GEMTrackerEndcapLayer_thickness"
nmodules="12" dz="10 * mm" module="GEMModule1" />
- <ring vis="AnlBlue" phi0="15.0*degree"
+ <ring vis="PurpleVis" phi0="15.0*degree"
r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0"
zstart="GEMTrackerEndcap_zmin + 0.5*GEMTrackerEndcapLayer_thickness"
nmodules="12" dz="0 * mm" module="GEMSupportModule2" />
--
GitLab