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

Updated default and backup STT geometry for SAND added. #34

Merged
merged 7 commits into from
Dec 10, 2024

Conversation

nibir98
Copy link
Member

@nibir98 nibir98 commented Nov 18, 2024

The updated, default and backup geometries are added as a standalone build.

build_hall.sh Outdated
duneggd/Config/SAND_MAGNET.cfg \
duneggd/Config/SAND_INNERVOLOPT_DefaultSTT.cfg \
duneggd/Config/SAND_ECAL.cfg \
duneggd/Config/SAND_STT/STT_Default.cfg \
Copy link
Member

Choose a reason for hiding this comment

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

You have this "default geometry", but it is not actually used in the default that is built when no argument is given to "build_hall.sh". If this is the default, then it should be used for the "prod" options. Currently, that is still using "STT1.cfg", whatever that is.

Copy link
Member Author

Choose a reason for hiding this comment

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

The default configuration, has some volume naming changes with some slight modifications. The sandreco package is sensitive to volume names. In order to not break the sandreco code due to volume name conflicts, this is not added as part of the prod geometries as we talked about sometime ago. Moreover after discussion we have decided to rename the argument in the build_hall.sh script as default -> complete, backup -> initial respectively.

# target
FrameThickness = Q("10cm")
AddGapForSlab = Q("7cm")
#targetThickness = {"CMod" : Q("4mm"), "C3H6Mod": Q("5mm"), "C3H6ModNoRad": Q("6.89mm"), "TrkMod":Q("0mm"), "TrkMod2lyr":Q("0mm")}
Copy link
Member

Choose a reason for hiding this comment

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

What is with these commented out configurations? We are using version control, so unless there is a very good reason, unused code should just be removed and not be left in as comments. Especially if there are no explanation in the comments why it is commented out.

Same in multiple places in the code.

Copy link
Member Author

Choose a reason for hiding this comment

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

The commented section is cleared now.

@@ -28,9 +28,13 @@ def build_tracker(self, main_lv, geom):
# if "STT" not in self.builders:
# print("STT builder not found")
# return
#print(self.builders)
Copy link
Member

Choose a reason for hiding this comment

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

See above comment about commented out code.

Copy link
Member Author

Choose a reason for hiding this comment

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

this has been cleared.

Copy link
Member

@ast0815 ast0815 left a comment

Choose a reason for hiding this comment

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

Ok, this looks fine to me. I just suggested a change to the changelog entry. Please check if this is acceptable.

Just be aware, that since your geometry changes are not part of the "production" detector hall geometry, they have not been tested by the CI for overlaps. You have to do that yourself with the included scripts.

When you have modified the changelog entry and are certain the geometry is correct, I am happy to merge this.

CHANGELOG.md Outdated
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to a modified version of [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
Geometry releases will be tagged as `Descriptive_tag_v_X.Y.Z`.

### Added

- Updated STT geometry with Default and Backup options. Can be built as a standalone geometry. `build_hall.sh only_sand_def_stt` `build_hall.sh only_sand_bck_stt`
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
- Updated STT geometry with Default and Backup options. Can be built as a standalone geometry. `build_hall.sh only_sand_def_stt` `build_hall.sh only_sand_bck_stt`
- Added STT geometry with Complete and Initial options. Can be built as a standalone geometry: `build_hall.sh only_sand_def_stt` `build_hall.sh only_sand_initial_stt`. Not yet part of the default "production" detector hall.

Copy link
Member Author

Choose a reason for hiding this comment

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

Updated the log file.

Copy link
Member Author

Choose a reason for hiding this comment

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

Updated to the makefile method from the build_hall.sh method

Copy link
Member

Choose a reason for hiding this comment

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

It looks like those changes are not actually reflected in the branch? Also, please put this "added" line under the "unreleased" section rather than putting it at the top of the file.

@ast0815
Copy link
Member

ast0815 commented Dec 5, 2024

Also, does this address any of the SAND-related issues in the issue tracker?

@ast0815
Copy link
Member

ast0815 commented Dec 5, 2024

I have changed the way we build the default geometries. They are now defined in a Makefile rather than a bash script. Could you pull those changes from master and add your new geometries as a target there?

CHANGELOG.md Outdated
## [Unreleased]

### Added
- Updated with standalone build of initial and complete STT configurations. `only_SAND_STT_Initial.gdml` `only_SAND_STT_Complete.gdml`
Copy link
Member

Choose a reason for hiding this comment

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

There is already an 'Added' subsection below. Please just add your line there.

duneggd/Config/SAND_STT/STT_Default.cfg \
duneggd/Config/SAND_GRAIN.cfg \


Copy link
Member

Choose a reason for hiding this comment

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

Could you please follow the indentation convention in this file and use a single tab character?

CHANGELOG.md Outdated
Comment on lines 9 to 10
### Added

Copy link
Member

Choose a reason for hiding this comment

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

These two lines should not be added.

@ast0815 ast0815 merged commit 7ed6d8a into master Dec 10, 2024
3 checks passed
@ast0815
Copy link
Member

ast0815 commented Dec 10, 2024

@nibir98 So, did this address any of the open issues in the repository related to SAND geometry?

@ast0815
Copy link
Member

ast0815 commented Dec 10, 2024

Also, can I delete this branch now?

@nibir98
Copy link
Member Author

nibir98 commented Dec 10, 2024

Hi Lukas, thanks for your help. The branch can be deleted.

@ast0815 ast0815 deleted the stt_opt_def_bck branch December 10, 2024 16:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants