Conversation
…eometry - Comment out tracker virtual detectors in VirtualDetectorMaker.cc - Add hasProtonAbsorber check in constructStoppingTarget.cc for safety - Add geom_run1_b_v01.txt with Run1B configuration - Disable TSdA, set Coll51 to DSVacuum material
- Disable proton absorber, STM, TSdA for Run1B configuration - Place tracker and calorimeter in DS2Vacuum with extended DS2 length (3646 mm) - Disable service pipes and rails to prevent DS3Vacuum overlaps - Fix StoppingTargetMother radius calculation using std::max for proper containment - Adjust bearing blocks: reduce size by 70% and move radially outward to ±550mm - Increase tracker mother half-length to 1640mm to contain end rings - Set Coll51 material to DSVacuum and disable TSdA - Re-enable virtual detectors and fix virtual detector placement logic - Add gdmldump_run1_b_v01.fcl for geometry validation All geometry overlaps resolved: 0 overlaps detected in final validation.
let some gdml fail, but don't fail the build
allow some gdml combinations to fail
changed EventDisplay to allow Run1b geometry
Optionally produce the EWM as well as the event header
Run 1B: Merge main into Run 1B
Merge pull request #1693 from michaelmackenzie/EWMFromCFO
new virtual detectors
Add geom_run1_b_v02: TSdA poly absorber behind ST
Remerge main into Run1B branch
Merge main to Run1B
Remerge main into Run1B
Run1B: Merge main
Add v40 Run 1B config
Add flexibility to add configuration changes for Run 1B targets
Overlap fixes
Add back services and normal DS volume
Resolve `main` → `Run1B` merge conflicts for PR #1847
|
Hi @oksuzian,
which require these tests: build. @Mu2e/fnalbuild-users, @Mu2e/write have access to CI actions on main. ⌛ The following tests have been triggered for 813ecd1: build (Build queue - API unavailable) |
|
☀️ The build tests passed at 813ecd1.
N.B. These results were obtained from a build of this Pull Request at 813ecd1 after being merged into the base branch at 83b5e2f. For more information, please check the job page here. |
michaelmackenzie
left a comment
michaelmackenzie
left a comment
There was a problem hiding this comment.
By eye it's hard to really review this large of a diff and be confident that it doesn't change the nominal running. I commented on a couple of items I notice though. As virtual detectors have been added, this will likely change the simulation results such that comparisons would probably need high statistics and distribution shape comparisons to ensure they're correct. We could try doing a gdml dump on main and here, and looking to see if any volumes change between the two versions?
| // | ||
|
|
||
| #include "Offline/Mu2eG4/geom/geom_run1_a_stickman.txt" | ||
| #include "Offline/Mu2eG4/geom/geom_run1_b_v01.txt" |
There was a problem hiding this comment.
We shouldn't change the default geometry
| // Set stopping target position AFTER calorimeter configuration | ||
| double stoppingTarget.z0InMu2e = 4185; | ||
| vector<double> stoppingTarget.radii = {600.00}; | ||
| // Set position of EMC Source Virtual Detectors |
There was a problem hiding this comment.
Should these be in all Run 1B geometry files?
| ds2centerInMu2e, 0, targetOffset+shift); | ||
|
|
||
| // VD EMC_Source is placed inside DS2 in front of the tracker | ||
| const double zVDcenterInMu2e = c.getDouble("zEMCSourceInMu2e",5300.); |
There was a problem hiding this comment.
I don't know if we should have default z values for these
| if ( _config.getBool("inGaragePosition",false) ) theDS3 = "garageFakeDS3Vacuum"; | ||
|
|
||
| VolumeInfo const & parent = _helper->locateVolInfo(theDS3); | ||
| VolumeInfo const & parent = ( _config.getBool("isDumbbell",false) ) ? |
There was a problem hiding this comment.
It seems like this is a case I missed when fixing these parent volume changes? This should probably be doing the tracker in DS2 check
No description provided.