diff --git a/CMakeLists.txt b/CMakeLists.txt index fa0a82b7367c7425b5a0c1783fd1ffa40ba43c85..209c89a1bb5a742a1bb5acf8934456eb3a137bbd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,17 +5,11 @@ find_package( DD4hep REQUIRED COMPONENTS DDCore DDG4 ) #----------------------------------------------------------------------------------- set(a_lib_name my_detector) -#dd4hep_package (${a_lib_name} MAJOR 0 MINOR 0 PATCH 1 -# USES [ROOT REQUIRED COMPONENTS Geom GenVector] -# [DD4hep REQUIRED COMPONENTS DDCore DDRec] -# OPTIONAL XERCESC -# INCLUDE_DIRS include -# ) dd4hep_add_plugin(${a_lib_name} SOURCES src/*.cpp - #USES ActsCore ActsPluginDD4hep ) target_link_libraries(${a_lib_name} PUBLIC DD4hep::DDCore DD4hep::DDRec + #ActsCore ActsPluginDD4hep ) #----------------------------------------------------------------------------------- diff --git a/gem_tracker.xml b/gem_tracker.xml index 2c874ea59613ee91a29b13c5b621c09e58fca13e..6c72f93f1cc494b983fd3cd2de9026ef9b5e511a 100644 --- a/gem_tracker.xml +++ b/gem_tracker.xml @@ -79,26 +79,26 @@ </detector> <detector id="2" name="GEMTracker" vis="RedVis" type="my_GEMTracker" readout="GEMTrackerHits" > - <layer id="1" z="-100 *cm" inner_r="36*cm" outer_r="87.0*cm" phi0_offset="0.0*deg" /> - <layer id="2" z="-80 *cm" inner_r="21*cm" outer_r="98.0*cm" phi0_offset="0.0*deg" /> - <layer id="3" z="-60 *cm" inner_r="25*cm" outer_r="112.0*cm" phi0_offset="0.0*deg" /> - <layer id="4" z="-40 *cm" inner_r="32*cm" outer_r="135.0*cm" phi0_offset="0.0*deg" /> - <layer id="5" z=" 40 *cm" inner_r="42*cm" outer_r="100.0*cm" phi0_offset="0.0*deg" /> - <layer id="6" z=" 60 *cm" inner_r="42*cm" outer_r="100.0*cm" phi0_offset="0.0*deg" /> - <layer id="7" z=" 80 *cm" inner_r="42*cm" outer_r="123.0*cm" phi0_offset="0.0*deg" /> - <layer id="8" z="100 *cm" inner_r="42*cm" outer_r="123.0*cm" phi0_offset="0.0*deg" /> + <layer id="1" z="-100 *cm" inner_r="40*cm" outer_r="120*cm" phi0_offset="0.0*deg" /> + <layer id="2" z="-80 *cm" inner_r="30*cm" outer_r="90*cm" phi0_offset="0.0*deg" /> + <layer id="3" z="-60 *cm" inner_r="20*cm" outer_r="70*cm" phi0_offset="0.0*deg" /> + <layer id="4" z="-40 *cm" inner_r="20*cm" outer_r="50.0*cm" phi0_offset="0.0*deg" /> + <layer id="5" z=" 40 *cm" inner_r="20*cm" outer_r="50.0*cm" phi0_offset="0.0*deg" /> + <layer id="6" z=" 60 *cm" inner_r="25*cm" outer_r="70.0*cm" phi0_offset="0.0*deg" /> + <layer id="7" z=" 80 *cm" inner_r="30*cm" outer_r="90.0*cm" phi0_offset="0.0*deg" /> + <layer id="8" z="100 *cm" inner_r="40*cm" outer_r="100.0*cm" phi0_offset="0.0*deg" /> </detector> </detectors> <readouts> <readout name="GEMTrackerHits"> - <!-- <segmentation type="CartesianGridXY" grid_size_x="1*cm" grid_size_y="3*cm" /> <id>system:8,barrel:2,layer:4,module:12,sensor:2,x:32:-16,y:-16</id> - --> + <!-- <segmentation type="PolarGridRPhi" grid_size_phi="3.0*degree" grid_size_r="5.0*cm"/> <id>system:5,barrel:3,layer:4,module:5,r:32:-16,phi:-16</id> + --> </readout> </readouts>