-
Notifications
You must be signed in to change notification settings - Fork 102
Adding upper momentum cut in FilterStepPointMomentum to be used in co… #46
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,164 +1,9 @@ | ||
| // | ||
| // Top level geometry file first used in pass 2 of (stage 4 and after) of the CD3c simulation campagin. | ||
| // | ||
| // Warning: do not write 10000. as 10,000.; it will be read as two numbers (10., 0.). | ||
| // A geometry file for using all regular concrete shielding design. | ||
| // Most of the geometry is inherited from the existing shielding geometry, except as below. | ||
|
|
||
| string detector.name = "g4geom_v00"; | ||
|
|
||
| bool hasHall = true; | ||
| bool hasTarget = true; | ||
| bool hasProtonAbsorber = true; | ||
| bool hasTSdA = true; | ||
| bool hasExternalShielding = true; | ||
| bool hasDiskCalorimeter = true; | ||
| bool hasBFieldManager = true; | ||
| bool hasBeamline = true; | ||
| bool hasVirtualDetector = true; // some components, e.g. ProtonAbsorber assume vd presence now; | ||
| bool hasCosmicRayShield = true; | ||
| bool hasSTM = true; | ||
| bool hasMBS = true; // note the two subcomponents, see mbs section below; | ||
| // no MBS implies no downstream hole in Cosmic Ray Passive Shield | ||
| // Magnetic field may be affected as well | ||
|
|
||
| #include "Mu2eG4/geom/g4_visOptions.txt" | ||
|
|
||
| //------------------------------------------- | ||
| // Mu2e geometry includes | ||
| //------------------------------------------- | ||
|
|
||
| // X-offset of the PS(+x) and DS(-x) from the Mu2e origin. | ||
| // The origin of the detector coordinate system is on the DS axis at the specified z. | ||
| double mu2e.solenoidOffset = 3904.; // mm | ||
| double mu2e.detectorSystemZ0 = 10171.; // mm G4BL: (17730-7292=9801 mm) | ||
|
|
||
| #include "Mu2eG4/geom/mu2eWorld.txt" | ||
| // mu2eHall.txt should be used with protonBeamDump_v02.txt, below | ||
| //#include "Mu2eG4/geom/mu2eHall.txt" | ||
| // whereas mu2eHall_v02.txt should be used with protonBeamDump_v03.txt, below | ||
| #include "Mu2eG4/geom/mu2eHall_v02.txt" | ||
|
|
||
| // Solenoids | ||
| #include "Mu2eG4/geom/DetectorSolenoid_v03.txt" | ||
| #include "Mu2eG4/geom/DSShielding_v01.txt" | ||
| #include "Mu2eG4/geom/ProductionSolenoid_v02.txt" | ||
| #include "Mu2eG4/geom/psEnclosure_v04.txt" | ||
| #include "Mu2eG4/geom/PSShield_v06.txt" | ||
| #include "Mu2eG4/geom/PSExternalShielding_v01.txt" | ||
| #include "Mu2eG4/geom/TransportSolenoid_v03.txt" | ||
| // First, the base geometry to start from... | ||
| #include "Mu2eG4/geom/geom_common_current.txt" | ||
|
|
||
| // External Shielding | ||
| #include "Mu2eG4/geom/ExtShieldUpstream_v06.txt" | ||
| #include "Mu2eG4/geom/ExtShieldDownstream_v06.txt" | ||
| #include "Mu2eG4/geom/Saddle_v02.txt" | ||
| #include "Mu2eG4/geom/Pipe_v03.txt" | ||
| #include "Mu2eG4/geom/ElectronicRack_v01.txt" | ||
|
|
||
| //#include "Mu2eG4/geom/stoppingTarget_TDR.txt" // 17 foil tapered muon stopping target used for the TDR simulations | ||
| //#include "Mu2eG4/geom/stoppingTarget_CD3C_34foils.txt" // 34 foil muon stopping target to be used for the CDC3 simulations | ||
| #include "Mu2eG4/geom/stoppingTargetHoles_DOE_review_2017.txt" // 37 foil muon stopping target with holes | ||
|
|
||
| #include "Mu2eG4/geom/TSdA_v01.txt" | ||
| #include "Mu2eG4/geom/muonBeamStop_v05.txt" | ||
|
|
||
| //#include "Mu2eG4/geom/MSTM_v01.txt" // muon stopping target monitor (deprecated) | ||
| //#include "Mu2eG4/geom/STM_v01.txt" // (muon) stopping target monitor | ||
| //#include "Mu2eG4/geom/STM_v02.txt" // (muon) stopping target monitor | ||
| #include "Mu2eG4/geom/STM_v03.txt" // (muon) stopping target monitor | ||
|
|
||
| // Proton Absorber | ||
| #include "Mu2eG4/geom/protonAbsorber_cylindrical_v02.txt" | ||
| #include "Mu2eG4/geom/degrader_v01.txt" | ||
|
|
||
| #include "Mu2eG4/geom/ProductionTargetInPS.txt" | ||
| //#include "Mu2eG4/geom/protonBeamDump_v02.txt" | ||
| #include "Mu2eG4/geom/protonBeamDump_v03.txt" | ||
| #include "Mu2eG4/geom/extmon_fnal_v02.txt" | ||
|
|
||
| #include "Mu2eG4/geom/tracker_v5.txt" | ||
|
|
||
| // Crystal calorimeter | ||
| #include "Mu2eG4/geom/calorimeter_CsI.txt" | ||
|
|
||
| //CRV counters | ||
| #include "Mu2eG4/geom/crv_counters_v07.txt" | ||
|
|
||
|
|
||
| //------------------------------------------- | ||
| // Magnetic field | ||
| //------------------------------------------- | ||
|
|
||
| // Form of DS field: 0 is full field; | ||
| // 1 is full upstream, const downstream; | ||
| // 2 is const throughout | ||
| int detSolFieldForm = 0; | ||
| vector<string> bfield.innerMaps = { | ||
| "BFieldMaps/Mau13/DSMap.header", | ||
| "BFieldMaps/Mau13/PSMap.header", | ||
| "BFieldMaps/Mau13/TSuMap.header", | ||
| "BFieldMaps/Mau13/TSdMap.header", | ||
| "BFieldMaps/Mau13/PStoDumpAreaMap.header", | ||
| "BFieldMaps/Mau13/ProtonDumpAreaMap.header", | ||
| "BFieldMaps/Mau13/DSExtension.header" | ||
| }; | ||
|
|
||
| // Value of the uniform magnetic field with the DS volume (only for | ||
| // detSolFieldForm>0) | ||
| double toyDS.bz = 1.0; | ||
|
|
||
| // Gradient of field in DS2 volume. Applied only in the case | ||
| // of detSolFieldForm=1 or detSolFieldForm=2. | ||
| double toyDS.gradient = 0.0; // Tesla/m | ||
|
|
||
| // This is recommended field map. See geom_mecofield.txt to use the meco field. | ||
| string bfield.format = "G4BL"; | ||
|
|
||
| // The other option is "meco" | ||
| string bfield.interpolationStyle = trilinear; | ||
|
|
||
| int bfield.verbosityLevel = 0; | ||
| bool bfield.writeG4BLBinaries = false; | ||
|
|
||
| vector<string> bfield.outerMaps = { | ||
| "BFieldMaps/Mau9/ExtMonUCIInternal1AreaMap.header", | ||
| "BFieldMaps/Mau9/ExtMonUCIInternal2AreaMap.header", | ||
| "BFieldMaps/Mau9/ExtMonUCIAreaMap.header", | ||
| "BFieldMaps/Mau9/PSAreaMap.header" | ||
| }; | ||
|
|
||
| // This scale factor is of limited use. | ||
| // It can make approximate sense to scale the PS field to get a rough | ||
| // answer; the answer will be wrong in detail. | ||
| // It never makes sense to scale the TS field. | ||
| // Not sure if it ever makes sense to scale the PS field. | ||
| double bfield.scaleFactor = 1.0; | ||
|
|
||
| //--------------------------------------- | ||
| // Virtual detectors | ||
| //--------------------------------------- | ||
| double vd.halfLength = 0.01; //mm | ||
| int vd.verbosityLevel = 0; | ||
| bool vd.visible = true; | ||
| bool vd.solid = false; | ||
|
|
||
| // // VD right in front of a hall wall | ||
| // double vd.ExtMonCommonPlane.z = -11999.99; | ||
|
|
||
|
|
||
| //--------------------------------------- | ||
| // Region visualization | ||
| //--------------------------------------- | ||
| #include "Mu2eG4/geom/visualization_regions.txt" | ||
|
|
||
|
|
||
| // | ||
| // | ||
| // End notes: | ||
| // | ||
| // 1) Sources of information: | ||
| // | ||
| // | ||
| // | ||
| // This tells emacs to view this file in c++ mode. | ||
| // Local Variables: | ||
| // mode:c++ | ||
| // End: |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
The event info seems unrelated to the momentum cutoff: what is it used for? Just diagnostics?
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.
Hi Dave,
The StepPointMC1stHitDumper module is just an analyzer module that makes a simple ntuple from the first step point MC. I found it handy to make simple plots for diagnostics purposes.
The upper momentum cutoff is done in the filter module: FilterStepPointMomentum.
The upper momentum cut of 0.5 GeV removes all the straight tracks and it reduces the size of the files by about a factor 10. It will be useful to have this functionality for a large scale cosmics MC production.
I've submitted these changes in one commit, and they are completely unrelated.
Sorry, if it adds confusion.
Would it help to separate commits in the future?