Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • 101-north-ecal-add-modules-around-beampipe
  • 104-add-realistic-cooling-for-gridpix
  • 116-fix-the-detector-views
  • 12-job-failed-106994
  • 126-improved-gem-rings
  • 131-update-tof-for-canyonlands
  • 134-make-new-3d-views-of-ff-region-and-detectors
  • 144-irt-geometry
  • 144-test-small-sensor-overlap
  • 147-fix-dirc-overlaps-and-make-it-great-again
  • 148-hcal-geometry-development
  • 148-hcal-geometry-development-wdconinc-suggestion
  • 149-dump-geometry-ci-job-should-also-produce-ff-geometry-separately
  • 21-electron-endcap-ecal-glass-outer-ring-implementation-needed-2
  • 23-add-barrel-tof
  • 24-tweak-zdc-longitudinal-size
  • 37-place-sifi-fibers-in-the-assembly-in-ecal-barrel
  • 38-mm-tracker-implementation
  • 40-quick-viz
  • 42-grid-pix-pid-detector
  • 53-acts-geometry-bug-outer-tracker-barrel
  • 54-dirc-better-parametrization
  • 56-astropix-sampling-fraction-test-2
  • 59-detailed-forward-gem-trd
  • 59-detailed-forward-gem-trd-2
  • 7-central-tracker-endcap-detail
  • 81-add-barrel-ecal-projection-at-positive-eta
  • 9-detector-plugin-for-w-scfi-calorimeter-layers
  • 98-update-barrel-and-endcap-tof
  • AllieWeary-master-patch-33350
  • WorkingGemTrd_MLmodel_andAnalysis
  • acadia
  • acts_surface_binning
  • acts_vertex_barrel
  • add_segmentation
  • adjust-barrel-emcalo-geometry
  • b0_acts
  • backward_ecal_cleanup
  • barrel-tracker-simplified
  • baseline-dimensions-rich-thickness
  • calibrations-ecal-hcal
  • calo-digitization-json
  • canyonlands
  • canyonlands-acts-dd4hep-plugin
  • cherry-pick-85aaf29d
  • cherry-pick-ee231e50
  • deathvalley
  • deathvalley-1.5T
  • deathvalley-acts-dd4hep-plugin
  • debug-vis
  • default_visibilities
  • documentation_tag
  • drich-optics-tests
  • drich-space-update
  • drich-two-mirrors
  • ecal-hcal-endcap-bore-and-length
  • hcal
  • hcal-klm
  • irt-erich
  • irt-init-v01
  • lengthen_ecalbarrel
  • line_drawing
  • lkosarzew-master-patch-25029
  • master
  • mlavinsky-master-patch-10431
  • module_frame
  • mriganka-branch02
  • niveditharam-master-patch-05822
  • optional_full_overlap_check
  • outer_tracker_fix
  • overlap_child_pipeline
  • remove_comment
  • rich-photos
  • shyam.kumar-master-patch-48113
  • sly2j-master-patch-62318
  • sphere-issue
  • sphere_tests
  • swapneshkhade-master-patch-16755
  • test
  • test-drich-tracker
  • testBranchRobin
  • test_tof_zy
  • tmp_view
  • tmp_viz
  • update_becal_nlayers
  • vanekjan-master-patch-74522
  • vdesai-master-patch-09582
  • vis_check
  • vis_dirc
  • vis_ref
  • wdconinc-master-patch-02076
  • weibin-master-patch-37475
  • zdc_prim_fix
  • zdemirog-master-patch-64142
  • zji-ScFiCal
  • acadia-v1.0
  • acadia-v1.0-alpha
  • acadia-v1.1
  • acadia-v2.0
  • acadia-v2.1
  • canyonlands-v1.0
  • canyonlands-v1.1
  • canyonlands-v1.2
  • canyonlands-v2.0
  • canyonlands-v2.1
  • canyonlands-v2.2
  • deathvalley-v1.0
  • deathvalley-v1.0-1.5T
  • deathvalley-v1.1
  • v0.1.0
  • v0.2.0
111 results

Target

Select target project
  • EIC/detectors/athena
  • zwzhao/athena
  • FernandoTA/athena
  • palspeic/athena
4 results
Select Git revision
  • 101-north-ecal-add-modules-around-beampipe
  • 104-add-realistic-cooling-for-gridpix
  • 116-fix-the-detector-views
  • 12-job-failed-106994
  • 126-improved-gem-rings
  • 131-update-tof-for-canyonlands
  • 134-make-new-3d-views-of-ff-region-and-detectors
  • 144-irt-geometry
  • 147-fix-dirc-overlaps-and-make-it-great-again
  • 21-electron-endcap-ecal-glass-outer-ring-implementation-needed-2
  • 23-add-barrel-tof
  • 24-tweak-zdc-longitudinal-size
  • 37-place-sifi-fibers-in-the-assembly-in-ecal-barrel
  • 38-mm-tracker-implementation
  • 40-quick-viz
  • 42-grid-pix-pid-detector
  • 53-acts-geometry-bug-outer-tracker-barrel
  • 54-dirc-better-parametrization
  • 56-astropix-sampling-fraction-test-2
  • 59-detailed-forward-gem-trd
  • 7-central-tracker-endcap-detail
  • 81-add-barrel-ecal-projection-at-positive-eta
  • 9-detector-plugin-for-w-scfi-calorimeter-layers
  • 98-update-barrel-and-endcap-tof
  • AllieWeary-master-patch-33350
  • acadia
  • acts_surface_binning
  • acts_vertex_barrel
  • add_segmentation
  • b0_acts
  • backward_ecal_cleanup
  • barrel-tracker-simplified
  • baseline-dimensions-rich-thickness
  • calibrations-ecal-hcal
  • calo-digitization-json
  • canyonlands
  • cherry-pick-85aaf29d
  • cherry-pick-ee231e50
  • deathvalley
  • deathvalley-1.5T
  • debug-vis
  • default_visibilities
  • documentation_tag
  • drich-optics-tests
  • drich-space-update
  • drich-two-mirrors
  • ecal-hcal-endcap-bore-and-length
  • hcal
  • hcal-klm
  • irt-erich
  • irt-init-v01
  • lengthen_ecalbarrel
  • line_drawing
  • master
  • module_frame
  • optional_full_overlap_check
  • outer_tracker_fix
  • overlap_child_pipeline
  • remove_comment
  • rich-photos
  • sly2j-master-patch-62318
  • sphere-issue
  • sphere_tests
  • test
  • test-drich-tracker
  • testBranchRobin
  • test_tof_zy
  • tmp_view
  • tmp_viz
  • update_becal_nlayers
  • vis_check
  • vis_dirc
  • vis_ref
  • zdc_prim_fix
  • zji-ScFiCal
  • acadia-v1.0
  • acadia-v1.0-alpha
  • acadia-v1.1
  • acadia-v2.0
  • acadia-v2.1
  • canyonlands-v1.0
  • canyonlands-v1.1
  • canyonlands-v1.2
  • canyonlands-v2.0
  • canyonlands-v2.1
  • canyonlands-v2.2
  • deathvalley-v1.0
  • deathvalley-v1.0-1.5T
  • deathvalley-v1.1
  • v0.1.0
  • v0.2.0
91 results
Show changes

Commits on Source 7

