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

Revert "Resolve "Implement new hybrid tracker"" 

This reverts commit e98b896c
parent e98b896c
No related branches found
No related tags found
1 merge request!270Revert "Resolve "Implement new hybrid tracker""
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 612 additions and 1621 deletions
.gitignore
+ 0
− 2
View file @ 17f8395a
...@@ -25,5 +25,3 @@ ip6 ...@@ -25,5 +25,3 @@ ip6
fieldmaps fieldmaps
manifest.txt manifest.txt
acts.txt
acts2.txt
.gitlab-ci.yml
+ 1
− 1
View file @ 17f8395a
...@@ -145,7 +145,7 @@ dump_geometry: ...@@ -145,7 +145,7 @@ dump_geometry:
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
echo " - Subsystem view for `basename $xml .xml` at:" echo " - Subsystem view for `basename $xml .xml` at:"
echo " https://eic.phy.anl.gov/geoviewer/index.htm?file=https://eicweb.phy.anl.gov/EIC/detectors/athena/-/jobs/${CI_JOB_ID}/artifacts/raw/geo/${geo_name}?job=dump_geometry&item=default;1&opt=clipxy;transp30;zoom75;ROTY290;ROTZ350;trz0;trr0;ctrl;all&" echo " https://eic.phy.anl.gov/geoviewer/index.htm?file=https://eicweb.phy.anl.gov/EIC/detectors/athena/-/jobs/${CI_JOB_ID}/artifacts/raw/geo/${geo_name}?job=dump_geometry&item=default;1&opt=clipxyz;transp30;zoom75;ROTY290;ROTZ350;trz0;trr0;ctrl;all&"
done done
detector_documentation: detector_documentation:
......
CMakeLists.txt
+ 0
− 1
View file @ 17f8395a
...@@ -30,7 +30,6 @@ dd4hep_add_plugin(${a_lib_name} SOURCES ...@@ -30,7 +30,6 @@ dd4hep_add_plugin(${a_lib_name} SOURCES
src/BarrelCalorimeterHybrid_geo.cpp src/BarrelCalorimeterHybrid_geo.cpp
src/BarrelCalorimeterInterlayers_geo.cpp src/BarrelCalorimeterInterlayers_geo.cpp
src/BarrelTrackerWithFrame_geo.cpp src/BarrelTrackerWithFrame_geo.cpp
src/CompositeTracker_geo.cpp
src/CylinderTrackerBarrel_geo.cpp src/CylinderTrackerBarrel_geo.cpp
src/DIRC_geo.cpp src/DIRC_geo.cpp
src/DRich_geo.cpp src/DRich_geo.cpp
......
athena.xml
+ 68
− 4
View file @ 17f8395a
...@@ -102,18 +102,81 @@ ...@@ -102,18 +102,81 @@
</documentation> </documentation>
<include ref="compact/solenoid.xml"/> <include ref="compact/solenoid.xml"/>
<documentation level="5">
### Tracker subassemblies for ACTS
</documentation>
<detectors>
<detector id="VertexBarrelSubAssembly_ID"
name="VertexBarrelSubAssembly"
type="DD4hep_SubdetectorAssembly"
vis="TrackerSubAssemblyVis">
<composite name="VertexBarrel" />
</detector>
<detector id="VertexEndcapSubAssembly_ID"
name="VertexEndcapSubAssembly"
type="DD4hep_SubdetectorAssembly"
vis="TrackerSubAssemblyVis">
<composite name="VertexEndcapN" />
<composite name="VertexEndcapP" />
</detector>
<detector id="TrackerBarrelSubAssembly_Inner_ID"
name="TrackerBarrelSubAssembly_Inner"
type="DD4hep_SubdetectorAssembly"
vis="TrackerSubAssemblyVis">
<composite name="TrackerBarrel_Inner"/>
</detector>
<detector id="TrackerEndcapSubAssembly_Inner_ID"
name="TrackerEndcapSubAssembly_Inner"
type="DD4hep_SubdetectorAssembly"
vis="TrackerSubAssemblyVis">
<composite name="TrackerEndcapN_Inner"/>
<composite name="TrackerEndcapP_Inner"/>
</detector>
<detector id="TrackerBarrelSubAssembly_Outer_ID"
name="TrackerSubAssembly_Outer"
type="DD4hep_SubdetectorAssembly"
vis="TrackerSubAssemblyVis">
<composite name="TrackerBarrel_Outer"/>
<composite name="TrackerEndcapP_Outer"/>
<composite name="TrackerEndcapN_Outer"/>
</detector>
<comment>
TOF disabled for baseline
<detector id="OuterTrackingSubAssembly_ID"
name="OuterTrackingSubAssembly"
type="DD4hep_SubdetectorAssembly"
vis="TOFSubAssemblyVis">
<composite name="BarrelTOF"/>
<composite name="ForwardTOF"/>
<composite name="BackwardTOF"/>
</detector>
</comment>
<detector id="OuterTrackingSubAssembly_ID"
name="OuterTrackingSubAssembly"
type="DD4hep_SubdetectorAssembly"
vis="SubAssemblyVis">
<composite name="GEMTrackerEndcapP"/>
<composite name="GEMTrackerEndcapN"/>
</detector>
</detectors>
<documentation level="10"> <documentation level="10">
## Central tracking detectors ## Central tracking detectors
</documentation> </documentation>
<!--include ref="compact/tracking_config_acadia.xml"/--> <include ref="compact/tracking_config_acadia.xml"/>
<include ref="compact/tracking_config_canyonlands.xml"/>
<!--include ref="compact/tracking_config_mgpds.xml"/-->
<documentation level="10"> <documentation level="10">
### PID detectors ### PID detectors
</documentation> </documentation>
<!--include ref="compact/pid_config_acadia.xml" /--> <include ref="compact/pid_config_acadia.xml" />
<include ref="compact/pid_config_canyonlands.xml" />
<documentation level="10"> <documentation level="10">
## Central calorimetry ## Central calorimetry
...@@ -121,6 +184,7 @@ ...@@ -121,6 +184,7 @@
<include ref="compact/ecal.xml"/> <include ref="compact/ecal.xml"/>
<include ref="compact/hcal.xml"/> <include ref="compact/hcal.xml"/>
<documentation level="11"> <documentation level="11">
## Far foward detectors ## Far foward detectors
</documentation> </documentation>
......
compact/central_tracker.xml
+ 15
− 19
View file @ 17f8395a
...@@ -27,10 +27,6 @@ total X0 0.24% per disk layer （4 sectors per disk): ...@@ -27,10 +27,6 @@ total X0 0.24% per disk layer （4 sectors per disk):
</documentation> </documentation>
<define> <define>
<constant name="CentralTrackerSensor_thickness" value="40*um"/>
<constant name="TrackerCarbon_thickness" value="0.12*mm"/>
<constant name="TrackerEndcapAluminum_thickness" value="0.15*mm"/>
<comment> <comment>
Layer_rOffset is used to add inside space so the _rmin value is the nominal sensor radius. Layer_rOffset is used to add inside space so the _rmin value is the nominal sensor radius.
TrackerBarrelSpaceFrame_height must be smaller than {_rmin2 - _rmin1 - Layer_rOffset - 1mm - stave_thickness} TrackerBarrelSpaceFrame_height must be smaller than {_rmin2 - _rmin1 - Layer_rOffset - 1mm - stave_thickness}
...@@ -39,7 +35,7 @@ total X0 0.24% per disk layer （4 sectors per disk): ...@@ -39,7 +35,7 @@ total X0 0.24% per disk layer （4 sectors per disk):
<constant name="TrackerBarrelLayer_rOffset" value="0.5*cm"/> <constant name="TrackerBarrelLayer_rOffset" value="0.5*cm"/>
<constant name="TrackerBarrelSpaceFrame_width" value="4.0*cm"/> <constant name="TrackerBarrelSpaceFrame_width" value="4.0*cm"/>
<constant name="TrackerBarrelSpaceFrame_height" value="1.0*cm"/> <constant name="TrackerBarrelSpaceFrame_height" value="1.0*cm"/>
<constant name="TrackerSensor_thickness" value="CentralTrackerSensor_thickness"/> <constant name="TrackerSensor_thickness" value="ITS3Thickness"/>
<constant name="TrackerBarrelInner_rmin1" value="21.0*cm"/> <constant name="TrackerBarrelInner_rmin1" value="21.0*cm"/>
<constant name="TrackerBarrelInner_rmin2" value="22.68*cm"/> <constant name="TrackerBarrelInner_rmin2" value="22.68*cm"/>
...@@ -159,7 +155,7 @@ total X0 0.24% per disk layer （4 sectors per disk): ...@@ -159,7 +155,7 @@ total X0 0.24% per disk layer （4 sectors per disk):
</comment> </comment>
<detector <detector
id="TrackerBarrel_0_ID" id="TrackerBarrel_Inner_ID"
name="TrackerBarrel_Inner" name="TrackerBarrel_Inner"
type="athena_TrackerBarrel" type="athena_TrackerBarrel"
readout="TrackerBarrelHits" readout="TrackerBarrelHits"
...@@ -223,7 +219,7 @@ total X0 0.24% per disk layer （4 sectors per disk): ...@@ -223,7 +219,7 @@ total X0 0.24% per disk layer （4 sectors per disk):
</detector> </detector>
<detector <detector
id="TrackerEndcapP_0_ID" id="TrackerEndcapP_Inner_ID"
name="TrackerEndcapP_Inner" name="TrackerEndcapP_Inner"
type="athena_TrapEndcapTracker" type="athena_TrapEndcapTracker"
readout="TrackerEndcapHits" readout="TrackerEndcapHits"
...@@ -245,7 +241,7 @@ total X0 0.24% per disk layer （4 sectors per disk): ...@@ -245,7 +241,7 @@ total X0 0.24% per disk layer （4 sectors per disk):
<module name="Module1" vis="AnlProcess_Blue"> <module name="Module1" vis="AnlProcess_Blue">
<trd x1="TrackerEndcapInnerMod1_x1/2.0" x2="TrackerEndcapInnerMod1_x2/2.0" z="TrackerEndcapInnerMod1_y/2"/> <trd x1="TrackerEndcapInnerMod1_x1/2.0" x2="TrackerEndcapInnerMod1_x2/2.0" z="TrackerEndcapInnerMod1_y/2"/>
<module_component thickness="CentralTrackerSensor_thickness" material="Silicon" sensitive="true"/> <module_component thickness="ITS3Thickness" material="Silicon" sensitive="true"/>
<module_component thickness="TrackerEndcapAluminum_thickness" material="Aluminum"/> <module_component thickness="TrackerEndcapAluminum_thickness" material="Aluminum"/>
<module_component thickness="TrackerCarbon_thickness" material="CarbonFiber"/> <module_component thickness="TrackerCarbon_thickness" material="CarbonFiber"/>
</module> </module>
...@@ -264,7 +260,7 @@ total X0 0.24% per disk layer （4 sectors per disk): ...@@ -264,7 +260,7 @@ total X0 0.24% per disk layer （4 sectors per disk):
</detector> </detector>
<detector <detector
id="TrackerEndcapN_0_ID" id="TrackerEndcapN_Inner_ID"
name="TrackerEndcapN_Inner" name="TrackerEndcapN_Inner"
type="athena_TrapEndcapTracker" type="athena_TrapEndcapTracker"
readout="TrackerEndcapHits" readout="TrackerEndcapHits"
...@@ -286,7 +282,7 @@ total X0 0.24% per disk layer （4 sectors per disk): ...@@ -286,7 +282,7 @@ total X0 0.24% per disk layer （4 sectors per disk):
<module name="Module1" vis="AnlProcess_Blue"> <module name="Module1" vis="AnlProcess_Blue">
<trd x1="TrackerEndcapInnerMod1_x1/2.0" x2="TrackerEndcapInnerMod1_x2/2.0" z="TrackerEndcapInnerMod1_y/2"/> <trd x1="TrackerEndcapInnerMod1_x1/2.0" x2="TrackerEndcapInnerMod1_x2/2.0" z="TrackerEndcapInnerMod1_y/2"/>
<module_component thickness="CentralTrackerSensor_thickness" material="Silicon" sensitive="true"/> <module_component thickness="ITS3Thickness" material="Silicon" sensitive="true"/>
<module_component thickness="TrackerEndcapAluminum_thickness" material="Aluminum"/> <module_component thickness="TrackerEndcapAluminum_thickness" material="Aluminum"/>
<module_component thickness="TrackerCarbon_thickness" material="CarbonFiber"/> <module_component thickness="TrackerCarbon_thickness" material="CarbonFiber"/>
</module> </module>
...@@ -310,7 +306,7 @@ total X0 0.24% per disk layer （4 sectors per disk): ...@@ -310,7 +306,7 @@ total X0 0.24% per disk layer （4 sectors per disk):
----------------------------------- -----------------------------------
</comment> </comment>
<detector <detector
id="TrackerBarrel_1_ID" id="TrackerBarrel_Outer_ID"
name="TrackerBarrel_Outer" name="TrackerBarrel_Outer"
type="athena_TrackerBarrel" type="athena_TrackerBarrel"
readout="TrackerBarrelHits" readout="TrackerBarrelHits"
...@@ -374,7 +370,7 @@ total X0 0.24% per disk layer （4 sectors per disk): ...@@ -374,7 +370,7 @@ total X0 0.24% per disk layer （4 sectors per disk):
</detector> </detector>
<detector <detector
id="TrackerEndcapP_1_ID" id="TrackerEndcapP_Outer_ID"
name="TrackerEndcapP_Outer" name="TrackerEndcapP_Outer"
type="athena_TrapEndcapTracker" type="athena_TrapEndcapTracker"
readout="TrackerEndcapHits" readout="TrackerEndcapHits"
...@@ -403,19 +399,19 @@ total X0 0.24% per disk layer （4 sectors per disk): ...@@ -403,19 +399,19 @@ total X0 0.24% per disk layer （4 sectors per disk):
<module name="Module1" vis="AnlProcess_Blue"> <module name="Module1" vis="AnlProcess_Blue">
<trd x1="TrackerEndcapOuterMod1_x1/2.0" x2="TrackerEndcapOuterMod1_x2/2.0" z="TrackerEndcapOuterMod1_y/2"/> <trd x1="TrackerEndcapOuterMod1_x1/2.0" x2="TrackerEndcapOuterMod1_x2/2.0" z="TrackerEndcapOuterMod1_y/2"/>
<module_component thickness="CentralTrackerSensor_thickness" material="Silicon" sensitive="true"/> <module_component thickness="ITS3Thickness" material="Silicon" sensitive="true"/>
<module_component thickness="TrackerEndcapAluminum_thickness" material="Aluminum"/> <module_component thickness="TrackerEndcapAluminum_thickness" material="Aluminum"/>
<module_component thickness="TrackerCarbon_thickness" material="CarbonFiber"/> <module_component thickness="TrackerCarbon_thickness" material="CarbonFiber"/>
</module> </module>
<module name="Module2" vis="AnlProcess_Blue"> <module name="Module2" vis="AnlProcess_Blue">
<trd x1="TrackerEndcapOuterMod2_x1/2.0" x2="TrackerEndcapOuterMod2_x2/2.0" z="TrackerEndcapOuterMod2_y/2"/> <trd x1="TrackerEndcapOuterMod2_x1/2.0" x2="TrackerEndcapOuterMod2_x2/2.0" z="TrackerEndcapOuterMod2_y/2"/>
<module_component thickness="CentralTrackerSensor_thickness" material="Silicon" sensitive="true"/> <module_component thickness="ITS3Thickness" material="Silicon" sensitive="true"/>
<module_component thickness="TrackerEndcapAluminum_thickness" material="Aluminum"/> <module_component thickness="TrackerEndcapAluminum_thickness" material="Aluminum"/>
<module_component thickness="TrackerCarbon_thickness" material="CarbonFiber"/> <module_component thickness="TrackerCarbon_thickness" material="CarbonFiber"/>
</module> </module>
<module name="Module3" vis="AnlProcess_Blue"> <module name="Module3" vis="AnlProcess_Blue">
<trd x1="TrackerEndcapOuterMod3_x1/2.0" x2="TrackerEndcapOuterMod3_x2/2.0" z="TrackerEndcapOuterMod3_y/2"/> <trd x1="TrackerEndcapOuterMod3_x1/2.0" x2="TrackerEndcapOuterMod3_x2/2.0" z="TrackerEndcapOuterMod3_y/2"/>
<module_component thickness="CentralTrackerSensor_thickness" material="Silicon" sensitive="true"/> <module_component thickness="ITS3Thickness" material="Silicon" sensitive="true"/>
<module_component thickness="TrackerEndcapAluminum_thickness" material="Aluminum"/> <module_component thickness="TrackerEndcapAluminum_thickness" material="Aluminum"/>
<module_component thickness="TrackerCarbon_thickness" material="CarbonFiber"/> <module_component thickness="TrackerCarbon_thickness" material="CarbonFiber"/>
</module> </module>
...@@ -458,7 +454,7 @@ total X0 0.24% per disk layer （4 sectors per disk): ...@@ -458,7 +454,7 @@ total X0 0.24% per disk layer （4 sectors per disk):
</detector> </detector>
<detector <detector
id="TrackerEndcapN_1_ID" id="TrackerEndcapN_Outer_ID"
name="TrackerEndcapN_Outer" name="TrackerEndcapN_Outer"
type="athena_TrapEndcapTracker" type="athena_TrapEndcapTracker"
readout="TrackerEndcapHits" readout="TrackerEndcapHits"
...@@ -489,19 +485,19 @@ total X0 0.24% per disk layer （4 sectors per disk): ...@@ -489,19 +485,19 @@ total X0 0.24% per disk layer （4 sectors per disk):
<module name="Module1" vis="AnlProcess_Blue"> <module name="Module1" vis="AnlProcess_Blue">
<trd x1="TrackerEndcapOuterMod1_x1/2.0" x2="TrackerEndcapOuterMod1_x2/2.0" z="TrackerEndcapOuterMod1_y/2"/> <trd x1="TrackerEndcapOuterMod1_x1/2.0" x2="TrackerEndcapOuterMod1_x2/2.0" z="TrackerEndcapOuterMod1_y/2"/>
<module_component thickness="CentralTrackerSensor_thickness" material="Silicon" sensitive="true"/> <module_component thickness="ITS3Thickness" material="Silicon" sensitive="true"/>
<module_component thickness="TrackerEndcapAluminum_thickness" material="Aluminum"/> <module_component thickness="TrackerEndcapAluminum_thickness" material="Aluminum"/>
<module_component thickness="TrackerCarbon_thickness" material="CarbonFiber"/> <module_component thickness="TrackerCarbon_thickness" material="CarbonFiber"/>
</module> </module>
<module name="Module2" vis="AnlProcess_Blue"> <module name="Module2" vis="AnlProcess_Blue">
<trd x1="TrackerEndcapOuterMod2_x1/2.0" x2="TrackerEndcapOuterMod2_x2/2.0" z="TrackerEndcapOuterMod2_y/2"/> <trd x1="TrackerEndcapOuterMod2_x1/2.0" x2="TrackerEndcapOuterMod2_x2/2.0" z="TrackerEndcapOuterMod2_y/2"/>
<module_component thickness="CentralTrackerSensor_thickness" material="Silicon" sensitive="true"/> <module_component thickness="ITS3Thickness" material="Silicon" sensitive="true"/>
<module_component thickness="TrackerEndcapAluminum_thickness" material="Aluminum"/> <module_component thickness="TrackerEndcapAluminum_thickness" material="Aluminum"/>
<module_component thickness="TrackerCarbon_thickness" material="CarbonFiber"/> <module_component thickness="TrackerCarbon_thickness" material="CarbonFiber"/>
</module> </module>
<module name="Module3" vis="AnlProcess_Blue"> <module name="Module3" vis="AnlProcess_Blue">
<trd x1="TrackerEndcapOuterMod3_x1/2.0" x2="TrackerEndcapOuterMod3_x2/2.0" z="TrackerEndcapOuterMod3_y/2"/> <trd x1="TrackerEndcapOuterMod3_x1/2.0" x2="TrackerEndcapOuterMod3_x2/2.0" z="TrackerEndcapOuterMod3_y/2"/>
<module_component thickness="CentralTrackerSensor_thickness" material="Silicon" sensitive="true"/> <module_component thickness="ITS3Thickness" material="Silicon" sensitive="true"/>
<module_component thickness="TrackerEndcapAluminum_thickness" material="Aluminum"/> <module_component thickness="TrackerEndcapAluminum_thickness" material="Aluminum"/>
<module_component thickness="TrackerCarbon_thickness" material="CarbonFiber"/> <module_component thickness="TrackerCarbon_thickness" material="CarbonFiber"/>
</module> </module>
......
compact/central_tracker_hybrid_v2.xml deleted 100644 → 0
+ 0
− 1387
View file @ e98b896c
This diff is collapsed.
compact/definitions.xml
+ 152
− 146
View file @ 17f8395a
This diff is collapsed.
compact/display.xml
+ 1
− 6
View file @ 17f8395a
...@@ -10,15 +10,10 @@ ...@@ -10,15 +10,10 @@
<comment> <comment>
Tracking Visualizations Tracking Visualizations
</comment> </comment>
<vis name="TrackerVis" ref="AnlRed" /> <vis name="TrackerVis" ref="AnlRed" />
<vis name="TrackerSupportVis" ref="AnlBlue" visible="true" showDaughters="true" /> <vis name="TrackerSupportVis" ref="AnlBlue" visible="true" showDaughters="true" />
<vis name="TrackerServiceVis" ref="AnlGold" showDaughters="false" />
<vis name="TrackerLayerVis" ref="AnlGray" visible="true" showDaughters="true" /> <vis name="TrackerLayerVis" ref="AnlGray" visible="true" showDaughters="true" />
<vis name="TrackerModuleVis" ref="TrackerLayerVis" visible="true" showDaughters="false" /> <vis name="TrackerModuleVis" ref="TrackerLayerVis" visible="true" showDaughters="false" />
<vis name="TrackerMPGDVis" ref="AnlRed" visible="true" showDaughters="false" />
<comment> Visualization for Barrel MMGAS (apply to layers) and GEM endcap (apply to modules) </comment>
<vis name="TrackerGEMModuleVis" ref="TrackerMPGDVis" visible="true" showDaughters="false" />
<vis name="TrackerMMGASLayerVis" ref="TrackerMPGDVis" visible="true" showDaughters="false" />
<vis name="VertexSupportVis" ref="AnlBlue" showDaughters="false" /> <vis name="VertexSupportVis" ref="AnlBlue" showDaughters="false" />
<vis name="VertexLayerVis" ref="AnlGray" visible="true" showDaughters="true" /> <vis name="VertexLayerVis" ref="AnlGray" visible="true" showDaughters="true" />
......
compact/display_geoviewer.xml
+ 3
− 7
View file @ 17f8395a
...@@ -11,14 +11,10 @@ ...@@ -11,14 +11,10 @@
Tracking Visualizations Tracking Visualizations
</comment> </comment>
<vis name="TrackerVis" ref="AnlRed" /> <vis name="TrackerVis" ref="AnlRed" />
<vis name="TrackerSupportVis" ref="AnlBlue" visible="true" showDaughters="false" /> <vis name="TrackerSupportVis" ref="AnlBlue" visible="true" showDaughters="true" />
<vis name="TrackerServiceVis" ref="AnlGold" showDaughters="false" />
<vis name="TrackerLayerVis" ref="AnlGray" visible="true" showDaughters="true" /> <vis name="TrackerLayerVis" ref="AnlGray" visible="true" showDaughters="true" />
<vis name="TrackerSubassemblyVis" ref="TrackerLayerVis"/>
<vis name="TrackerModuleVis" ref="TrackerLayerVis" visible="true" showDaughters="true" /> <vis name="TrackerModuleVis" ref="TrackerLayerVis" visible="true" showDaughters="true" />
<vis name="TrackerMPGDVis" ref="AnlRed" visible="true" showDaughters="true" />
<comment> Simple visualization for Barrel MMGAS (apply to layers) and GEM endcap (apply to modules) for better performance </comment>
<vis name="TrackerGEMModuleVis" ref="TrackerMPGDVis" visible="true" showDaughters="false" />
<vis name="TrackerMMGASLayerVis" ref="TrackerMPGDVis" visible="true" showDaughters="false" />
<vis name="VertexSupportVis" ref="AnlBlue" visible="true" showDaughters="true" /> <vis name="VertexSupportVis" ref="AnlBlue" visible="true" showDaughters="true" />
<vis name="VertexLayerVis" ref="AnlGray" visible="true" showDaughters="true" /> <vis name="VertexLayerVis" ref="AnlGray" visible="true" showDaughters="true" />
...@@ -69,7 +65,7 @@ ...@@ -69,7 +65,7 @@
<vis name="RICHVis" ref="AnlTeal" showDaughters="true"/> <vis name="RICHVis" ref="AnlTeal" showDaughters="true"/>
<vis name="DIRCVis" ref="AnlTeal" showDaughters="true" visible="true"/> <vis name="DIRCVis" ref="AnlTeal" showDaughters="true" visible="true"/>
<vis name="DIRCLayerVis" ref="AnlTeal" showDaughters="true" visible="true"/> <vis name="DIRCLayerVis" ref="AnlTeal" showDaughters="false" visible="true"/>
<vis name="DIRCModuleVis" ref="AnlTeal" showDaughters="true" visible="true"/> <vis name="DIRCModuleVis" ref="AnlTeal" showDaughters="true" visible="true"/>
<vis name="DIRCSupportVis" ref="AnlTeal" showDaughters="true" visible="true"/> <vis name="DIRCSupportVis" ref="AnlTeal" showDaughters="true" visible="true"/>
<vis name="DIRCFrameVis" ref="AnlOrange" showDaughters="true" visible="true"/> <vis name="DIRCFrameVis" ref="AnlOrange" showDaughters="true" visible="true"/>
......
compact/drich.xml
+ 4
− 4
View file @ 17f8395a
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
<define> <define>
<!-- vessel (=snout+tank) geometry --> <!-- vessel (=snout+tank) geometry -->
<constant name="DRICH_zmin" value="ForwardPIDRegion_zmin"/> <!-- vessel front --> <constant name="DRICH_zmin" value="ForwardPID_zmin"/> <!-- vessel front -->
<constant name="DRICH_Length" value="ForwardPIDRegion_length"/> <!-- overall vessel length (including snout) --> <constant name="DRICH_Length" value="ForwardPID_length"/> <!-- overall vessel length (including snout) -->
<constant name="DRICH_rmin0" value="ForwardPIDRegion_rmin1"/> <!-- bore radius at dRICh vessel frontplane --> <constant name="DRICH_rmin0" value="ForwardPID_rmin1"/> <!-- bore radius at dRICh vessel frontplane -->
<constant name="DRICH_rmin1" value="ForwardPIDRegion_rmin2"/> <!-- bore radius at dRICh vessel backplane --> <constant name="DRICH_rmin1" value="ForwardPID_rmin2"/> <!-- bore radius at dRICh vessel backplane -->
<constant name="DRICH_wall_thickness" value="0.5*cm"/> <!-- thickness of radial walls --> <constant name="DRICH_wall_thickness" value="0.5*cm"/> <!-- thickness of radial walls -->
<constant name="DRICH_window_thickness" value="0.1*cm"/> <!-- thickness of entrance and exit walls --> <constant name="DRICH_window_thickness" value="0.1*cm"/> <!-- thickness of entrance and exit walls -->
<!-- tank geometry: cylinder, holding the majority of detector components --> <!-- tank geometry: cylinder, holding the majority of detector components -->
......
compact/ecal_barrel.xml
+ 1
− 1
View file @ 17f8395a
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<constant name="EcalBarrel_ModRepeat" value="CaloSides"/> <constant name="EcalBarrel_ModRepeat" value="CaloSides"/>
<constant name="EcalBarrel_ModLength" value="0.5*m"/> <constant name="EcalBarrel_ModLength" value="0.5*m"/>
<constant name="EcalBarrel_ModWidth" value="0.5*m"/> <constant name="EcalBarrel_ModWidth" value="0.5*m"/>
<constant name="EcalBarrel_AvailThickness" value="EcalBarrelRegion_thickness-EcalBarrel_Support_thickness"/> <constant name="EcalBarrel_AvailThickness" value="EcalBarrelEnvelope_thickness-EcalBarrel_Support_thickness"/>
<constant name="EcalBarrel_ReadoutLayerThickness" <constant name="EcalBarrel_ReadoutLayerThickness"
value="EcalBarrel_SiliconThickness value="EcalBarrel_SiliconThickness
+ EcalBarrel_ElectronicsThickness + EcalBarrel_ElectronicsThickness
......
compact/ecal_barrel_interlayers.xml
+ 1
− 1
View file @ 17f8395a
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<constant name="EcalBarrel_ModRepeat" value="CaloSides"/> <constant name="EcalBarrel_ModRepeat" value="CaloSides"/>
<constant name="EcalBarrel_ModLength" value="0.5*m"/> <constant name="EcalBarrel_ModLength" value="0.5*m"/>
<constant name="EcalBarrel_ModWidth" value="0.5*m"/> <constant name="EcalBarrel_ModWidth" value="0.5*m"/>
<constant name="EcalBarrel_AvailThickness" value="EcalBarrelRegion_thickness-EcalBarrel_Support_thickness"/> <constant name="EcalBarrel_AvailThickness" value="EcalBarrelEnvelope_thickness-EcalBarrel_Support_thickness"/>
<constant name="EcalBarrel_ImagingLayerThickness" <constant name="EcalBarrel_ImagingLayerThickness"
value="EcalBarrel_SiliconThickness value="EcalBarrel_SiliconThickness
......
compact/gem_tracker_endcap.xml
+ 7
− 7
View file @ 17f8395a
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
<comment> Endcap Tracker </comment> <comment> Endcap Tracker </comment>
<define> <define>
<constant name="GEMTrackerEndcapP_thickness" value="min(10.0*cm,ForwardTrackingRegion_length)" /> <constant name="GEMTrackerEndcapP_thickness" value="min(10.0*cm,ForwardTracking_length)" />
<constant name="GEMTrackerEndcapN_thickness" value="min(10.0*cm,BackwardTrackingRegion_length)" /> <constant name="GEMTrackerEndcapN_thickness" value="min(10.0*cm,BackwardTracking_length)" />
<constant name="GEMTrackerEndcapP_zmin" value="ForwardTrackingRegion_zmin"/> <constant name="GEMTrackerEndcapP_zmin" value="ForwardTracking_zmin"/>
<constant name="GEMTrackerEndcapN_zmin" value="BackwardTrackingRegion_zmin"/> <constant name="GEMTrackerEndcapN_zmin" value="BackwardTracking_zmin"/>
<constant name="GEMTrackerEndcapP_rmin" value="19*cm" /> <constant name="GEMTrackerEndcapP_rmin" value="19*cm" />
<constant name="GEMTrackerEndcapN_rmin" value="10*cm" /> <constant name="GEMTrackerEndcapN_rmin" value="10*cm" />
<constant name="GEMTrackerEndcapP_rmax" value="200*cm" /> <constant name="GEMTrackerEndcapP_rmax" value="200*cm" />
<constant name="GEMTrackerEndcapN_rmax" value="BackwardPIDRegion_rmax" /> <constant name="GEMTrackerEndcapN_rmax" value="BackwardPID_rmax" />
<constant name="GEMTrackerEndcapOpeningAngle" value="30.4*degree"/> <constant name="GEMTrackerEndcapOpeningAngle" value="30.4*degree"/>
<constant name="GEMTrackerEndcap_dz" value="15*mm" /> <constant name="GEMTrackerEndcap_dz" value="15*mm" />
<comment> <comment>
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
<detectors> <detectors>
<detector <detector
id="TrackerEndcapP_3_ID" id="GEMTrackerEndcapP_ID"
name="GEMTrackerEndcapP" name="GEMTrackerEndcapP"
type="athena_GEMTrackerEndcap" type="athena_GEMTrackerEndcap"
readout="GEMTrackerEndcapHits" readout="GEMTrackerEndcapHits"
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
</detector> </detector>
<detector <detector
id="TrackerEndcapN_3_ID" id="GEMTrackerEndcapN_ID"
name="GEMTrackerEndcapN" name="GEMTrackerEndcapN"
type="athena_GEMTrackerEndcap" type="athena_GEMTrackerEndcap"
readout="GEMTrackerEndcapHits" readout="GEMTrackerEndcapHits"
......
compact/materials.xml
+ 0
− 19
View file @ 17f8395a
...@@ -318,23 +318,4 @@ ...@@ -318,23 +318,4 @@
<composite n="8" ref="C"/> <composite n="8" ref="C"/>
<composite n="8" ref="H"/> <composite n="8" ref="H"/>
</material> </material>
<material name="MMGAS_ResistivePaste">
<D type="density" unit="g/cm3" value="0.77906"/>
<composite n="1" ref="C"/>
</material>
<material name="MMGAS_InoxForMesh" state="solid">
<D type="density" unit="g/cm3" value="2.8548"/>
<fraction n="0.19" ref="Cr"/>
<fraction n="0.68" ref="Fe"/>
<fraction n="0.02" ref="Mn"/>
<fraction n="0.10" ref="Ni"/>
<fraction n="0.01" ref="Si"/>
</material>
<material name="Ar90IsoButane" state="gas">
<D type="density" unit="g/cm3" value="0.00170335"/>
<fraction n="0.90" ref="Ar"/>
<fraction n="0.0826586" ref="C"/>
<fraction n="0.0173414" ref="H"/>
</material>
</materials> </materials>
compact/mrich.xml
+ 3
− 3
View file @ 17f8395a
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
<comment> MRICH </comment> <comment> MRICH </comment>
<define> <define>
<constant name="MRICH_rmin" value="10*cm"/> <constant name="MRICH_rmin" value="10*cm"/>
<constant name="MRICH_rmax" value="BackwardPIDRegion_rmax"/> <constant name="MRICH_rmax" value="BackwardPID_rmax"/>
<constant name="MRICH_length" value="BackwardPIDRegion_length"/> <constant name="MRICH_length" value="BackwardPID_length"/>
<constant name="MRICH_zmin" value="BackwardPIDRegion_zmin"/> <constant name="MRICH_zmin" value="BackwardPID_zmin"/>
<constant name="MRICHAerogel_thickness" value="30.0*mm"/> <constant name="MRICHAerogel_thickness" value="30.0*mm"/>
<constant name="MRICHAerogel_width" value="126.5*mm"/> <constant name="MRICHAerogel_width" value="126.5*mm"/>
......
compact/mrich_alt.xml
+ 3
− 3
View file @ 17f8395a
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
<comment> MRICH (alternative design) </comment> <comment> MRICH (alternative design) </comment>
<define> <define>
<constant name="MRICH_rmin" value="10*cm"/> <constant name="MRICH_rmin" value="10*cm"/>
<constant name="MRICH_rmax" value="BackwardPIDRegion_rmax"/> <constant name="MRICH_rmax" value="BackwardPID_rmax"/>
<constant name="MRICH_length" value="BackwardPIDRegion_length"/> <constant name="MRICH_length" value="BackwardPID_length"/>
<constant name="MRICH_zmin" value="BackwardPIDRegion_zmin"/> <constant name="MRICH_zmin" value="BackwardPID_zmin"/>
<constant name="MRICHAerogel_thickness" value="30.0*mm"/> <constant name="MRICHAerogel_thickness" value="30.0*mm"/>
<constant name="MRICHAerogel_width" value="126.5*mm"/> <constant name="MRICHAerogel_width" value="126.5*mm"/>
......
compact/pid_config_canyonlands.xml deleted 100644 → 0
+ 0
− 8
View file @ e98b896c
<lccdd>
<include ref="fake_dirc.xml"/>
<!--include ref="dirc.xml"/-->
<!--include ref="mrich.xml"/-->
<include ref="drich.xml"/>
</lccdd>
compact/subsystem_views/calorimeters.xml
+ 44
− 0
View file @ 17f8395a
...@@ -97,6 +97,50 @@ ...@@ -97,6 +97,50 @@
</documentation> </documentation>
<include ref="compact/solenoid.xml"/> <include ref="compact/solenoid.xml"/>
<documentation level="5">
### Tracker subassemblies for ACTS
</documentation>
<detectors>
<detector id="VertexBarrelSubAssembly_ID"
name="VertexBarrelSubAssembly"
type="DD4hep_SubdetectorAssembly"
vis="TrackerSubAssemblyVis">
<composite name="VertexBarrel" />
</detector>
<detector id="VertexEndcapSubAssembly_ID"
name="VertexEndcapSubAssembly"
type="DD4hep_SubdetectorAssembly"
vis="TrackerSubAssemblyVis">
<composite name="VertexEndcapN" />
<composite name="VertexEndcapP" />
</detector>
<detector id="TrackerBarrelSubAssembly_Inner_ID"
name="TrackerBarrelSubAssembly_Inner"
type="DD4hep_SubdetectorAssembly"
vis="TrackerSubAssemblyVis">
<composite name="TrackerBarrel_Inner"/>
</detector>
<detector id="TrackerEndcapSubAssembly_Inner_ID"
name="TrackerEndcapSubAssembly_Inner"
type="DD4hep_SubdetectorAssembly"
vis="TrackerSubAssemblyVis">
<composite name="TrackerEndcapN_Inner"/>
<composite name="TrackerEndcapP_Inner"/>
</detector>
<detector id="TrackerBarrelSubAssembly_Outer_ID"
name="TrackerSubAssembly_Outer"
type="DD4hep_SubdetectorAssembly"
vis="TrackerSubAssemblyVis">
<composite name="TrackerBarrel_Outer"/>
<composite name="TrackerEndcapP_Outer"/>
<composite name="TrackerEndcapN_Outer"/>
</detector>
</detectors>
<documentation level="10"> <documentation level="10">
## Central calorimetry ## Central calorimetry
</documentation> </documentation>
......
compact/subsystem_views/inner_detector.xml
+ 67
− 2
View file @ 17f8395a
...@@ -96,16 +96,81 @@ ...@@ -96,16 +96,81 @@
Note: When changing magnet, also select dimensions in definitions.xml. Note: When changing magnet, also select dimensions in definitions.xml.
</documentation> </documentation>
<documentation level="5">
### Tracker subassemblies for ACTS
</documentation>
<detectors>
<detector id="VertexBarrelSubAssembly_ID"
name="VertexBarrelSubAssembly"
type="DD4hep_SubdetectorAssembly"
vis="TrackerSubAssemblyVis">
<composite name="VertexBarrel" />
</detector>
<detector id="VertexEndcapSubAssembly_ID"
name="VertexEndcapSubAssembly"
type="DD4hep_SubdetectorAssembly"
vis="TrackerSubAssemblyVis">
<composite name="VertexEndcapN" />
<composite name="VertexEndcapP" />
</detector>
<detector id="TrackerBarrelSubAssembly_Inner_ID"
name="TrackerBarrelSubAssembly_Inner"
type="DD4hep_SubdetectorAssembly"
vis="TrackerSubAssemblyVis">
<composite name="TrackerBarrel_Inner"/>
</detector>
<detector id="TrackerEndcapSubAssembly_Inner_ID"
name="TrackerEndcapSubAssembly_Inner"
type="DD4hep_SubdetectorAssembly"
vis="TrackerSubAssemblyVis">
<composite name="TrackerEndcapN_Inner"/>
<composite name="TrackerEndcapP_Inner"/>
</detector>
<detector id="TrackerBarrelSubAssembly_Outer_ID"
name="TrackerSubAssembly_Outer"
type="DD4hep_SubdetectorAssembly"
vis="TrackerSubAssemblyVis">
<composite name="TrackerBarrel_Outer"/>
<composite name="TrackerEndcapP_Outer"/>
<composite name="TrackerEndcapN_Outer"/>
</detector>
<comment>
TOF disabled for baseline
<detector id="OuterTrackingSubAssembly_ID"
name="OuterTrackingSubAssembly"
type="DD4hep_SubdetectorAssembly"
vis="TOFSubAssemblyVis">
<composite name="BarrelTOF"/>
<composite name="ForwardTOF"/>
<composite name="BackwardTOF"/>
</detector>
</comment>
<detector id="OuterTrackingSubAssembly_ID"
name="OuterTrackingSubAssembly"
type="DD4hep_SubdetectorAssembly"
vis="SubAssemblyVis">
<composite name="GEMTrackerEndcapP"/>
<composite name="GEMTrackerEndcapN"/>
</detector>
</detectors>
<documentation level="10"> <documentation level="10">
## Central tracking detectors ## Central tracking detectors
</documentation> </documentation>
<include ref="compact/tracking_config_canyonlands.xml"/> <include ref="compact/tracking_config_acadia.xml"/>
<!--include ref="compact/tracking_config_mgpds.xml"/-->
<documentation level="10"> <documentation level="10">
### PID detectors ### PID detectors
</documentation> </documentation>
<include ref="compact/pid_config_canyonlands.xml"/> <include ref="compact/pid_config_acadia.xml"/>
<documentation level="10"> <documentation level="10">
## Central calorimetry ## Central calorimetry
......
compact/subsystem_views/inner_tracking_only.xml 0 → 100644
+ 242
− 0
View file @ 17f8395a
<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
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>
<documentation level="2">
## Main Constant Definitions
The ip6 (or other ip) defines should be included first.
These files have only a define tags.
</documentation>
<include ref="ip6/ip6_defs.xml" />
<include ref="ip6/far_forward_fields_275.xml" />
<include ref="compact/definitions.xml" />
</define>
<includes>
<gdmlFile ref="compact/elements.xml"/>
<gdmlFile ref="compact/materials.xml"/>
<file ref="compact/optical_materials.xml"/>
</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>
<include ref="compact/colors.xml" />
<include ref="compact/display.xml" />
</display>
<documentation level="0">
## Detector Subsystems
### IP Subsystems
The interaction point subsystems are included before the central detector subsystems.
This is becuase the IP subsystems, for exmaple the beampipe, will define paramters
which are subsquently used in the central detector construction -- e.g. the vertex tracker
uses the beampipe OD to help define its placement.
The IP subsystems include the Far forward and backward regions. The list of subsystem includes:
- Interaction region beampipe
- B0 tracker
- Off-momentum tracker
- Far forward roman pots
- Zero Degree Calorimeter
- Beam line magnets.
- and more...
</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>
Tracker subassemblies for ACTS
------------------------------
</comment>
<detectors>
<detector id="VertexBarrelSubAssembly_ID"
name="VertexBarrelSubAssembly"
type="DD4hep_SubdetectorAssembly"
vis="TrackerSubAssemblyVis">
<composite name="VertexBarrel" />
</detector>
<detector id="VertexEndcapSubAssembly_ID"
name="VertexEndcapSubAssembly"
type="DD4hep_SubdetectorAssembly"
vis="TrackerSubAssemblyVis">
<composite name="VertexEndcapN" />
<composite name="VertexEndcapP" />
</detector>
<detector id="TrackerBarrelSubAssembly_Inner_ID"
name="TrackerBarrelSubAssembly_Inner"
type="DD4hep_SubdetectorAssembly"
vis="TrackerSubAssemblyVis">
<composite name="TrackerBarrel_Inner"/>
</detector>
<detector id="TrackerEndcapSubAssembly_Inner_ID"
name="TrackerEndcapSubAssembly_Inner"
type="DD4hep_SubdetectorAssembly"
vis="TrackerSubAssemblyVis">
<composite name="TrackerEndcapN_Inner"/>
<composite name="TrackerEndcapP_Inner"/>
</detector>
<detector id="TrackerBarrelSubAssembly_Outer_ID"
name="TrackerSubAssembly_Outer"
type="DD4hep_SubdetectorAssembly"
vis="TrackerSubAssemblyVis">
<composite name="TrackerBarrel_Outer"/>
<composite name="TrackerEndcapP_Outer"/>
<composite name="TrackerEndcapN_Outer"/>
</detector>
<comment>
TOF disabled for baseline
<detector id="OuterTrackingSubAssembly_ID"
name="OuterTrackingSubAssembly"
type="DD4hep_SubdetectorAssembly"
vis="TOFSubAssemblyVis">
<composite name="BarrelTOF"/>
<composite name="ForwardTOF"/>
<composite name="BackwardTOF"/>
</detector>
</comment>
<detector id="OuterTrackingSubAssembly_ID"
name="OuterTrackingSubAssembly"
type="DD4hep_SubdetectorAssembly"
vis="SubAssemblyVis">
<composite name="GEMTrackerEndcapP"/>
<composite name="GEMTrackerEndcapN"/>
</detector>
</detectors>
<comment>
Central tracking detectors
--------------------------
</comment>
<include ref="compact/vertex_tracker.xml"/>
<include ref="compact/central_tracker.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>
</lccdd>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment