-
Notifications
You must be signed in to change notification settings - Fork 16
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
Iss1117 #1135
Conversation
Here's an incredibly 24.00 in the evening test that we are getting it right, adding: for (auto section{0}; section < num_sections_; ++section) {
std::cout << "Section: " << section_to_string({section, 1, 2})
<< std::endl;
for (auto layer{1}; layer <= num_layers_[section]; ++layer) {
if (section == 0) {
std::cout << "First layer has length: "
<< getScintillatorLength({section, layer, 0}) << "mm\n";
std::cout << "Alternate layer has length: "
<< getScintillatorLength({section, layer + 1, 0}) << "mm\n";
break;
} else {
int strip{0};
const ldmx::HcalID id{section, layer, strip};
std::cout << "Layer: " << layer << std::setw(2) << " has length "
<< getScintillatorLength(id) << "mm\n";
}
}
} at the bottom of the configure function gives: V13 geometry
V14 geometry
Prototype geometry
@cmantill to me the v14 ordering looks good, but its the kind of thing where having a second pair of eyes on would be good. Does the order of z vs x/y layers and the number of x/y layers per module look good? For the v13 geometry, I just dropped some dummy values for the side hcal length. Do you know what the actual lengths were @cmantill? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good! Small comments for documentation and hopefully v13 is right (is complicated so feel free to correct me)
Note: This does NOT change the values!
Ive edited the original post but since it is important i'm also noting here that the PR now includes two submodule PRs Related Sub-Module PRs |
Note: I think merging this can wait until we have more progress on #1136 since that will be a good opportunity to test the features. |
This sounds good to me. No reason to not integrate this. |
Ok, let's just wait for a check from @tomeichlersmith. I don 't think this needs to have a dedicated release be created, since I'd like to get #1136 in as well |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks good from my end :) thanks for reminding me @EinarElen
For merging, I would request that the submodule PRs are merged first, then this is updated to use those new commits on the submodule trunks. I'm away at conference/meeting this week - so feel free to poke me again next week if you need help going through that procedure.
Should be up now! |
I am updating ldmx-sw, here are the details.
What are the issues that this addresses?
This resolves #1117. This primarily means providing the length of a scintillator bar given an HcalID from the geometry condition. Since the side hcal for v14 has different length of bars depending on the layer number, this needs to be a function of both section and layer.
Example use would be
Check List
To check that these changes didn't change the output of the condition, I added the following to the end of configure step
I then ran this for the v13, v14, and prototype v2 geometries along the lines of
for both the iss1117 branch and trunk and then checked
diff v13_iss1117.txt v13_trunk.txt # etc
Related Sub-Module PRs
Not directly, but relevant for Improved Hcal scintillator simulation #1110 and new scintillator simulation #1349