Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nHCal fix rotated segmentation #748

Merged
merged 65 commits into from
Jun 21, 2024
Merged

nHCal fix rotated segmentation #748

Show file tree
Hide file tree
Changes from 61 commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
6a8f3db
Updated nHCal with segmentation based on STAR EEMC
lkosarz Sep 21, 2022
e22c942
Moved to other HcalEndcapN definitions
lkosarz Sep 25, 2022
b5e1f44
Placing fixed to HcalEndcapN
lkosarz Sep 25, 2022
b0cb821
Testing 12 bins in R (eta) for nHCal
lkosarz Sep 27, 2022
ef53f99
Merge branch 'main' of https://github.com/eic/epic.git into negative-…
lkosarz Sep 27, 2022
5f97a5b
First try of extrapolating tlie sizes
lkosarz Sep 30, 2022
11f5515
Updated extrapolated bins in R with a linear fit in eta
lkosarz Oct 2, 2022
fd739ee
Merge branch 'main' into negative-HCal-dev
wdconinc Oct 3, 2022
abe1c97
Update compact/definitions.xml
lkosarz Oct 4, 2022
d640e5b
Update compact/definitions.xml
lkosarz Oct 4, 2022
0073189
Updated number of bins in phi from 36x6*deg to 60x6*deg
lkosarz Oct 4, 2022
3cbf661
Merge branch 'negative-HCal-dev' of https://github.com/eic/epic.git i…
lkosarz Oct 4, 2022
2b5abcf
fix: extend HcalEndcapN r segments to rmin/rmax
wdconinc Oct 19, 2022
b84a517
Shrink nHCal size to the segmentation limits
lkosarz Oct 19, 2022
b0c37f7
Merge branch 'master' into hcal-backward-segmentation-r
lkosarz Oct 24, 2022
6c67e0b
Merge branch 'master' into negative-HCal-dev
lkosarz Oct 24, 2022
ef1052d
Merge branch 'hcal-backward-segmentation-r' into negative-HCal-dev
lkosarz Oct 24, 2022
c3b2710
Moved HcalEndcapN radii to hcal/hcal_backward.xml
lkosarz Oct 28, 2022
6f270f5
Added HcalEndcapN_rmin and HcalEndcapN_rmax to segmentation limits
lkosarz Oct 28, 2022
a4961f9
Moved nHCal dimensions defintions to compact file
lkosarz Oct 31, 2022
ca2a745
Added missing comment
lkosarz Oct 31, 2022
bb57fe2
Fix issue #277 - error due to hits hitting nHCal corners
lkosarz Nov 8, 2022
67e1157
Merge branch 'master' into hcal-backward-segmentation-r
lkosarz Nov 9, 2022
6487285
Merge branch 'hcal-backward-segmentation-r'
lkosarz Nov 15, 2022
623851d
Merge branch 'main' of https://github.com/eic/epic.git
lkosarz Nov 17, 2023
60391ad
Fix the zmin position of the nHCal with respect to service gap
lkosarz Dec 18, 2023
98c9a1f
Smal fix
lkosarz Dec 18, 2023
f1bd1ba
Changed order
lkosarz Dec 18, 2023
e164a39
Fix nHCal position to the back and add a 64 cm gap behind service gap
lkosarz Dec 18, 2023
87425b8
Merge branch 'nHCal-positionFix' of https://github.com/eic/epic.git i…
lkosarz Dec 18, 2023
dd544e0
Added backward endcap flux return steel (flux return, collar, oculus)
Dec 30, 2023
902fce4
Update name="FluxEndcapN_ID" to 117
Dec 30, 2023
391fd76
Corrected positions of flux return, collar and oculus
Dec 30, 2023
339d1c5
Adjusted mother endcapFlux mother volume to avoid overlaps
Jan 4, 2024
470aba4
Simplified the implementation - no overlaps.
Jan 5, 2024
45455f5
Merge branch 'main' into nHCal-positionFix
Jan 18, 2024
d5b8897
Moved flux return, collar and oculus dimensions to definitions
Jan 18, 2024
f3a0a28
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 22, 2024
0761d14
Removed detector ID for endcap flux return assembly
lkosarz Jan 23, 2024
c3bb87c
Merge branch 'nHCal-positionFix' of https://github.com/eic/epic.git i…
lkosarz Jan 23, 2024
3359b93
Added missing SPDX license
Jan 23, 2024
c9acf14
Update compact/definitions.xml
lkosarz Jan 23, 2024
5033d41
Update compact/display.xml
lkosarz Jan 23, 2024
db6c48f
Update compact/hcal/backward_endcap_flux.xml
lkosarz Jan 23, 2024
6d5b4cd
Update src/EndcapFluxReturn_geo.cpp
lkosarz Jan 23, 2024
e78ad4a
Update src/EndcapFluxReturn_geo.cpp
lkosarz Jan 23, 2024
a817e2f
Removed namespace declarations
Jan 23, 2024
659de79
Changed FluxEndcapN_zpos -> FluxEndcapN_zshift
Jan 23, 2024
1cab5d9
Added endcap flux return to more configurations
Jan 26, 2024
4086214
Update src/EndcapFluxReturn_geo.cpp
lkosarz Jan 29, 2024
94916d0
Update src/EndcapFluxReturn_geo.cpp
lkosarz Jan 29, 2024
c4228d8
Update src/EndcapFluxReturn_geo.cpp
lkosarz Jan 29, 2024
9681f9d
Update src/EndcapFluxReturn_geo.cpp
lkosarz Jan 29, 2024
29ac355
Update compact/hcal/backward_endcap_flux.xml
lkosarz Jan 29, 2024
04b78e9
Update compact/display.xml
lkosarz Jan 29, 2024
c2dc5b2
Rotated sensitive volumes to offset rotation of assembly and segmenta…
lkosarz Jun 18, 2024
891095f
Merge branch 'main' of https://github.com/eic/epic.git
lkosarz Jun 18, 2024
a6e2087
Merge branch 'main' into nHCal-positionFix
lkosarz Jun 18, 2024
920e850
added HCal only config
lkosarz Jun 18, 2024
2322756
Fix transform
lkosarz Jun 18, 2024
c05221a
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 20, 2024
7e1498f
Rename hcal_only.yml to backward_hcal_only.yml
Jun 20, 2024
46734ff
Rename hcal_only.yml to backward_hcal_only.yml
lkosarz Jun 20, 2024
f776083
Fix overlaps
Jun 20, 2024
9328e0a
Merge branch 'nHCal-positionFix' of https://github.com/eic/epic.git i…
Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions configurations/hcal_only.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
features:
lkosarz marked this conversation as resolved.
Show resolved Hide resolved
hcal:
backward:
backward_endcap_flux:
3 changes: 2 additions & 1 deletion src/PolyhedraEndcapCalorimeter2_geo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s

s_vol.setVisAttributes(description.visAttributes(x_slice.visStr()));
sliceZ += s_thick / 2;
PlacedVolume s_phv = l_vol.placeVolume(s_vol, Position(0, 0, sliceZ));
PlacedVolume s_phv = l_vol.placeVolume(
s_vol, Transform3D(RotationZYX(-M_PI / numsides, 0, 0), Position(0, 0, sliceZ)));
s_phv.addPhysVolID("slice", s_num);
if (x_slice.isSensitive()) {
sens.setType("calorimeter");
Expand Down
Loading