diff --git a/compact/subsystem_views/calorimeters.xml b/compact/subsystem_views/calorimeters.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8a04769e49849ff4675cd6204ee3cfa60ec74e35
--- /dev/null
+++ b/compact/subsystem_views/calorimeters.xml
@@ -0,0 +1,237 @@
+<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="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/colors2.xml"/-->
+ <include ref="compact/display.xml" />
+ <!--include ref="compact/display_detailed.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>
+
+ <documentation level="5">
+ ## Main magnet
+
+ Note: When changing magnet, also select dimensions in definitions.xml.
+ </documentation>
+ <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>
+
+ <detector id="TOFSubAssembly_ID"
+ name="TOFSubAssembly"
+ type="DD4hep_SubdetectorAssembly"
+ vis="TOFSubAssemblyVis">
+ <composite name="BarrelTOF"/>
+ <composite name="ForwardTOF"/>
+ <composite name="BackwardTOF"/>
+ </detector>
+
+ </detectors>
+
+
+ <documentation level="10">
+ ## Central calorimetry
+ </documentation>
+ <include ref="compact/ecal.xml"/>
+ <include ref="compact/hcal.xml"/>
+
+
+ <documentation level="11">
+ ## Far foward detectors
+ </documentation>
+ <include ref="ip6/B0_tracker.xml"/>
+ <include ref="ip6/B0_preshower.xml"/>
+ <include ref="ip6/far_forward_offM_tracker.xml"/>
+ <include ref="ip6/far_forward_detectors.xml"/>
+ <include ref="ip6/roman_pots_eRD24_design.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)
+
+ What is FB?
+ </comment>
+
+ <readouts>
+ </readouts>
+
+</lccdd>
diff --git a/views/view20.yml b/views/view20.yml
index d1d58ea5fd58b3d7b1387667b0e951a830ae5796..5436fc5765da2d1e6769b5621f3e3bad54d440f4 100644
--- a/views/view20.yml
+++ b/views/view20.yml
@@ -1,8 +1,8 @@
dawn_view_20:detector:
extends: .views
script:
- - cp "compact/subsystem_views/vertex_only.xml" "${DETECTOR_PATH}/."
- - ./bin/make_dawn_views -c ${DETECTOR_PATH}/vertex_only.xml -t vertex_only_view20 -d scripts/view20 -D
+ - cp "compact/subsystem_views/calorimeters.xml" "${DETECTOR_PATH}/."
+ - ./bin/make_dawn_views -c ${DETECTOR_PATH}/calorimeters.xml -t calorimeters_view20 -d scripts/view20 -D
dawn_view_20:ev001:
extends: .views
diff --git a/views/view3.yml b/views/view3.yml
index 4aef66f34d6fc6331629e241f32e12aec3645a8b..b31465676869a1559551f2305d3c4fe577b355a7 100644
--- a/views/view3.yml
+++ b/views/view3.yml
@@ -1,17 +1,17 @@
dawn_view_03:detector:
extends: .views
script:
- - ./bin/make_dawn_views -t view02 -d scripts/view2 -D
+ - ./bin/make_dawn_views -t view02 -d scripts/view3 -D
#dawn_view_03:ev001:
# extends: .views
# script:
-# - ./bin/make_dawn_views -t view02_ev001 -d scripts/view2 -s 1
+# - ./bin/make_dawn_views -t view02_ev001 -d scripts/view3 -s 1
dawn_view_03:ev002:
extends: .views
rules:
- if: '$DETECTOR_EVENT_VIEWS == "ON"'
script:
- - ./bin/make_dawn_views -t view02_ev002 -d scripts/view2 -s 2
+ - ./bin/make_dawn_views -t view02_ev002 -d scripts/view3 -s 2
view_03:
stage: test
diff --git a/views/view7.yml b/views/view7.yml
index c59d1a42bf31e965fe80e44cdfe38b49bedd7d74..444140dd36462c800e6abb1e6535b5417abd9f71 100644
--- a/views/view7.yml
+++ b/views/view7.yml
@@ -1,19 +1,19 @@
dawn_view_07:detector:
extends: .views
script:
- - ./bin/make_dawn_views -t view07 -d scripts/view2 -D
+ - ./bin/make_dawn_views -t view07 -d scripts/view7 -D
dawn_view_07:ev002:
extends: .views
rules:
- if: '$DETECTOR_EVENT_VIEWS == "ON"'
script:
- - ./bin/make_dawn_views -t view07_ev002 -d scripts/view2 -s 2
+ - ./bin/make_dawn_views -t view07_ev002 -d scripts/view7 -s 2
dawn_view_07:ev003:
extends: .views
rules:
- if: '$DETECTOR_EVENT_VIEWS == "ON"'
script:
- - ./bin/make_dawn_views -t view07_ev003 -d scripts/view2 -s 3
+ - ./bin/make_dawn_views -t view07_ev003 -d scripts/view7 -s 3
view_07:
stage: test