Skip to content

Commit

Permalink
fix: arches should have no forward ecal or hcal inserts (#239)
Browse files Browse the repository at this point in the history
### Briefly, what does this PR introduce?
This removes the forward ecal and hcal inserts from the `arches`
configuration.

It also (necessarily) introduces different handling for the hcal
systems, which until now were all included through `hcal.xml`. That
didn't allow for different hcal configurations. Now all hcal components
are included directly from the `epic.xml.jinja2` template.

### What kind of change does this PR introduce?
- [X] Bug fix (issue: arches should not have inserts)
- [ ] New feature (issue #__)
- [ ] Documentation update
- [ ] Other: __

### Please check if this PR fulfills the following:
- [ ] Tests for the changes have been added
- [ ] Documentation has been added / updated
- [X] Changes have been communicated to collaborators
- @johnlajoie This may affect hcal barrel inclusion since it modifies
the jinja template which you were editing too.
  - @rymilton @sly2j As discussed on Mattermost.

### Does this PR introduce breaking changes? What changes might users
need to make to their code?
No.

### Does this PR change default behavior?
Yes, `arches` will have no more inserts. `brycecanyon` has inserts.
  • Loading branch information
wdconinc authored Oct 21, 2022
1 parent 7c782f7 commit 649c496
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 21 deletions.
19 changes: 0 additions & 19 deletions compact/hcal.xml

This file was deleted.

4 changes: 3 additions & 1 deletion configurations/arches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,13 @@ features:
ecal:
forward_scifi:
forward_homogeneous:
forward_insert:
barrel_sciglass:
backward_PbWO4:
solenoid:
hcal:
forward:
barrel:
backward:
farforward:
arches
farbackward:
4 changes: 4 additions & 0 deletions configurations/brycecanyon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ features:
backward_PbWO4:
solenoid:
hcal:
forward:
forward_insert:
barrel:
backward:
farforward:
brycecanyon
farbackward:
4 changes: 4 additions & 0 deletions configurations/calorimeters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@ features:
barrel_sciglass
backward_PbWO4
hcal:
forward:
forward_insert:
barrel:
backward:
4 changes: 4 additions & 0 deletions configurations/central.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,7 @@ features:
backward_PbWO4
solenoid:
hcal:
forward:
forward_insert:
barrel:
backward:
4 changes: 4 additions & 0 deletions configurations/full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,9 @@ features:
backward_PbWO4:
solenoid:
hcal:
forward:
forward_insert:
barrel:
backward:
farforward:
farbackward:
4 changes: 4 additions & 0 deletions configurations/imaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,9 @@ features:
backward_PbWO4:
solenoid:
hcal:
forward:
forward_insert:
barrel:
backward:
farforward:
farbackward:
4 changes: 4 additions & 0 deletions configurations/sciglass.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,9 @@ features:
backward_PbWO4:
solenoid:
hcal:
forward:
forward_insert:
barrel:
backward:
farforward:
farbackward:
16 changes: 15 additions & 1 deletion templates/epic.xml.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,21 @@
<documentation level="10">
## Central hadronic calorimetry
</documentation>
<include ref="${DETECTOR_PATH}/compact/hcal.xml"/>
{% if features is not defined or features['hcal'] is none or 'forward' in features['hcal'] %}
<include ref="${DETECTOR_PATH}/compact/hcal/hcal_forward.xml"/>
{% endif -%}

{% if features is not defined or features['hcal'] is none or 'forward_insert' in features['hcal'] %}
<include ref="${DETECTOR_PATH}/compact/hcal/hcal_forward_insert.xml"/>
{% endif -%}

{% if features is not defined or features['hcal'] is none or 'barrel' in features['hcal'] %}
<include ref="${DETECTOR_PATH}/compact/hcal/hcal_barrel.xml"/>
{% endif -%}

{% if features is not defined or features['hcal'] is none or 'backward' in features['hcal'] %}
<include ref="${DETECTOR_PATH}/compact/hcal/hcal_backward.xml"/>
{% endif -%}
{% endif -%}

{% if features is not defined or 'beampipe' in features %}
Expand Down

0 comments on commit 649c496

Please sign in to comment.