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.

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

Insert granularity #771

Merged
merged 33 commits into from
Aug 25, 2024
Merged

Insert granularity #771

merged 33 commits into from
Aug 25, 2024

Conversation

sebouh137
Copy link
Contributor

@sebouh137 sebouh137 commented Aug 20, 2024

multisegmentation for the insert

Briefly, what does this PR introduce?

Updates the segmentation for the insert so that it has 3 different segmentations:
~12cm2 in layers 1-16
~21 cm2 in layers 17-60 for the left side
~25 cm2 in layers 17-60 for the right side

What kind of change does this PR introduce?

  • Bug fix (issue #__)
  • New feature (issue #__)
  • Documentation update
  • Other: update on segmentation

Please check if this PR fulfills the following:

  • Tests for the changes have been added
  • Documentation has been added / updated
  • Changes have been communicated to collaborators

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

no

Does this PR change default behavior?

yes. different cell sizes in the calorimeter insert. Also a few minor changes: removed thinner front layer from the insert. Added gap between left and right sides. Adjusted the width and heights of the insert slightly.

sebouh137 and others added 2 commits August 20, 2024 16:18
@github-actions github-actions bot added topic: forward Positive-rapidity detectors (hadron-going side) topic: calorimetry labels Aug 20, 2024
@sebouh137 sebouh137 changed the title Update forward_insert.xml Insert granularity Aug 20, 2024
sebouh137 and others added 11 commits August 20, 2024 16:23
syntax error corrected
add gap between left and right sides of the detector.  This also allows separate segmentations on the left and right sides of the detector
updated documentation, also use 60 layers instead of 65
include "side" as an id field
sebouh137 and others added 4 commits August 20, 2024 19:27
Force Ecal insert to use "side" as a readout field, so that things don't crash.
fixed issue for subtraction volume.
@sebouh137 sebouh137 marked this pull request as ready for review August 21, 2024 00:57
refactoring the segmentation
…row and column numbers may need to be adjusted by integer offsets, and the margin between the LR edges of the detector and the corners of the hexagons have not been included yet
Copy link
Contributor

@rymilton rymilton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Edited some documentation and requested clarification in some parts. Overall it looks good, assuming that the segmentation you introduced behaves as expected like the plots you've shown before.

compact/ecal/forward_insert_homogeneous.xml Show resolved Hide resolved
compact/hcal/forward_insert.xml Outdated Show resolved Hide resolved
compact/hcal/forward_insert.xml Outdated Show resolved Hide resolved
compact/hcal/forward_insert.xml Outdated Show resolved Hide resolved
compact/hcal/forward_insert.xml Outdated Show resolved Hide resolved
compact/hcal/forward_insert.xml Show resolved Hide resolved
src/InsertCalorimeter_geo.cpp Outdated Show resolved Hide resolved
included left_right_gap in the forward_insert.xml
use same left right gap for the forward ecal insert as for the hcal insert (for now).
updated the gap to match the value in the xml
@sebouh137
Copy link
Contributor Author

Edited some documentation and requested clarification in some parts. Overall it looks good, assuming that the segmentation you introduced behaves as expected like the plots you've shown before.

thank!

@sebouh137
Copy link
Contributor Author

@rymilton Thanks for the feedback. If you are satisfied with my changes and responses, please approve. If you request futher changes, please let me know. Thanks

@rymilton
Copy link
Contributor

Thanks these changes look good. One more thing is that with your branch, I'm seeing this error when using EICrecon: Error in <TGeoVoxelFinder::SortAll>: Volume EcalEndcapPInsert: Cannot make slices on any axis, but I don't see it when using the main branch of epic. Can you reproduce this, and do you know what's causing this?

@sebouh137
Copy link
Contributor Author

Thanks these changes look good. One more thing is that with your branch, I'm seeing this error when using EICrecon: Error in <TGeoVoxelFinder::SortAll>: Volume EcalEndcapPInsert: Cannot make slices on any axis, but I don't see it when using the main branch of epic. Can you reproduce this, and do you know what's causing this?

I was getting the same errors, and I found that the fix for it is adding "side" to the fields in the CalorimeterHitsMerger_factory in FHCAL.cc . I am fixing this in eic/EICrecon#1595

    app->Add(new JOmniFactoryGeneratorT<CalorimeterHitsMerger_factory>(
      "HcalEndcapPInsertMergedHits", {"HcalEndcapPInsertRecHits"}, {"HcalEndcapPInsertMergedHits"},
      {
        .readout = "HcalEndcapPInsertHits",
        .fields = {"layer", "slice", "side"},
        .refs = {1, 0},
      },
      app   // TODO: Remove me once fixed
    ));

@rymilton
Copy link
Contributor

Alright, sounds good. I'll approve these changes then.

@sebouh137 sebouh137 added this pull request to the merge queue Aug 25, 2024
Merged via the queue into main with commit 5a7dd05 Aug 25, 2024
115 checks passed
@sebouh137 sebouh137 deleted the insert_multiseg branch August 25, 2024 23:13
github-merge-queue bot pushed a commit to eic/EICrecon that referenced this pull request Aug 27, 2024
…hold (#1595)

### Briefly, what does this PR introduce?
Uses a larger threshold for the distance between the neighboring hits in
the insert, due to the new cell size. Also include "side" field (ie,
left vs right) in the hit merger algorithm

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

### Please check if this PR fulfills the following:
- [X] Tests for the changes have been added
- [X] Documentation has been added / updated
- [X] Changes have been communicated to collaborators

### Does this PR introduce breaking changes? What changes might users
need to make to their code?
Probably. Including the detector "side" as a field in the hit merger
algorithm probably breaks the code if using a version of the epic
repository from before pull request eic/epic#771
is merged. Therefore this pull request and
eic/epic#771 should be merged at the same time
as one another
### Does this PR change default behavior?
yes. Changes the parameters of the topo clustering and also uses the
"side" field in the hit merger.

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Dmitry Kalinkin <[email protected]>
@veprbl veprbl added this to the 24.09.0 milestone Aug 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
topic: calorimetry topic: forward Positive-rapidity detectors (hadron-going side)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants