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

Origin/calo geom g4 update #1311

Open
wants to merge 14 commits into
base: main
Choose a base branch
from

Conversation

bechenard
Copy link
Contributor

Updated description of the calorimeter with latest geometry drawings. I changed the way the cable runs were coded to insulate the calorimeter from the rest of the DS vaccum. I also added support for realistic crystal placement and checks to avoid crystal overlaps.

@FNALbuild
Copy link
Collaborator

Hi @bechenard,
You have proposed changes to files in these packages:

  • GeometryService
  • Mu2eG4Helper
  • DetectorSolenoidGeom
  • Mu2eG4
  • CalorimeterGeom
  • Analyses

which require these tests: build.

@Mu2e/write, @Mu2e/fnalbuild-users have access to CI actions on main.

The following users requested to be notified about changes to these packages:
@resnegfk

⌛ The following tests have been triggered for d41d099: build (Build queue has 1 jobs)

About FNALbuild. Code review on Mu2e/Offline.

@FNALbuild
Copy link
Collaborator

☔ The build tests failed for d41d099.

Test Result Details
test with Command did not list any other PRs to include
merge Merged d41d099 at af80f04
build (prof) Log file. Build time: 04 min 12 sec
ceSimReco Log file. Return Code 1.
g4test_03MT Log file.
transportOnly Log file.
POT Log file.
g4study Log file.
cosmicSimReco Log file. Return Code 1.
cosmicOffSpill Log file.
ceSteps Log file. Return Code 1.
ceDigi Log file. Return Code 24.
muDauSteps Log file.
ceMix Log file. Return Code 24.
rootOverlaps Log file. Return Code 1.
g4surfaceCheck Log file. Return Code 0.
FIXME, TODO 🔶 TODO (0) FIXME (5) in 31 files
clang-tidy 🔶 0 errors 2434 warnings
whitespace check no whitespace errors found

N.B. These results were obtained from a build of this Pull Request at d41d099 after being merged into the base branch at af80f04.

For more information, please check the job page here.
Build artifacts are deleted after 5 days. If this is not desired, select Keep this build forever on the job page.

@kutschke
Copy link
Collaborator

@bechenard CalorimeterMother was originally defined as the volume that George allocated to the calorimeter. It was a way to enforce that the geometry was compliant with space allocations. Have things now changed so that some volumes (cable runs?) need to cross that boundary? If so, that's Ok but I want to make sure that the we are not getting rid of CalorimeterMother without a good reason.

@bechenard
Copy link
Contributor Author

bechenard commented Jul 16, 2024 via email

@kutschke
Copy link
Collaborator

HI Rob, The full CalorimeterMother volume interfered with the tracker cable run, and this made the implementation unnecessary complicated. Given the "weird" calo geometry, I split the mother volume into a disk mother volume, and a FEB mother volume. Both volume have the same z length as CalorimeterMother and the radial extent of the FEB mother volume matches that of the calorimeterMother. If you wish, I can group the the disk mother and FEB mother into a new calorimeter mother (as a combination of two volumes). Removing CalorimeterMother also crated some issues with the scripts, so adding one back would simplify tests. I;m also addressing the clang tidy warnings. Let me know if there is anything else I should address at the conceptual level.

The CalorimeterMother is also used to set UserLimits and some of the stepping cuts. It's referenced in some of the fcl in Production. At one time I think it was used as a stopping volume in the cosmic workflows but I think that's no longer true - check with Yuri and Ralf.

Your reason for removing it (volumes that need to cross it's boundaries ) is OK with me so long as you can manage all of the downstream effects.

About the clang tidy warnings - deal with the ones from your own code. Most will come from included headers - many of which I wrote.

@FNALbuild
Copy link
Collaborator

📝 The HEAD of main has changed to c98a795. Tests are now out of date.

@kutschke
Copy link
Collaborator

@FNALbuild run build test

@FNALbuild
Copy link
Collaborator

⌛ The following tests have been triggered for 8afaff6: build (Build queue has 1 jobs)

@FNALbuild
Copy link
Collaborator

☔ The build tests failed for 8afaff6.

Test Result Details
test with Command did not list any other PRs to include
merge Merged 8afaff6 at a597848
build (prof) Log file. Build time: 08 min 26 sec
ceSimReco Log file. Return Code 134.
g4test_03MT Log file.
transportOnly Log file.
POT Log file. Return Code 134.
g4study Log file.
cosmicSimReco Log file. Return Code 134.
cosmicOffSpill Log file.
ceSteps Log file. Return Code 134.
ceDigi Log file. Return Code 24.
muDauSteps Log file.
ceMix Log file. Return Code 24.
rootOverlaps Log file. Return Code 134.
g4surfaceCheck Log file. Return Code 134.
FIXME, TODO 🔶 TODO (0) FIXME (4) in 31 files
clang-tidy 🔶 0 errors 2268 warnings
whitespace check no whitespace errors found

N.B. These results were obtained from a build of this Pull Request at 8afaff6 after being merged into the base branch at a597848.

For more information, please check the job page here.
Build artifacts are deleted after 5 days. If this is not desired, select Keep this build forever on the job page.

@bechenard
Copy link
Contributor Author

@FNALbuild run build test

@FNALbuild
Copy link
Collaborator

⌛ The following tests have been triggered for 2f968ed: build (Build queue has 1 jobs)

@bechenard
Copy link
Contributor Author

@FNALbuild run build test

@FNALbuild
Copy link
Collaborator

⌛ The following tests have been triggered for d182db8: build (Build queue is empty)

@FNALbuild
Copy link
Collaborator

☀️ The build tests passed at d182db8.

Test Result Details
test with Command did not list any other PRs to include
merge Merged d182db8 at 2540af1
build (prof) Log file. Build time: 04 min 12 sec
ceSimReco Log file.
g4test_03MT Log file.
transportOnly Log file.
POT Log file.
g4study Log file.
cosmicSimReco Log file.
cosmicOffSpill Log file.
ceSteps Log file.
ceDigi Log file.
muDauSteps Log file.
ceMix Log file.
rootOverlaps Log file.
g4surfaceCheck Log file.
FIXME, TODO 🔶 TODO (4) FIXME (20) in 45 files
clang-tidy 🔶 0 errors 4974 warnings
whitespace check no whitespace errors found

N.B. These results were obtained from a build of this Pull Request at d182db8 after being merged into the base branch at 2540af1.

For more information, please check the job page here.
Build artifacts are deleted after 5 days. If this is not desired, select Keep this build forever on the job page.

@bechenard
Copy link
Contributor Author

@kutschke All good, ready to merge. It turns out it was more confusing to get all signed/unsigned rather than using to const_cast, so I kept all integers and added the const_cast. I need a few more GOTOs, but this is for another PR!

@kutschke
Copy link
Collaborator

@FNALbuild run build test

@FNALbuild
Copy link
Collaborator

⌛ The following tests have been triggered for d182db8: build (Build queue is empty)

@FNALbuild
Copy link
Collaborator

☀️ The build tests passed at d182db8.

Test Result Details
test with Command did not list any other PRs to include
merge Merged d182db8 at e8fecef
build (prof) Log file. Build time: 04 min 12 sec
ceSimReco Log file.
g4test_03MT Log file.
transportOnly Log file.
POT Log file.
g4study Log file.
cosmicSimReco Log file.
cosmicOffSpill Log file.
ceSteps Log file.
ceDigi Log file.
muDauSteps Log file.
ceMix Log file.
rootOverlaps Log file.
g4surfaceCheck Log file.
FIXME, TODO 🔶 TODO (4) FIXME (20) in 45 files
clang-tidy 🔶 0 errors 4974 warnings
whitespace check no whitespace errors found

N.B. These results were obtained from a build of this Pull Request at d182db8 after being merged into the base branch at e8fecef.

For more information, please check the job page here.
Build artifacts are deleted after 5 days. If this is not desired, select Keep this build forever on the job page.

@kutschke
Copy link
Collaborator

I did valCompare on reco_00.fcl + _01.fcl and on ceSimReco_00.fcl + _01.fcl . The results are at:

https://home.fnal.gov/~kutschke/Mu2e/PR1311/reco/results.html
https://home.fnal.gov/~kutschke/Mu2e/PR1311/ceSimReco/results.html

This is 2x the stats as before. Both look Ok to me. The reco input files are 4 files from dig.mu2e.CeEndpointMix1BBSignal.MDC2020r_best_v1_0 .

There are bigger changes in ceSimReco than in reco, presumably because of random number changes.

Bertrand: please let us know whether or not the comparisons pass your inspection.

@brownd1978
Copy link
Collaborator

brownd1978 commented Jul 29, 2024 via email

@kutschke
Copy link
Collaborator

I ask that merging be delayed until after that.

That's my plan.

@FNALbuild
Copy link
Collaborator

📝 The HEAD of main has changed to e389271. Tests are now out of date.

@brownd1978 brownd1978 assigned brownd1978 and unassigned kutschke Nov 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants