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.

Sign up for GitHub

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

Jump to bottom

Migration to the Refactored LArG4 #134

Merged
merged 47 commits into from
Aug 17, 2021
Merged

Migration to the Refactored LArG4 #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
121ae6c
Current g4 fcl to legacy_*.fcl
marcodeltutto Jul 30, 2021
68a70b0
Current detsim fcl to legacy_*.fcl
marcodeltutto Jul 30, 2021
9e2c3f4
Adds new, refactored, LArG4 fcls as standard
marcodeltutto Jul 30, 2021
47527cb
Adds line with gdml file with no wires
marcodeltutto Jul 30, 2021
6abc9b0
Fix GDML name and clean up file
marcodeltutto Jul 31, 2021
f007b9d
Adds SavePriorSCE: true, so SimEnergyDeposits are saved also before SCE
marcodeltutto Jul 31, 2021
0bb0587
Changes input simulation label for optical fast simulation to ionands…
marcodeltutto Jul 31, 2021
66c0d61
Fix gdml file name, improve comments
marcodeltutto Jul 31, 2021
08642f7
Legacy G4 files in their own folder
marcodeltutto Aug 1, 2021
f5027f1
Add the legacy folder to cmakelists
marcodeltutto Aug 1, 2021
51d5cc0
Add the hybrid model to standard_g4_sbnd.fcl (commented out for now)
marcodeltutto Aug 1, 2021
e7a00c7
Move g4-related fcls to a g4 folder
marcodeltutto Aug 1, 2021
e7d8a3f
Adds SensDet tags to volCryostat, volFieldCage, volXArapuca, volPMT, …
marcodeltutto Aug 2, 2021
e878d8e
Add units to SensDet auxiliary to avoid warnings
marcodeltutto Aug 3, 2021
c3d3a1c
Detsim fcls for legacy larg4 to their own legacy/ folder
marcodeltutto Aug 3, 2021
67e4dcd
Move PDFastSim_sbnd.fcl back to LArSoftConfigurations
marcodeltutto Aug 3, 2021
ba04151
Add configuration to run g4 with hybrid optical mode
marcodeltutto Aug 3, 2021
0433bf1
Create LArG4 directory in sbndcode
marcodeltutto Aug 3, 2021
10678e5
Fix g4_mu_crt_filter_base.fcl to use new simulate path
marcodeltutto Aug 3, 2021
ffe80a3
Disable largeant and daq from prodsingle_sbnd.fcl
marcodeltutto Aug 3, 2021
8c796db
Add LArG4 to CMakeLists.txt
marcodeltutto Aug 3, 2021
ef8a72a
Remove refactored folder
marcodeltutto Aug 3, 2021
3997837
Clean up standard_detsim_sbnd.fcl
marcodeltutto Aug 3, 2021
9955674
Separate the gdml for the optical hybrid model
marcodeltutto Aug 4, 2021
83f3a90
Sparsify LArG4 trajectories, and set correct gdml for op hybrid model
marcodeltutto Aug 4, 2021
dedd097
Revert sbnd_v02_00_withshielding gdml files to previous configuration
marcodeltutto Aug 5, 2021
ce6f79d
Improve comments
marcodeltutto Aug 5, 2021
8abeebc
Clean up ionandscint_sbnd.fcl fcl
marcodeltutto Aug 5, 2021
2f2e6c2
Enable QL-anticorrelation by default in ionandscint
marcodeltutto Aug 6, 2021
f15415a
Merge branch 'develop' into mdeltutt_larg4_migration
marcodeltutto Aug 6, 2021
06f7859
Enable gdml for optical hybrid mode by default
marcodeltutto Aug 9, 2021
ffca0f3
Enable gdml for optical hybrid mode by default
marcodeltutto Aug 9, 2021
448ca5a
Adopting the optical hybrid mode in the default geant4 configuration
marcodeltutto Aug 9, 2021
e6a931d
Adding g4_noophybrid_sbnd.fcl to run g4 without the optical hybrid mode
marcodeltutto Aug 9, 2021
7fc2209
Removed old gdml files and fix indentation
marcodeltutto Aug 9, 2021
863c8c1
Swap plane 0 and plane 1 in TPC 0 only
marcodeltutto Aug 10, 2021
9947ffb
Merge branch 'mdeltutt_geo_plane_swap' into mdeltutt_larg4_migration
marcodeltutto Aug 10, 2021
4756f56
To match commit 863c8c181fa8a8c3b84ec071662552fbf5c9b5de
marcodeltutto Aug 10, 2021
6b013d1
Temporarily disable geometry tests
henrylay97 Aug 11, 2021
380e579
Re-enable geometry tests, except the WireIntersection one
marcodeltutto Aug 11, 2021
d6b04c5
Merge branch 'mdeltutt_geo_plane_swap' into mdeltutt_larg4_migration
marcodeltutto Aug 11, 2021
2f6e63f
Enable new LArG4 in prodsingle configurations too
marcodeltutto Aug 12, 2021
78d10ef
Fix mistake in fcl config: @table to @sequence
marcodeltutto Aug 12, 2021
9273fd1
Fix g4 configurations with filters
marcodeltutto Aug 12, 2021
5c16923
Removing old configs that run the optical hybrid mode, which is now r…
marcodeltutto Aug 12, 2021
f771996
Fix simulate path in g4 fcl files that have filters in them, so that …
marcodeltutto Aug 12, 2021
5845860
Move g4_QLcorrelated.fcl and g4_QLseparate.fcl to legacy folder.
marcodeltutto Aug 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions sbndcode/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ add_subdirectory(JobConfigurations)
add_subdirectory(LArSoftConfigurations)
add_subdirectory(Utilities)
add_subdirectory(Geometry)
add_subdirectory(LArG4)
add_subdirectory(Calibration)
add_subdirectory(CRT)
add_subdirectory(DetectorSim)
Expand All @@ -31,3 +32,4 @@ add_subdirectory(SpaceChargeTest)
add_subdirectory(FlashMatch)

add_subdirectory(Filters)

6 changes: 5 additions & 1 deletion sbndcode/DetectorSim/detsimmodules_sbnd.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ sbnd_simwire:
{
module_type: "SimWireSBND"
TrigModName: "triggersim"
DriftEModuleLabel: "largeant"
DriftEModuleLabel: "simdrift"
CompressionType: "none" #could also be none
BaselineRMS: 0.0 #ADC baseline fluctuation within channel
GenNoise: true # If false, NoiseService function is not called
Expand All @@ -19,6 +19,10 @@ sbnd_simwire:
CollectionSat: 2922 # in ADC, default is 2922
InductionSat: 1247 # in ADC, default is 1247
}

sbnd_simwire_legacy: @local::sbnd_simwire
sbnd_simwire_legacy.DriftEModuleLabel: "largeant"

#sbnd_simwireana: @local::standard_simwireana
sbnd_simwireana:
{
Expand Down
24 changes: 21 additions & 3 deletions sbndcode/Geometry/gdml/sbnd_v02_00.gdml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1734,6 +1734,9 @@
<volume name="volFieldCage">
<materialref ref="LAr"/>
<solidref ref="solidFieldCage"/>
<auxiliary auxtype="SensDet" auxvalue="SimEnergyDeposit"/>
<auxiliary auxtype="StepLimit" auxvalue="0.01" auxunit="mm"/>
<auxiliary auxtype="Efield" auxvalue="0."/>
<physvol>
<volumeref ref="volCPA_Around"/>
</physvol>
Expand Down Expand Up @@ -12778,6 +12781,9 @@
<volume name="volXArapuca">
<materialref ref="LAr"/>
<solidref ref="XArapucaVolume"/>
<auxiliary auxtype="SensDet" auxvalue="SimEnergyDeposit"/>
<auxiliary auxtype="StepLimit" auxvalue="0.01" auxunit="mm"/>
<auxiliary auxtype="Efield" auxvalue="0."/>
<physvol>
<volumeref ref="volWalls_XArapuca"/>
<position name="posXArapuca1" unit="mm" x="0" y="0" z="0"/>
Expand Down Expand Up @@ -12815,6 +12821,9 @@
<volume name="volPMT">
<materialref ref="LAr"/>
<solidref ref="PMTVolume"/>
<auxiliary auxtype="SensDet" auxvalue="SimEnergyDeposit"/>
<auxiliary auxtype="StepLimit" auxvalue="0.01" auxunit="mm"/>
<auxiliary auxtype="Efield" auxvalue="0."/>
<physvol>
<volumeref ref="vol_PMT_Back"/>
<position name="pos_PMT_Back" unit="mm" x="0" y="0" z="-51"/>
Expand All @@ -12838,6 +12847,9 @@
<volume name="volPDSstructure">
<materialref ref="LAr"/>
<solidref ref="PDS_moduleCase"/>
<auxiliary auxtype="SensDet" auxvalue="SimEnergyDeposit"/>
<auxiliary auxtype="StepLimit" auxvalue="0.01" auxunit="mm"/>
<auxiliary auxtype="Efield" auxvalue="0."/>
<physvol>
<volumeref ref="volXArapuca"/>
<position name="posXArapuca_1_Structure" unit="mm" z="-76.200000000000003" y="400" x="-56.75"/>
Expand Down Expand Up @@ -15004,6 +15016,9 @@
<volume name="volTPCPlaneVert">
<materialref ref="LAr"/>
<solidref ref="boxTPCPlane"/>
<auxiliary auxtype="SensDet" auxvalue="SimEnergyDeposit"/>
<auxiliary auxtype="StepLimit" auxvalue="0.01" auxunit="mm"/>
<auxiliary auxtype="Efield" auxvalue="0."/>
<physvol>
<volumeref ref="volTPCWireVert"/>
<rotationref ref="rotateN90X"/>
Expand Down Expand Up @@ -59067,7 +59082,7 @@
<materialref ref="LAr"/>
<solidref ref="boxTPCActive"/>
<auxiliary auxtype="SensDet" auxvalue="SimEnergyDeposit"/>
<auxiliary auxtype="StepLimit" auxvalue="0.01"/>
<auxiliary auxtype="StepLimit" auxvalue="0.01" auxunit="mm"/>
<auxiliary auxtype="Efield" auxvalue="500."/>
<physvol>
<volumeref ref="volCPA_East"/>
Expand Down Expand Up @@ -59227,11 +59242,11 @@
</physvol>
<physvol>
<volumeref ref="volTPCPlane_V"/>
<positionref ref="posVPlane_E"/>
<positionref ref="posUPlane_E"/> <!-- WARNING: this should be posV, will have to be fixed once LArSoft View is fixed -->
</physvol>
<physvol>
<volumeref ref="volTPCPlane_U"/>
<positionref ref="posUPlane_E"/>
<positionref ref="posVPlane_E"/> <!-- WARNING: this should be posU, will have to be fixed once LArSoft View is fixed -->
</physvol>
<physvol>
<volumeref ref="volTPCPlaneVert"/>
Expand Down Expand Up @@ -59274,6 +59289,9 @@
<volume name="volCryostat">
<materialref ref="LAr"/>
<solidref ref="boxCryostat"/>
<auxiliary auxtype="SensDet" auxvalue="SimEnergyDeposit"/>
<auxiliary auxtype="StepLimit" auxvalue="0.01" auxunit="mm"/>
<auxiliary auxtype="Efield" auxvalue="0."/>
<physvol>
<volumeref ref="volCryoUllage"/>
<position name="posUllage" unit="mm" x="0" y="2579.5500000000002" z="0" />
Expand Down
25 changes: 22 additions & 3 deletions sbndcode/Geometry/gdml/sbnd_v02_00_base.gdml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2679,6 +2679,9 @@
<volume name="volFieldCage">
<materialref ref="LAr"/>
<solidref ref="solidFieldCage"/>
<auxiliary auxtype="SensDet" auxvalue="SimEnergyDeposit"/>
<auxiliary auxtype="StepLimit" auxvalue="0.01" unit="mm"/>
<auxiliary auxtype="Efield" auxvalue="0."/>

<physvol>
<volumeref ref="volCPA_Around"/>
Expand Down Expand Up @@ -4603,6 +4606,9 @@
<volume name="volXArapuca">
<materialref ref="LAr"/>
<solidref ref="XArapucaVolume"/>
<auxiliary auxtype="SensDet" auxvalue="SimEnergyDeposit"/>
<auxiliary auxtype="StepLimit" auxvalue="0.01" unit="mm"/>
<auxiliary auxtype="Efield" auxvalue="0."/>
<physvol>
<volumeref ref="volWalls_XArapuca"/>
<position name="posXArapuca1" unit="mm" x="0" y="0" z="0"/>
Expand Down Expand Up @@ -4655,6 +4661,9 @@
<volume name="volPMT">
<materialref ref="LAr"/>
<solidref ref="PMTVolume"/>
jzennamo marked this conversation as resolved.
Show resolved Hide resolved
<auxiliary auxtype="SensDet" auxvalue="SimEnergyDeposit"/>
<auxiliary auxtype="StepLimit" auxvalue="0.01" unit="mm"/>
<auxiliary auxtype="Efield" auxvalue="0."/>
<physvol>
<volumeref ref="vol_PMT_Back"/>
<position name="pos_PMT_Back" unit="mm" x="0" y="0" z="-PMT_rmax/2."/>
Expand Down Expand Up @@ -4689,6 +4698,10 @@
<volume name="volPDSstructure">
<materialref ref="LAr"/>
<solidref ref="PDS_moduleCase"/>
<auxiliary auxtype="SensDet" auxvalue="SimEnergyDeposit"/>
<auxiliary auxtype="StepLimit" auxvalue="0.01" unit="mm"/>
<auxiliary auxtype="Efield" auxvalue="0."/>


<!-- placing XARAPUCAs -->
<physvol>
Expand Down Expand Up @@ -5356,6 +5369,9 @@
<volume name="volTPCPlaneVert">
<materialref ref="LAr"/>
<solidref ref="boxTPCPlane"/>
<auxiliary auxtype="SensDet" auxvalue="SimEnergyDeposit"/>
<auxiliary auxtype="StepLimit" auxvalue="0.01" unit="mm"/>
<auxiliary auxtype="Efield" auxvalue="0."/>

<!-- Y wires -->
<!-- iWire_Y starts from 1 -->
Expand Down Expand Up @@ -5521,7 +5537,7 @@
<materialref ref="LAr"/>
<solidref ref="boxTPCActive"/>
<auxiliary auxtype="SensDet" auxvalue="SimEnergyDeposit"/>
<auxiliary auxtype="StepLimit" auxvalue="0.01"/>
<auxiliary auxtype="StepLimit" auxvalue="0.01" unit="mm"/>
<auxiliary auxtype="Efield" auxvalue="500."/>

<physvol>
Expand Down Expand Up @@ -5690,11 +5706,11 @@

<physvol>
<volumeref ref="volTPCPlane_V"/>
<positionref ref="posVPlane_E"/>
<positionref ref="posUPlane_E"/> <!-- WARNING: this should be posV, will have to be fixed once LArSoft View is fixed -->
</physvol>
<physvol>
<volumeref ref="volTPCPlane_U"/>
<positionref ref="posUPlane_E"/>
<positionref ref="posVPlane_E"/> <!-- WARNING: this should be posU, will have to be fixed once LArSoft View is fixed -->
</physvol>
<physvol>
<volumeref ref="volTPCPlaneVert"/>
Expand Down Expand Up @@ -5753,6 +5769,9 @@
<volume name="volCryostat">
<materialref ref="LAr"/>
<solidref ref="boxCryostat"/>
<auxiliary auxtype="SensDet" auxvalue="SimEnergyDeposit"/>
<auxiliary auxtype="StepLimit" auxvalue="0.01" unit="mm"/>
<auxiliary auxtype="Efield" auxvalue="0."/>

<physvol>
<volumeref ref="volCryoUllage"/>
Expand Down
Loading