Show whitespace changes
Inline Side-by-side
Showing
with 221 additions and 584 deletions
.gitlab-ci.yml
View file @ 1008a184
...@@ -158,7 +158,7 @@ detector_documentation: ...@@ -158,7 +158,7 @@ detector_documentation:
- bash bin/build_documentation | tee doc/detector.md - bash bin/build_documentation | tee doc/detector.md
#- | #- |
# xmllint --format --xpath '//comment/text()' ${DETECTOR_PATH}/athena.xml | sed -re 's/<\/?\w+>//g' | sed 's/^[[:space:]]*#/#/' | tee doc/detector.md # xmllint --format --xpath '//comment/text()' ${DETECTOR_PATH}/athena.xml | sed -re 's/<\/?\w+>//g' | sed 's/^[[:space:]]*#/#/' | tee doc/detector.md
# xmllint --format --xpath '//comment/text()' ${DETECTOR_PATH}/ip6/ip6_defs.xml | sed -re 's/<\/?\w+>//g' | sed 's/^[[:space:]]*#/#/' | tee -a doc/detector.md || true # xmllint --format --xpath '//comment/text()' ${DETECTOR_PATH}/ip6/definitions.xml | sed -re 's/<\/?\w+>//g' | sed 's/^[[:space:]]*#/#/' | tee -a doc/detector.md || true
# for afile in ${DETECTOR_PATH}/compact/*.xml ; do # for afile in ${DETECTOR_PATH}/compact/*.xml ; do
# xmllint --format --xpath '//comment/text()' ${afile} | sed -re 's/<\/?\w+>//g' | sed 's/^[[:space:]]*#/#/' | tee -a doc/detector.md || true # xmllint --format --xpath '//comment/text()' ${afile} | sed -re 's/<\/?\w+>//g' | sed 's/^[[:space:]]*#/#/' | tee -a doc/detector.md || true
# done # done
...@@ -179,7 +179,7 @@ report: ...@@ -179,7 +179,7 @@ report:
- view_20 - view_20
- dump_constants - dump_constants
- dump_geometry - dump_geometry
- convert_to_gdml - dump_gdml
script: script:
- pip3 install jinja2 && ls -lrth - pip3 install jinja2 && ls -lrth
- ./bin/make_images > doc/dawn_views.md - ./bin/make_images > doc/dawn_views.md
...@@ -199,7 +199,7 @@ overlap_check_tgeo: ...@@ -199,7 +199,7 @@ overlap_check_tgeo:
script: script:
## disable fibers in ECAL for normal overlap check ## disable fibers in ECAL for normal overlap check
- sed -i '/<fiber/,+6d' ${DETECTOR_PATH}/compact/ecal_barrel_interlayers.xml - sed -i '/<fiber/,+6d' ${DETECTOR_PATH}/compact/ecal_barrel_interlayers.xml
- sed -i '/<fiber/,+4d' ${DETECTOR_PATH}/ip6/far_forward_ZDC_Ecal_WSciFi.xml - sed -i '/<fiber/,+4d' ${DETECTOR_PATH}/ip6/far_forward/ZDC_Ecal_WSciFi.xml
- checkOverlaps -c ${DETECTOR_PATH}/athena.xml | tee doc/overlap_check_tgeo.out - checkOverlaps -c ${DETECTOR_PATH}/athena.xml | tee doc/overlap_check_tgeo.out
- echo "$(cat doc/overlap_check_tgeo.out | grep ovlp | wc -l) overlaps..." - echo "$(cat doc/overlap_check_tgeo.out | grep ovlp | wc -l) overlaps..."
- if [[ "$(cat doc/overlap_check_tgeo.out | grep ovlp | wc -l)" -gt "0" ]] ; then echo "Overlaps exist!" && false ; fi - if [[ "$(cat doc/overlap_check_tgeo.out | grep ovlp | wc -l)" -gt "0" ]] ; then echo "Overlaps exist!" && false ; fi
...@@ -211,7 +211,7 @@ overlap_check_geant4:full_fast: ...@@ -211,7 +211,7 @@ overlap_check_geant4:full_fast:
script: script:
## disable fibers in ECAL for normal overlap check ## disable fibers in ECAL for normal overlap check
- sed -i '/<fiber/,+6d' ${DETECTOR_PATH}/compact/ecal_barrel_interlayers.xml - sed -i '/<fiber/,+6d' ${DETECTOR_PATH}/compact/ecal_barrel_interlayers.xml
- sed -i '/<fiber/,+4d' ${DETECTOR_PATH}/ip6/far_forward_ZDC_Ecal_WSciFi.xml - sed -i '/<fiber/,+4d' ${DETECTOR_PATH}/ip6/far_forward/ZDC_Ecal_WSciFi.xml
## reduce the number of fibers in Hadron EMCal for overlap check ## reduce the number of fibers in Hadron EMCal for overlap check
## not needed, as we are running with a different setup now ## not needed, as we are running with a different setup now
#- sed -i 's/radius="EcalEndcapP_FiberRadius"/radius="EcalEndcapP_FiberRadius*10"/' ${DETECTOR_PATH}/compact/ci_ecal_scfi.xml #- sed -i 's/radius="EcalEndcapP_FiberRadius"/radius="EcalEndcapP_FiberRadius*10"/' ${DETECTOR_PATH}/compact/ci_ecal_scfi.xml
...@@ -231,13 +231,19 @@ overlap_check_geant4:inner_detector: ...@@ -231,13 +231,19 @@ overlap_check_geant4:inner_detector:
- echo "$(cat doc/overlap_check_geant4.out | grep GeomVol1002 | wc -l) overlaps..." - echo "$(cat doc/overlap_check_geant4.out | grep GeomVol1002 | wc -l) overlaps..."
- if [[ "$(cat doc/overlap_check_geant4.out | grep GeomVol1002 | wc -l)" -gt "0" ]] ; then echo "Overlaps exist!" && false ; fi - if [[ "$(cat doc/overlap_check_geant4.out | grep GeomVol1002 | wc -l)" -gt "0" ]] ; then echo "Overlaps exist!" && false ; fi
convert_to_gdml: dump_gdml:
stage: test stage: test
needs: needs:
- ["common:detector"] - ["common:detector"]
script: script:
- mkdir -p geo - mkdir -p geo
- python scripts/convert_to_gdml.py --compact ${DETECTOR_PATH}/athena.xml --output geo/athena.gdml - |
python scripts/convert_to_gdml.py --compact ${DETECTOR_PATH}/athena.xml --output geo/athena.gdml
for xml in ${DETECTOR_PATH}/compact/subsystem_views/*.xml; do
cp $xml ${DETECTOR_PATH}/geo.xml
gdml_name=`basename $xml .xml`.gdml
python scripts/convert_to_gdml.py --compact ${DETECTOR_PATH}/geo.xml --output geo/${gdml_name}
done
tracking_geometry_debug: tracking_geometry_debug:
stage: test stage: test
......
CMakeLists.txt
View file @ 1008a184
...@@ -13,7 +13,14 @@ set(CMAKE_CXX_STANDARD 17) ...@@ -13,7 +13,14 @@ set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
find_package(DD4hep REQUIRED COMPONENTS DDCore DDG4) find_package(DD4hep REQUIRED COMPONENTS DDCore DDG4)
find_package(ActsDD4hep)
if(ActsDD4hep_FOUND)
add_compile_definitions(USE_ACTSDD4HEP)
set(ActsDD4hep ActsDD4hep::ActsDD4hep)
else()
find_package(Acts REQUIRED COMPONENTS Core PluginIdentification PluginTGeo PluginDD4hep) find_package(Acts REQUIRED COMPONENTS Core PluginIdentification PluginTGeo PluginDD4hep)
set(ActsDD4hep ActsCore ActsPluginDD4hep)
endif()
find_package(fmt REQUIRED) find_package(fmt REQUIRED)
#----------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------
...@@ -44,7 +51,7 @@ dd4hep_add_plugin(${a_lib_name} SOURCES ...@@ -44,7 +51,7 @@ dd4hep_add_plugin(${a_lib_name} SOURCES
src/SimpleDiskDetector_geo.cpp src/SimpleDiskDetector_geo.cpp
src/SolenoidCoil_geo.cpp src/SolenoidCoil_geo.cpp
src/TrapEndcapTracker_geo.cpp src/TrapEndcapTracker_geo.cpp
USES ActsCore ActsPluginDD4hep USES ${ActsDD4hep}
) )
target_link_libraries(${a_lib_name} target_link_libraries(${a_lib_name}
PUBLIC DD4hep::DDCore DD4hep::DDRec fmt::fmt PUBLIC DD4hep::DDCore DD4hep::DDRec fmt::fmt
......
athena.xml
View file @ 1008a184
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
The ip6 (or other ip) defines should be included first. The ip6 (or other ip) defines should be included first.
These files have only a define tags. These files have only a define tags.
</documentation> </documentation>
<include ref="ip6/ip6_defs.xml" /> <include ref="ip6/definitions.xml" />
<include ref="ip6/far_forward_fields_275.xml" /> <include ref="ip6/far_forward/fields_275.xml" />
<include ref="compact/definitions.xml" /> <include ref="compact/definitions.xml" />
</define> </define>
...@@ -84,17 +84,6 @@ ...@@ -84,17 +84,6 @@
- and more... - and more...
</documentation> </documentation>
<comment>
Beamline elements
-----------------
</comment>
<include ref="ip6/forward_ion_beamline.xml"/>
<include ref="ip6/beampipe_hadron_B0.xml" />
<include ref="ip6/beampipe.xml" />
<include ref="ip6/inner_vacuum_FF_magnets.xml"/>
<documentation level="5"> <documentation level="5">
## Main magnet ## Main magnet
...@@ -126,70 +115,17 @@ ...@@ -126,70 +115,17 @@
<documentation level="11"> <documentation level="11">
## Far foward detectors ## Far foward detectors
</documentation> </documentation>
<include ref="ip6/B0_tracker.xml"/> <include ref="ip6/central_beampipe.xml"/>
<include ref="ip6/B0_preshower.xml"/>
<include ref="ip6/far_forward_offM_tracker.xml"/> <documentation level="11">
<include ref="ip6/far_forward_detectors.xml"/> ## Far foward detectors
<include ref="ip6/roman_pots_eRD24_design.xml"/> </documentation>
<include ref="ip6/far_forward.xml"/>
<fields>
<field name="B0PF_Magnet" type="MultipoleMagnet"> <documentation level="11">
<position x="B0PF_XPosition" y="0" z="B0PF_CenterPosition"/> ## Far backward detectors
<rotation x="0" y="B0PF_RotationAngle" z="0"/> </documentation>
<shape type="Tube" rmin="0.0" rmax="B0PF_InnerRadius" dz="B0PF_Length*0.5"/> <include ref="ip6/far_backward.xml"/>
<coefficient coefficient="B0PF_Bmax" skew="0.0*tesla"/>
<!--<coefficient coefficient="2.0*tesla/cm" skew="0.2*tesla/cm"/> -->
</field>
<field name="B0APF_Magnet" type="MultipoleMagnet">
<position x="B0APF_XPosition" y="0" z="B0APF_CenterPosition"/>
<rotation x="0" y="B0APF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="B0APF_InnerRadius" dz="B0APF_Length*0.5"/>
<coefficient coefficient="B0APF_Bmax" skew="0.0*tesla"/>
<!--<coefficient coefficient="2.0*tesla/cm" skew="0.2*tesla/cm"/> -->
</field>
<field name="Q1APF_Magnet" type="MultipoleMagnet">
<position x="Q1APF_XPosition" y="0" z="Q1APF_CenterPosition"/>
<rotation x="0" y="Q1APF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="Q1APF_InnerRadius" dz="Q1APF_Length*0.5"/>
<coefficient coefficient="Q1APF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="Q1APF_GradientMax" skew="0.0*tesla/cm"/>
</field>
<field name="Q1BPF_Magnet" type="MultipoleMagnet">
<position x="Q1BPF_XPosition" y="0" z="Q1BPF_CenterPosition"/>
<rotation x="0" y="Q1BPF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="Q1BPF_InnerRadius" dz="Q1BPF_Length*0.5"/>
<coefficient coefficient="Q1BPF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="Q1BPF_GradientMax" skew="0.0*tesla/cm"/>
</field>
<field name="Q2PF_Magnet" type="MultipoleMagnet">
<position x="Q2PF_XPosition" y="0" z="Q2PF_CenterPosition"/>
<rotation x="0" y="Q2PF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="Q2PF_InnerRadius" dz="Q2PF_Length*0.5"/>
<coefficient coefficient="Q2PF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="Q2PF_GradientMax" skew="0.0*tesla/cm"/>
</field>
<field name="B1PF_Magnet" type="MultipoleMagnet">
<position x="B1PF_XPosition" y="0" z="B1PF_CenterPosition"/>
<rotation x="0" y="B1PF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="B1PF_InnerRadius" dz="B1PF_Length*0.5"/>
<coefficient coefficient="B1PF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="B1PF_GradientMax" skew="0.0*tesla/cm"/>
</field>
<field name="B1APF_Magnet" type="MultipoleMagnet">
<position x="B1APF_XPosition" y="0" z="B1APF_CenterPosition"/>
<rotation x="0" y="B1APF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="B1APF_InnerRadius" dz="B1APF_Length*0.5"/>
<coefficient coefficient="B1APF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="B1APF_GradientMax" skew="0.0*tesla/cm"/>
</field>
<field name="B2PF_Magnet" type="MultipoleMagnet">
<position x="B2PF_XPosition" y="0" z="B2PF_CenterPosition"/>
<rotation x="0" y="B2PF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="B2PF_InnerRadius" dz="B2PF_Length*0.5"/>
<coefficient coefficient="B2PF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="B2PF_GradientMax" skew="0.0*tesla/cm"/>
</field>
</fields>
<comment> <comment>
FB elements FB elements
......
bin/generate_prim_file
View file @ 1008a184
...@@ -52,7 +52,7 @@ parser.add_argument('-t', '--tag', type=str,dest='file_tag', ...@@ -52,7 +52,7 @@ parser.add_argument('-t', '--tag', type=str,dest='file_tag',
help='Output file tag') help='Output file tag')
parser.add_argument('--timeout', type=int, parser.add_argument('--timeout', type=int,
default=60, default=3600,
help='Timeout in seconds') help='Timeout in seconds')
parser.add_argument('passthrough', nargs='*') parser.add_argument('passthrough', nargs='*')
......
compact/definitions.xml
View file @ 1008a184
...@@ -251,18 +251,58 @@ The unused IDs below are saved for future use. ...@@ -251,18 +251,58 @@ The unused IDs below are saved for future use.
<constant name="ForwardOffMTracker_station_2_ID" value="160"/> <constant name="ForwardOffMTracker_station_2_ID" value="160"/>
<constant name="ForwardOffMTracker_station_3_ID" value="161"/> <constant name="ForwardOffMTracker_station_3_ID" value="161"/>
<constant name="ForwardOffMTracker_station_4_ID" value="162"/> <constant name="ForwardOffMTracker_station_4_ID" value="162"/>
<comment> TODO naming consistency </comment> <constant name="ZDCEcal_ID" value="163"/>
<constant name="ffi_ZDC_ECAL_ID" value="163"/> <constant name="ZDCHcal_ID" value="164"/>
<constant name="ffi_ZDC_HCAL_ID" value="164"/>
<constant name="VacuumMagnetElement_1_ID" value="165"/> <constant name="VacuumMagnetElement_1_ID" value="165"/>
<documentation> <documentation>
#### (170-189) Forward Beamline Magnets #### (170-189) Far Forward Beamline Magnets
</documentation> </documentation>
<constant name="B0PF_ID" value="170"/>
<constant name="B0APF_ID" value="171"/>
<constant name="Q1APF_ID" value="172"/>
<constant name="Q1BPF_ID" value="173"/>
<constant name="Q2PF_ID" value="174"/>
<constant name="B1PF_ID" value="175"/>
<constant name="B1APF_ID" value="176"/>
<constant name="B2PF_ID" value="177"/>
<constant name="Q0EF_ID" value="180"/>
<constant name="Q1EF_ID" value="181"/>
<documentation> <documentation>
#### (190-199) Backward Beamline Magnets #### (190-199) Far Backward Beamline Magnets
- Low-Q2 Tagger 1 Tracker ID: 195
- Low-Q2 Tagger 1 Calorimeter ID: 196
- Low-Q2 Tagger 2 Tracker ID: 198
- Low-Q2 Tagger 2 Calorimeter ID: 199
TODO: A lot of the repeated ID's below should be pushed into a single detector
</documentation>
<constant name="LumiCollimator_ID" value="190"/>
<constant name="LumiDipole_ID" value="191"/>
<constant name="TaggerTracker_1_ID" value="195"/>
<constant name="TaggerCalorimeter_1_ID" value="196"/>
<constant name="TaggerTracker_2_ID" value="198"/>
<constant name="TaggerCalorimeter_2_ID" value="199"/>
<documentation>
#### (200-219) Far Backward Beamline Magnets
</documentation> </documentation>
<constant name="Pipe_to_Q1eR_ID" value="200"/>
<constant name="Magnet_Q1eR_ID" value="201"/>
<constant name="Pipe_in_Q1eR_ID" value="202"/>
<constant name="Pipe_Q1eR_to_Q2eR_ID" value="203"/>
<constant name="Magnet_Q2eR_ID" value="204"/>
<constant name="Pipe_in_Q2eR_ID" value="205"/>
<constant name="Pipe_Q2eR_to_B2AeR_ID" value="206"/>
<constant name="Magnet_B2AeR_ID" value="207"/>
<constant name="Pipe_in_B2AeR_ID" value="208"/>
<constant name="Pipe_B2AeR_to_B2BeR_ID" value="209"/>
<constant name="Magnet_B2BeR_ID" value="210"/>
<constant name="Pipe_in_B2BeR_ID" value="211"/>
<constant name="Magnet_Q3eR_ID" value="212"/>
<constant name="Vacuum_in_Q3eR_ID" value="213"/>
<documentation> <documentation>
## Detector Definition Parameters ## Detector Definition Parameters
......
compact/subsystem_views/calorimeters.xml
View file @ 1008a184
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
The ip6 (or other ip) defines should be included first. The ip6 (or other ip) defines should be included first.
These files have only a define tags. These files have only a define tags.
</documentation> </documentation>
<include ref="ip6/ip6_defs.xml" /> <include ref="ip6/definitions.xml" />
<include ref="ip6/far_forward_fields_275.xml" /> <include ref="ip6/far_forward/fields_275.xml" />
<include ref="compact/definitions.xml" /> <include ref="compact/definitions.xml" />
</define> </define>
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
Beamline elements Beamline elements
----------------- -----------------
</comment> </comment>
<include ref="ip6/beampipe.xml" /> <include ref="ip6/central_beampipe.xml" />
<documentation level="5"> <documentation level="5">
## Main magnet ## Main magnet
...@@ -101,14 +101,6 @@ ...@@ -101,14 +101,6 @@
<include ref="compact/ecal.xml"/> <include ref="compact/ecal.xml"/>
<include ref="compact/hcal.xml"/> <include ref="compact/hcal.xml"/>
<comment>
FB elements
-----------
None (TODO)
What is FB?
</comment>
<readouts> <readouts>
</readouts> </readouts>
......
compact/subsystem_views/dirc_only.xml
View file @ 1008a184
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
The ip6 (or other ip) defines should be included first. The ip6 (or other ip) defines should be included first.
These files have only a define tags. These files have only a define tags.
</documentation> </documentation>
<include ref="ip6/ip6_defs.xml" /> <include ref="ip6/definitions.xml" />
<include ref="ip6/far_forward_fields_275.xml" /> <include ref="ip6/far_forward/fields_275.xml" />
<include ref="compact/definitions.xml" /> <include ref="compact/definitions.xml" />
</define> </define>
......
compact/subsystem_views/drich_only.xml
View file @ 1008a184
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
The ip6 (or other ip) defines should be included first. The ip6 (or other ip) defines should be included first.
These files have only a define tags. These files have only a define tags.
</documentation> </documentation>
<include ref="ip6/ip6_defs.xml" /> <include ref="ip6/definitions.xml" />
<include ref="ip6/far_forward_fields_275.xml" /> <include ref="ip6/far_forward/fields_275.xml" />
<include ref="compact/definitions.xml" /> <include ref="compact/definitions.xml" />
</define> </define>
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
## dRICh only ## dRICh only
</documentation> </documentation>
<include ref="ip6/beampipe.xml" /> <include ref="ip6/central_beampipe.xml" />
<include ref="compact/drich.xml" /> <include ref="compact/drich.xml" />
</lccdd> </lccdd>
compact/subsystem_views/inner_detector.xml
View file @ 1008a184
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
The ip6 (or other ip) defines should be included first. The ip6 (or other ip) defines should be included first.
These files have only a define tags. These files have only a define tags.
</documentation> </documentation>
<include ref="ip6/ip6_defs.xml" /> <include ref="ip6/definitions.xml" />
<include ref="ip6/far_forward_fields_275.xml" /> <include ref="ip6/far_forward/fields_275.xml" />
<include ref="compact/definitions.xml" /> <include ref="compact/definitions.xml" />
</define> </define>
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
Beamline elements Beamline elements
----------------- -----------------
</comment> </comment>
<include ref="ip6/beampipe.xml" /> <include ref="ip6/central_beampipe.xml" />
<documentation level="5"> <documentation level="5">
## Main magnet ## Main magnet
...@@ -98,7 +98,6 @@ ...@@ -98,7 +98,6 @@
<documentation level="10"> <documentation level="10">
## Central tracking detectors ## Central tracking detectors
</documentation> </documentation>
<include ref="compact/tracking_config_deathvalley.xml"/> <include ref="compact/tracking_config_deathvalley.xml"/>
<documentation level="10"> <documentation level="10">
...@@ -106,81 +105,6 @@ ...@@ -106,81 +105,6 @@
</documentation> </documentation>
<include ref="compact/pid_config_deathvalley.xml"/> <include ref="compact/pid_config_deathvalley.xml"/>
<documentation level="10">
## Central calorimetry
</documentation>
<documentation level="11">
## Far foward detectors
</documentation>
<fields>
<field name="B0PF_Magnet" type="MultipoleMagnet">
<position x="B0PF_XPosition" y="0" z="B0PF_CenterPosition"/>
<rotation x="0" y="B0PF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="B0PF_InnerRadius" dz="B0PF_Length*0.5"/>
<coefficient coefficient="B0PF_Bmax" skew="0.0*tesla"/>
<!--<coefficient coefficient="2.0*tesla/cm" skew="0.2*tesla/cm"/> -->
</field>
<field name="B0APF_Magnet" type="MultipoleMagnet">
<position x="B0APF_XPosition" y="0" z="B0APF_CenterPosition"/>
<rotation x="0" y="B0APF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="B0APF_InnerRadius" dz="B0APF_Length*0.5"/>
<coefficient coefficient="B0APF_Bmax" skew="0.0*tesla"/>
<!--<coefficient coefficient="2.0*tesla/cm" skew="0.2*tesla/cm"/> -->
</field>
<field name="Q1APF_Magnet" type="MultipoleMagnet">
<position x="Q1APF_XPosition" y="0" z="Q1APF_CenterPosition"/>
<rotation x="0" y="Q1APF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="Q1APF_InnerRadius" dz="Q1APF_Length*0.5"/>
<coefficient coefficient="Q1APF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="Q1APF_GradientMax" skew="0.0*tesla/cm"/>
</field>
<field name="Q1BPF_Magnet" type="MultipoleMagnet">
<position x="Q1BPF_XPosition" y="0" z="Q1BPF_CenterPosition"/>
<rotation x="0" y="Q1BPF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="Q1BPF_InnerRadius" dz="Q1BPF_Length*0.5"/>
<coefficient coefficient="Q1BPF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="Q1BPF_GradientMax" skew="0.0*tesla/cm"/>
</field>
<field name="Q2PF_Magnet" type="MultipoleMagnet">
<position x="Q2PF_XPosition" y="0" z="Q2PF_CenterPosition"/>
<rotation x="0" y="Q2PF_RotationAngle" z="pi/2.0"/>
<shape type="Tube" rmin="0.0" rmax="Q2PF_InnerRadius" dz="Q2PF_Length*0.5"/>
<coefficient coefficient="Q2PF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="Q2PF_GradientMax" skew="0.0*tesla/cm"/>
</field>
<field name="B1PF_Magnet" type="MultipoleMagnet">
<position x="B1PF_XPosition" y="0" z="B1PF_CenterPosition"/>
<rotation x="0" y="B1PF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="B1PF_InnerRadius" dz="B1PF_Length*0.5"/>
<coefficient coefficient="B1PF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="B1PF_GradientMax" skew="0.0*tesla/cm"/>
</field>
<field name="B1APF_Magnet" type="MultipoleMagnet">
<position x="B1APF_XPosition" y="0" z="B1APF_CenterPosition"/>
<rotation x="0" y="B1APF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="B1APF_InnerRadius" dz="B1APF_Length*0.5"/>
<coefficient coefficient="B1APF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="B1APF_GradientMax" skew="0.0*tesla/cm"/>
</field>
<field name="B2PF_Magnet" type="MultipoleMagnet">
<position x="B2PF_XPosition" y="0" z="B2PF_CenterPosition"/>
<rotation x="0" y="B2PF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="B2PF_InnerRadius" dz="B2PF_Length*0.5"/>
<coefficient coefficient="B2PF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="B2PF_GradientMax" skew="0.0*tesla/cm"/>
</field>
</fields>
<comment>
FB elements
-----------
None (TODO)
What is FB?
</comment>
<readouts> <readouts>
</readouts> </readouts>
......
compact/subsystem_views/ip6.xml
View file @ 1008a184
<?xml version="1.0" encoding="UTF-8"?> <lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
<lccdd> xmlns:xs="http://www.w3.org/2001/XMLSchema"
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
<debug>
<type name="surface" value="0"/>
<type name="material" value="0"/>
<type name="readout" value="0"/>
<type name="segmentation" value="0"/>
<type name="limits" value="0"/>
<type name="region" value="0"/>
<type name="includes" value="0"/>
</debug>
<documentation level="-1">
# Athena Detector
- https://eicweb.phy.anl.gov/EIC/detectors/athena.git
- https://eicweb.phy.anl.gov/EIC/detectors/ip6.git
</documentation>
<!-- Some information about detector -->
<info name="Athena Detector" title="Athena Detector"
author="Athena Collaboration"
url="https://eicweb.phy.anl.gov/EIC/detectors/athena.git"
status="development"
version="v1 2021-03-16">
<comment> Athena </comment>
</info>
<define> <define>
<constant name="Pi" value="3.14159265359"/> <documentation level="2">
<constant name="world_side" value="30*m"/> ## Main Constant Definitions
<constant name="world_x" value="world_side"/>
<constant name="world_y" value="world_side"/> The ip6 (or other ip) defines should be included first.
<constant name="world_z" value="100*m"/> These files have only a define tags.
<constant name="BeamPipeB0_ID" value="1"/> </documentation>
<constant name="BeamPipe_ID" value="2"/> <include ref="ip6/definitions.xml" />
<include ref="ip6/far_forward/fields_275.xml" />
<include ref="ip6/ip6_defs.xml" /> <include ref="compact/definitions.xml" />
<comment> Change this to 275/100/41 to change the field setup</comment>
<include ref="ip6/far_forward_fields_275.xml" />
<comment>
=====================================
(150-169) Far Forward Detectors
=====================================
Forward B0 Tracker ID: 150 - 153
Forward Roman Pot ID: 155 - 158
Zero Degree Cal. Ecal ID: 163
Zero Degree Cal. Hcal ID: 164
</comment>
<constant name="B0Tracker_Station_1_ID" value="150"/>
<constant name="B0Tracker_Station_2_ID" value="151"/>
<constant name="B0Tracker_Station_3_ID" value="152"/>
<constant name="B0Tracker_Station_4_ID" value="153"/>
<constant name="B0Preshower_Station_1_ID" value="154"/>
<constant name="ForwardRomanPot_Station_1_ID" value="155"/>
<constant name="ForwardRomanPot_Station_2_ID" value="156"/>
<constant name="BeamOrbitTracker_station_1_ID" value="157"/>
<constant name="BeamOrbitTracker_station_2_ID" value="158"/>
<constant name="ForwardOffMTracker_station_1_ID" value="159"/>
<constant name="ForwardOffMTracker_station_2_ID" value="160"/>
<constant name="ForwardOffMTracker_station_3_ID" value="161"/>
<constant name="ForwardOffMTracker_station_4_ID" value="162"/>
<constant name="ffi_ZDC_ECAL_ID" value="163"/>
<constant name="ffi_ZDC_HCAL_ID" value="164"/>
<constant name="VacuumMagnetElement_1_ID" value="165"/>
<constant name="tracker_region_zmax" value="10*m"/>
<constant name="tracker_region_rmax" value="1*m"/>
<comment>
=====================================
(170-189) Forward Beamline Magnets
=====================================
</comment>
<comment>
=====================================
(190-199) Backward Beamline Magnets
=====================================
</comment>
</define> </define>
<includes> <includes>
<gdmlFile ref="ip6/elements.xml"/> <gdmlFile ref="compact/elements.xml"/>
<gdmlFile ref="ip6/materials.xml"/> <gdmlFile ref="compact/materials.xml"/>
<file ref="compact/optical_materials.xml"/>
</includes> </includes>
<limits>
<limitset name="EICBeamlineLimits">
<limit name="step_length_max" particles="*" value="1.0" unit="mm" />
<limit name="track_length_max" particles="*" value="1.0" unit="mm" />
<limit name="time_max" particles="*" value="0.1" unit="ns" />
<limit name="ekin_min" particles="*" value="0.001" unit="MeV" />
<limit name="range_min" particles="*" value="0.1" unit="mm" />
</limitset>
<limitset name="cal_limits">
<limit name="step_length_max" particles="*" value="5.0" unit="mm"/>
</limitset>
</limits>
<display> <display>
<include ref="compact/colors.xml" /> <include ref="compact/colors.xml" />
<!--include ref="compact/colors2.xml"/-->
<include ref="compact/display.xml" /> <include ref="compact/display.xml" />
<!--include ref="compact/display_detailed.xml"/-->
</display> </display>
<include ref="ip6/beampipe.xml" /> <documentation level="0">
<include ref="ip6/forward_ion_beamline.xml" /> ## Detector Subsystems
<include ref="ip6/beampipe_hadron_B0.xml" />
<include ref="ip6/B0_tracker.xml"/> ### IP Subsystems
<include ref="ip6/B0_preshower.xml"/>
<include ref="ip6/far_forward_offM_tracker.xml"/> The interaction point subsystems are included before the central detector subsystems.
<include ref="ip6/far_forward_detectors.xml"/> This is becuase the IP subsystems, for exmaple the beampipe, will define paramters
<include ref="ip6/roman_pots_eRD24_design.xml"/> which are subsquently used in the central detector construction -- e.g. the vertex tracker
<!-- uses the beampipe OD to help define its placement.
Old BOM not used
<include ref="ip6/beam_orbit_tracker.xml"/> The IP subsystems include the Far forward and backward regions. The list of subsystem includes:
--> - Interaction region beampipe
<include ref="ip6/inner_vacuum_FF_magnets.xml"/> - B0 tracker
- Off-momentum tracker
<!-- - Far forward roman pots
Magnet file not used for some reason - Zero Degree Calorimeter
<include ref="ip6/magnets.xml" /> - Beam line magnets.
--> - and more...
<fields> </documentation>
<field name="B0PF_Magnet" type="MultipoleMagnet">
<position x="B0PF_XPosition" y="0" z="B0PF_CenterPosition"/> <documentation level="11">
<rotation x="0" y="B0PF_RotationAngle" z="0"/> ## Far foward detectors
<shape type="Tube" rmin="0.0" rmax="B0PF_InnerRadius" dz="B0PF_Length*0.5"/> </documentation>
<coefficient coefficient="B0PF_Bmax" skew="0.0*tesla"/> <include ref="ip6/central_beampipe.xml"/>
<coefficient coefficient="B0PF_GradientMax" skew="0.0*tesla/m"/>
</field> <documentation level="11">
<field name="B0APF_Magnet" type="MultipoleMagnet"> ## Far foward detectors
<position x="B0APF_XPosition" y="0" z="B0APF_CenterPosition"/> </documentation>
<rotation x="0" y="B0APF_RotationAngle" z="0"/> <include ref="ip6/far_forward.xml"/>
<shape type="Tube" rmin="0.0" rmax="B0APF_InnerRadius" dz="B0APF_Length*0.5"/>
<coefficient coefficient="B0APF_Bmax" skew="0.0*tesla"/> <documentation level="11">
<coefficient coefficient="B0APF_GradientMax" skew="0.0*tesla"/> ## Far backward detectors
</field> </documentation>
<field name="Q1APF_Magnet" type="MultipoleMagnet"> <include ref="ip6/far_backward.xml"/>
<position x="Q1APF_XPosition" y="0" z="Q1APF_CenterPosition"/>
<rotation x="0" y="Q1APF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="Q1APF_InnerRadius" dz="Q1APF_Length*0.5"/>
<coefficient coefficient="Q1APF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="Q1APF_GradientMax" skew="0.0*tesla/m"/>
</field>
<field name="Q1BPF_Magnet" type="MultipoleMagnet">
<position x="Q1BPF_XPosition" y="0" z="Q1BPF_CenterPosition"/>
<rotation x="0" y="Q1BPF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="Q1BPF_InnerRadius" dz="Q1BPF_Length*0.5"/>
<coefficient coefficient="Q1BPF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="Q1BPF_GradientMax" skew="0.0*tesla/m"/>
</field>
<field name="Q2PF_Magnet" type="MultipoleMagnet">
<position x="Q2PF_XPosition" y="0" z="Q2PF_CenterPosition"/>
<rotation x="0" y="Q2PF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="Q2PF_InnerRadius" dz="Q2PF_Length*0.5"/>
<coefficient coefficient="Q2PF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="Q2PF_GradientMax" skew="0.0*tesla/m"/>
</field>
<field name="B1PF_Magnet" type="MultipoleMagnet">
<position x="B1PF_XPosition" y="0" z="B1PF_CenterPosition"/>
<rotation x="0" y="B1PF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="B1PF_InnerRadius" dz="B1PF_Length*0.5"/>
<coefficient coefficient="B1PF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="B1PF_GradientMax" skew="0.0*tesla/m"/>
</field>
<field name="B1APF_Magnet" type="MultipoleMagnet">
<position x="B1APF_XPosition" y="0" z="B1APF_CenterPosition"/>
<rotation x="0" y="B1APF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="B1APF_InnerRadius" dz="B1APF_Length*0.5"/>
<coefficient coefficient="B1APF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="B1APF_GradientMax" skew="0.0*tesla/m"/>
</field>
<field name="B2PF_Magnet" type="MultipoleMagnet">
<position x="B2PF_XPosition" y="0" z="B2PF_CenterPosition"/>
<rotation x="0" y="B2PF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="B2PF_InnerRadius" dz="B2PF_Length*0.5"/>
<coefficient coefficient="B2PF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="B2PF_GradientMax" skew="0.0*tesla/cm"/>
</field>
</fields>
</lccdd> </lccdd>
compact/subsystem_views/pfrich_only.xml
View file @ 1008a184
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
The ip6 (or other ip) defines should be included first. The ip6 (or other ip) defines should be included first.
These files have only a define tags. These files have only a define tags.
</documentation> </documentation>
<include ref="ip6/ip6_defs.xml" /> <include ref="ip6/definitions.xml" />
<include ref="ip6/far_forward_fields_275.xml" /> <include ref="ip6/far_forward/fields_275.xml" />
<include ref="compact/definitions.xml" /> <include ref="compact/definitions.xml" />
</define> </define>
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
<documentation level="10"> <documentation level="10">
## pfRICH only ## pfRICH only
</documentation> </documentation>
<include ref="ip6/beampipe.xml" /> <include ref="ip6/central_beampipe.xml" />
<include ref="compact/pfrich.xml" /> <include ref="compact/pfrich.xml" />
</lccdd> </lccdd>
compact/subsystem_views/pid_only.xml
View file @ 1008a184
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
The ip6 (or other ip) defines should be included first. The ip6 (or other ip) defines should be included first.
These files have only a define tags. These files have only a define tags.
</documentation> </documentation>
<include ref="ip6/ip6_defs.xml" /> <include ref="ip6/definitions.xml" />
<include ref="ip6/far_forward_fields_275.xml" /> <include ref="ip6/far_forward/fields_275.xml" />
<include ref="compact/definitions.xml" /> <include ref="compact/definitions.xml" />
</define> </define>
...@@ -86,16 +86,7 @@ ...@@ -86,16 +86,7 @@
Beamline elements Beamline elements
----------------- -----------------
</comment> </comment>
<include ref="ip6/beampipe.xml" /> <include ref="ip6/central_beampipe.xml" />
<comment>
Main magnet
-----------
Note: When changing magnet, also select dimensions in definitions.xml.
</comment>
<documentation level="10">
## Central tracking detectors
</documentation>
<comment> <comment>
PID detectors PID detectors
...@@ -103,77 +94,6 @@ ...@@ -103,77 +94,6 @@
</comment> </comment>
<include ref="compact/pid_config_deathvalley.xml"/> <include ref="compact/pid_config_deathvalley.xml"/>
<comment>
FF elements
-----------
</comment>
<fields>
<field name="B0PF_Magnet" type="MultipoleMagnet">
<position x="B0PF_XPosition" y="0" z="B0PF_CenterPosition"/>
<rotation x="0" y="B0PF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="B0PF_InnerRadius" dz="B0PF_Length*0.5"/>
<coefficient coefficient="B0PF_Bmax" skew="0.0*tesla"/>
<!--<coefficient coefficient="2.0*tesla/cm" skew="0.2*tesla/cm"/> -->
</field>
<field name="B0APF_Magnet" type="MultipoleMagnet">
<position x="B0APF_XPosition" y="0" z="B0APF_CenterPosition"/>
<rotation x="0" y="B0APF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="B0APF_InnerRadius" dz="B0APF_Length*0.5"/>
<coefficient coefficient="B0APF_Bmax" skew="0.0*tesla"/>
<!--<coefficient coefficient="2.0*tesla/cm" skew="0.2*tesla/cm"/> -->
</field>
<field name="Q1APF_Magnet" type="MultipoleMagnet">
<position x="Q1APF_XPosition" y="0" z="Q1APF_CenterPosition"/>
<rotation x="0" y="Q1APF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="Q1APF_InnerRadius" dz="Q1APF_Length*0.5"/>
<coefficient coefficient="Q1APF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="Q1APF_GradientMax" skew="0.0*tesla/cm"/>
</field>
<field name="Q1BPF_Magnet" type="MultipoleMagnet">
<position x="Q1BPF_XPosition" y="0" z="Q1BPF_CenterPosition"/>
<rotation x="0" y="Q1BPF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="Q1BPF_InnerRadius" dz="Q1BPF_Length*0.5"/>
<coefficient coefficient="Q1BPF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="Q1BPF_GradientMax" skew="0.0*tesla/cm"/>
</field>
<field name="Q2PF_Magnet" type="MultipoleMagnet">
<position x="Q2PF_XPosition" y="0" z="Q2PF_CenterPosition"/>
<rotation x="0" y="Q2PF_RotationAngle" z="pi/2.0"/>
<shape type="Tube" rmin="0.0" rmax="Q2PF_InnerRadius" dz="Q2PF_Length*0.5"/>
<coefficient coefficient="Q2PF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="Q2PF_GradientMax" skew="0.0*tesla/cm"/>
</field>
<field name="B1PF_Magnet" type="MultipoleMagnet">
<position x="B1PF_XPosition" y="0" z="B1PF_CenterPosition"/>
<rotation x="0" y="B1PF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="B1PF_InnerRadius" dz="B1PF_Length*0.5"/>
<coefficient coefficient="B1PF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="B1PF_GradientMax" skew="0.0*tesla/cm"/>
</field>
<field name="B1APF_Magnet" type="MultipoleMagnet">
<position x="B1APF_XPosition" y="0" z="B1APF_CenterPosition"/>
<rotation x="0" y="B1APF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="B1APF_InnerRadius" dz="B1APF_Length*0.5"/>
<coefficient coefficient="B1APF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="B1APF_GradientMax" skew="0.0*tesla/cm"/>
</field>
<field name="B2PF_Magnet" type="MultipoleMagnet">
<position x="B2PF_XPosition" y="0" z="B2PF_CenterPosition"/>
<rotation x="0" y="B2PF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="B2PF_InnerRadius" dz="B2PF_Length*0.5"/>
<coefficient coefficient="B2PF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="B2PF_GradientMax" skew="0.0*tesla/cm"/>
</field>
</fields>
<comment>
FB elements
-----------
None (TODO)
</comment>
<readouts> <readouts>
</readouts> </readouts>
......
compact/subsystem_views/tof_only.xml
View file @ 1008a184
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
The ip6 (or other ip) defines should be included first. The ip6 (or other ip) defines should be included first.
These files have only a define tags. These files have only a define tags.
</documentation> </documentation>
<include ref="ip6/ip6_defs.xml" /> <include ref="ip6/definitions.xml" />
<include ref="ip6/far_forward_fields_275.xml" /> <include ref="ip6/far_forward/fields_275.xml" />
<include ref="compact/definitions.xml" /> <include ref="compact/definitions.xml" />
</define> </define>
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
<documentation level="10"> <documentation level="10">
## TOF only ## TOF only
</documentation> </documentation>
<include ref="ip6/beampipe.xml" /> <include ref="ip6/central_beampipe.xml" />
<include ref="compact/tof_barrel.xml" /> <include ref="compact/tof_barrel.xml" />
</lccdd> </lccdd>
compact/subsystem_views/tracking_only.xml
View file @ 1008a184
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
The ip6 (or other ip) defines should be included first. The ip6 (or other ip) defines should be included first.
These files have only a define tags. These files have only a define tags.
</documentation> </documentation>
<include ref="ip6/ip6_defs.xml" /> <include ref="ip6/definitions.xml" />
<include ref="ip6/far_forward_fields_275.xml" /> <include ref="ip6/far_forward/fields_275.xml" />
<include ref="compact/definitions.xml" /> <include ref="compact/definitions.xml" />
</define> </define>
...@@ -86,14 +86,7 @@ ...@@ -86,14 +86,7 @@
Beamline elements Beamline elements
----------------- -----------------
</comment> </comment>
<include ref="ip6/beampipe.xml" /> <include ref="ip6/central_beampipe.xml" />
<comment>
Main magnet
-----------
Note: When changing magnet, also select dimensions in definitions.xml.
</comment>
<!--include ref="compact/solenoid.xml"/-->
<comment> <comment>
Central tracking detectors Central tracking detectors
...@@ -102,74 +95,11 @@ ...@@ -102,74 +95,11 @@
<!--include ref="compact/tracking_config_canyonlands.xml"/--> <!--include ref="compact/tracking_config_canyonlands.xml"/-->
<include ref="compact/tracking_config_deathvalley.xml"/> <include ref="compact/tracking_config_deathvalley.xml"/>
<comment>
PID detectors PID detectors
------------- -------------
<include ref="compact/tof_barrel.xml"/>
<fields>
<field name="B0PF_Magnet" type="MultipoleMagnet">
<position x="B0PF_XPosition" y="0" z="B0PF_CenterPosition"/>
<rotation x="0" y="B0PF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="B0PF_InnerRadius" dz="B0PF_Length*0.5"/>
<coefficient coefficient="B0PF_Bmax" skew="0.0*tesla"/>
<!--<coefficient coefficient="2.0*tesla/cm" skew="0.2*tesla/cm"/> -->
</field>
<field name="B0APF_Magnet" type="MultipoleMagnet">
<position x="B0APF_XPosition" y="0" z="B0APF_CenterPosition"/>
<rotation x="0" y="B0APF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="B0APF_InnerRadius" dz="B0APF_Length*0.5"/>
<coefficient coefficient="B0APF_Bmax" skew="0.0*tesla"/>
<!--<coefficient coefficient="2.0*tesla/cm" skew="0.2*tesla/cm"/> -->
</field>
<field name="Q1APF_Magnet" type="MultipoleMagnet">
<position x="Q1APF_XPosition" y="0" z="Q1APF_CenterPosition"/>
<rotation x="0" y="Q1APF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="Q1APF_InnerRadius" dz="Q1APF_Length*0.5"/>
<coefficient coefficient="Q1APF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="Q1APF_GradientMax" skew="0.0*tesla/cm"/>
</field>
<field name="Q1BPF_Magnet" type="MultipoleMagnet">
<position x="Q1BPF_XPosition" y="0" z="Q1BPF_CenterPosition"/>
<rotation x="0" y="Q1BPF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="Q1BPF_InnerRadius" dz="Q1BPF_Length*0.5"/>
<coefficient coefficient="Q1BPF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="Q1BPF_GradientMax" skew="0.0*tesla/cm"/>
</field>
<field name="Q2PF_Magnet" type="MultipoleMagnet">
<position x="Q2PF_XPosition" y="0" z="Q2PF_CenterPosition"/>
<rotation x="0" y="Q2PF_RotationAngle" z="pi/2.0"/>
<shape type="Tube" rmin="0.0" rmax="Q2PF_InnerRadius" dz="Q2PF_Length*0.5"/>
<coefficient coefficient="Q2PF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="Q2PF_GradientMax" skew="0.0*tesla/cm"/>
</field>
<field name="B1PF_Magnet" type="MultipoleMagnet">
<position x="B1PF_XPosition" y="0" z="B1PF_CenterPosition"/>
<rotation x="0" y="B1PF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="B1PF_InnerRadius" dz="B1PF_Length*0.5"/>
<coefficient coefficient="B1PF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="B1PF_GradientMax" skew="0.0*tesla/cm"/>
</field>
<field name="B1APF_Magnet" type="MultipoleMagnet">
<position x="B1APF_XPosition" y="0" z="B1APF_CenterPosition"/>
<rotation x="0" y="B1APF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="B1APF_InnerRadius" dz="B1APF_Length*0.5"/>
<coefficient coefficient="B1APF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="B1APF_GradientMax" skew="0.0*tesla/cm"/>
</field>
<field name="B2PF_Magnet" type="MultipoleMagnet">
<position x="B2PF_XPosition" y="0" z="B2PF_CenterPosition"/>
<rotation x="0" y="B2PF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="B2PF_InnerRadius" dz="B2PF_Length*0.5"/>
<coefficient coefficient="B2PF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="B2PF_GradientMax" skew="0.0*tesla/cm"/>
</field>
</fields>
<comment>
FB elements
-----------
None (TODO)
</comment> </comment>
<include ref="compact/tof_barrel.xml"/>
<readouts> <readouts>
</readouts> </readouts>
......
compact/subsystem_views/vertex_only.xml
View file @ 1008a184
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
The ip6 (or other ip) defines should be included first. The ip6 (or other ip) defines should be included first.
These files have only a define tags. These files have only a define tags.
</documentation> </documentation>
<include ref="ip6/ip6_defs.xml" /> <include ref="ip6/definitions.xml" />
<include ref="ip6/far_forward_fields_275.xml" /> <include ref="ip6/far_forward/fields_275.xml" />
<include ref="compact/definitions.xml" /> <include ref="compact/definitions.xml" />
</define> </define>
...@@ -82,95 +82,12 @@ ...@@ -82,95 +82,12 @@
- and more... - and more...
</documentation> </documentation>
<comment>
Beamline elements
-----------------
</comment>
<comment>
Main magnet
-----------
Note: When changing magnet, also select dimensions in definitions.xml.
</comment>
<!--include ref="compact/solenoid.xml"/-->
<comment> <comment>
Central tracking detectors Central tracking detectors
-------------------------- --------------------------
</comment> </comment>
<include ref="compact/vertex_tracker_3layers.xml"/> <include ref="compact/vertex_tracker_3layers.xml"/>
<comment>
PID detectors
-------------
</comment>
<fields>
<field name="B0PF_Magnet" type="MultipoleMagnet">
<position x="B0PF_XPosition" y="0" z="B0PF_CenterPosition"/>
<rotation x="0" y="B0PF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="B0PF_InnerRadius" dz="B0PF_Length*0.5"/>
<coefficient coefficient="B0PF_Bmax" skew="0.0*tesla"/>
<!--<coefficient coefficient="2.0*tesla/cm" skew="0.2*tesla/cm"/> -->
</field>
<field name="B0APF_Magnet" type="MultipoleMagnet">
<position x="B0APF_XPosition" y="0" z="B0APF_CenterPosition"/>
<rotation x="0" y="B0APF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="B0APF_InnerRadius" dz="B0APF_Length*0.5"/>
<coefficient coefficient="B0APF_Bmax" skew="0.0*tesla"/>
<!--<coefficient coefficient="2.0*tesla/cm" skew="0.2*tesla/cm"/> -->
</field>
<field name="Q1APF_Magnet" type="MultipoleMagnet">
<position x="Q1APF_XPosition" y="0" z="Q1APF_CenterPosition"/>
<rotation x="0" y="Q1APF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="Q1APF_InnerRadius" dz="Q1APF_Length*0.5"/>
<coefficient coefficient="Q1APF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="Q1APF_GradientMax" skew="0.0*tesla/cm"/>
</field>
<field name="Q1BPF_Magnet" type="MultipoleMagnet">
<position x="Q1BPF_XPosition" y="0" z="Q1BPF_CenterPosition"/>
<rotation x="0" y="Q1BPF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="Q1BPF_InnerRadius" dz="Q1BPF_Length*0.5"/>
<coefficient coefficient="Q1BPF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="Q1BPF_GradientMax" skew="0.0*tesla/cm"/>
</field>
<field name="Q2PF_Magnet" type="MultipoleMagnet">
<position x="Q2PF_XPosition" y="0" z="Q2PF_CenterPosition"/>
<rotation x="0" y="Q2PF_RotationAngle" z="pi/2.0"/>
<shape type="Tube" rmin="0.0" rmax="Q2PF_InnerRadius" dz="Q2PF_Length*0.5"/>
<coefficient coefficient="Q2PF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="Q2PF_GradientMax" skew="0.0*tesla/cm"/>
</field>
<field name="B1PF_Magnet" type="MultipoleMagnet">
<position x="B1PF_XPosition" y="0" z="B1PF_CenterPosition"/>
<rotation x="0" y="B1PF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="B1PF_InnerRadius" dz="B1PF_Length*0.5"/>
<coefficient coefficient="B1PF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="B1PF_GradientMax" skew="0.0*tesla/cm"/>
</field>
<field name="B1APF_Magnet" type="MultipoleMagnet">
<position x="B1APF_XPosition" y="0" z="B1APF_CenterPosition"/>
<rotation x="0" y="B1APF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="B1APF_InnerRadius" dz="B1APF_Length*0.5"/>
<coefficient coefficient="B1APF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="B1APF_GradientMax" skew="0.0*tesla/cm"/>
</field>
<field name="B2PF_Magnet" type="MultipoleMagnet">
<position x="B2PF_XPosition" y="0" z="B2PF_CenterPosition"/>
<rotation x="0" y="B2PF_RotationAngle" z="0"/>
<shape type="Tube" rmin="0.0" rmax="B2PF_InnerRadius" dz="B2PF_Length*0.5"/>
<coefficient coefficient="B2PF_Bmax" skew="0.0*tesla"/>
<coefficient coefficient="B2PF_GradientMax" skew="0.0*tesla/cm"/>
</field>
</fields>
<comment>
FB elements
-----------
None (TODO)
</comment>
<readouts> <readouts>
</readouts> </readouts>
......
src/BarrelBarDetectorWithSideFrame_geo.cpp
View file @ 1008a184
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include "DDRec/DetectorData.h" #include "DDRec/DetectorData.h"
#include "DDRec/Surface.h" #include "DDRec/Surface.h"
#include "XML/Layering.h" #include "XML/Layering.h"
#include <array>
using namespace std; using namespace std;
using namespace dd4hep; using namespace dd4hep;
......
src/BarrelTrackerWithFrame_geo.cpp
View file @ 1008a184
...@@ -13,10 +13,15 @@ ...@@ -13,10 +13,15 @@
#include "DDRec/DetectorData.h" #include "DDRec/DetectorData.h"
#include "XML/Layering.h" #include "XML/Layering.h"
#include "XML/Utilities.h" #include "XML/Utilities.h"
#include <array>
#if defined(USE_ACTSDD4HEP)
#include "ActsDD4hep/ActsExtension.hpp"
#include "ActsDD4hep/ConvertMaterial.hpp"
#else
#include "Acts/Plugins/DD4hep/ActsExtension.hpp" #include "Acts/Plugins/DD4hep/ActsExtension.hpp"
#include "Acts/Plugins/DD4hep/ConvertDD4hepMaterial.hpp" #include "Acts/Plugins/DD4hep/ConvertDD4hepMaterial.hpp"
#endif
using namespace std; using namespace std;
using namespace dd4hep; using namespace dd4hep;
......
src/CompositeTracker_geo.cpp
View file @ 1008a184
...@@ -11,7 +11,11 @@ ...@@ -11,7 +11,11 @@
#include "DD4hep/Printout.h" #include "DD4hep/Printout.h"
#include "XML/Utilities.h" #include "XML/Utilities.h"
#if defined(USE_ACTSDD4HEP)
#include "ActsDD4hep/ActsExtension.hpp"
#else
#include "Acts/Plugins/DD4hep/ActsExtension.hpp" #include "Acts/Plugins/DD4hep/ActsExtension.hpp"
#endif
using namespace dd4hep; using namespace dd4hep;
using namespace dd4hep::detail; using namespace dd4hep::detail;
......
src/CylinderTrackerBarrel_geo.cpp
View file @ 1008a184
...@@ -2,11 +2,17 @@ ...@@ -2,11 +2,17 @@
// Specialized generic detector constructor // Specialized generic detector constructor
//========================================================================== //==========================================================================
#include "Acts/Plugins/DD4hep/ActsExtension.hpp"
#include "Acts/Plugins/DD4hep/ConvertDD4hepMaterial.hpp"
#include "DD4hep/DetFactoryHelper.h" #include "DD4hep/DetFactoryHelper.h"
#include "DD4hep/Printout.h" #include "DD4hep/Printout.h"
#if defined(USE_ACTSDD4HEP)
#include "ActsDD4hep/ActsExtension.hpp"
#include "ActsDD4hep/ConvertMaterial.hpp"
#else
#include "Acts/Plugins/DD4hep/ActsExtension.hpp"
#include "Acts/Plugins/DD4hep/ConvertDD4hepMaterial.hpp"
#endif
using namespace std; using namespace std;
using namespace dd4hep; using namespace dd4hep;
using namespace dd4hep::detail; using namespace dd4hep::detail;
......
src/FieldMapBrBz.cpp
View file @ 1008a184
...@@ -195,7 +195,7 @@ static Ref_t create_field_map_brbz(Detector & /*lcdd*/, xml::Handle_t handle) ...@@ -195,7 +195,7 @@ static Ref_t create_field_map_brbz(Detector & /*lcdd*/, xml::Handle_t handle)
if( !fs::exists(fs::path(field_map_file)) ) { if( !fs::exists(fs::path(field_map_file)) ) {
printout(ERROR, "FieldMapBrBz", "file " + field_map_file + " does not exist"); printout(ERROR, "FieldMapBrBz", "file " + field_map_file + " does not exist");
printout(ERROR, "FieldMapBrBz", "use a FileLoader plugin before the field element"); printout(ERROR, "FieldMapBrBz", "use a FileLoader plugin before the field element");
std::quick_exit(1); std::_Exit(EXIT_FAILURE);
} }
auto map = new FieldMapBrBz(field_type); auto map = new FieldMapBrBz(field_type);
......