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

Implement Electron Velocity Changes #331

Open
wants to merge 90 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 84 commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
bf759a2
Added electron velocity
Nov 28, 2022
488c5b5
Update LinkDef.h
Nov 29, 2022
0091d82
Boost final state electron back to lab frame
Dec 9, 2022
97d3b62
Adding comments and docs
Jan 6, 2023
ce5ce58
Removed print outs and useless comments
Jan 17, 2023
4818287
Clean up headers
Jan 17, 2023
25f5f70
Updated according to comments
Jan 18, 2023
1e548e7
Release with interaction not found bug
Jan 26, 2023
b659cf6
Delete genie-mcjob-0.status
mroda88 Jan 27, 2023
ea7aab6
Updated cross section, added relative error calc, updated direction r…
Feb 8, 2023
9f6370e
Merge branch 'brindenc' of https://github.com/bear-is-asleep/Generato…
Feb 8, 2023
7d95362
Updated variance calculation in cross section integrator, modified di…
Feb 15, 2023
a6e8e30
Draft of the Target
mroda88 Feb 22, 2023
adceb50
Starting propagating changes
mroda88 Feb 22, 2023
434b453
Starting changing interactions
mroda88 Feb 23, 2023
85be41f
Interaction updated
mroda88 Feb 23, 2023
1b83195
Fix Framework Utiles
mroda88 Feb 23, 2023
96c62bc
Updated Physics/Common
mroda88 Feb 23, 2023
f04b94f
Update XSecIntegration
mroda88 Feb 23, 2023
2e514de
Updated NuclearState
mroda88 Feb 23, 2023
d02c852
Update hadronisation
mroda88 Feb 23, 2023
bdf8cbc
Fix Hadron Transporter
mroda88 Feb 23, 2023
249014b
Sync with master
mroda88 Mar 17, 2023
dc4c3e9
Fix Nuclear state
mroda88 Mar 17, 2023
8b168d9
Fix AnomalyMediatedNuGamma
mroda88 Mar 17, 2023
b22a7b8
Updated Charm and Coherent
mroda88 Mar 17, 2023
31e2b84
Updated DIS
mroda88 Mar 17, 2023
2dad9e6
Updated DFR
mroda88 Mar 17, 2023
3113afd
Update HELepton
mroda88 Mar 17, 2023
ee1d502
Fix 2p2h and IBD
mroda88 Mar 17, 2023
96e54d7
Update NuE and QEL
mroda88 Mar 17, 2023
006aace
Update some resonance parts
mroda88 Mar 17, 2023
ffe624a
update more RES stuff
mroda88 Mar 17, 2023
b141d46
Update HEDIS, RES and Strange
mroda88 Mar 21, 2023
d24897e
Update probably complete
mroda88 Mar 21, 2023
d79839d
Apps compile
mroda88 Mar 21, 2023
857d608
Commit with comments
Mar 22, 2023
ec49505
Contains modifications to cross section accouting for lorentz factor
Mar 22, 2023
8556ebf
Contains modifications to cross section accouting for lorentz factor
Mar 22, 2023
bb815d7
Update some contrib scripts
mroda88 Mar 22, 2023
0f44460
Update DM
mroda88 Mar 22, 2023
c3e0f09
Final touch with search and replace
mroda88 Mar 22, 2023
714547a
Draft of the map code
mroda88 Mar 28, 2023
e8134ed
Add LinkDef
mroda88 Mar 28, 2023
8b5e6a2
updated master config
mroda88 Mar 28, 2023
f1141d2
fix names
mroda88 Mar 28, 2023
0f2a533
Fix compilation issues
mroda88 Mar 28, 2023
e08200e
Replace BohElectronVelocity
mroda88 Mar 29, 2023
8eab513
Add changes in G18_02a Model configuration
mroda88 Mar 29, 2023
711f807
Fix typo
mroda88 Mar 29, 2023
2e6aeda
Possible fix
mroda88 Mar 29, 2023
4aceefc
Fixed direction generator
Mar 29, 2023
61feaed
Merge pull request #3 from bear-is-asleep/brindenc
mroda88 May 30, 2023
450dd40
Merge remote-tracking branch 'upstream/master' into mroda/EVMap
mroda88 Jun 1, 2023
ce1b78d
Add electron velocity to all ModelConfiguration.xml files
mroda88 Jun 1, 2023
2541091
Add Map in Event Generator xml files
mroda88 Jun 1, 2023
83645ac
Merge pull request #2 from bear-is-asleep/mroda/EVMap
bear-is-asleep Jun 1, 2023
b48167b
removed commented block
Jun 1, 2023
255d217
Merge branch 'brindenc' of https://github.com/bear-is-asleep/Generato…
Jun 1, 2023
6cf3d4b
Resolved merge conflicts in Target.cxx and Target.h
Jun 2, 2023
7b4e1b8
Revert "Feature/target interface"
bear-is-asleep Jun 2, 2023
22ff840
Merge pull request #4 from bear-is-asleep/revert-1-feature/TargetInte…
bear-is-asleep Jun 2, 2023
7e78002
added PXSecOnElectron interface
Jun 2, 2023
1d67653
Removed IMD XSec module since it did the same exact thing as NuElectr…
Jun 2, 2023
b012e16
fixed xml files
Jun 13, 2023
9bf362f
Naming changes for pxsec interface. Updated xml files to include PXSe…
Aug 1, 2023
1701650
merge with master
mroda88 Sep 26, 2023
10bf09d
Fix compiling issues
mroda88 Sep 26, 2023
5bf97c5
Merge new interface
mroda88 Sep 26, 2023
825247b
Force interface from main fork
mroda88 Sep 26, 2023
9d60c36
Imposing correct files from main fork
mroda88 Sep 26, 2023
3e5607f
Proceeding with import and compilation
mroda88 Sep 26, 2023
9416a51
Correct interfaces for the NuE generators
mroda88 Sep 26, 2023
ac031cb
Possibly complete interface
mroda88 Sep 26, 2023
f2c807d
complete interface
mroda88 Sep 26, 2023
7633f00
Clean code, implement rest frame for electron, modified xsec to accou…
Sep 28, 2023
60da462
Math utils contrib
Oct 2, 2023
2339b96
Fix old interface calls
mroda88 Oct 2, 2023
3ed95ef
Adding missing libs in genie macro
mroda88 Oct 2, 2023
58ae376
Complete configuration for IMD(-ANH)
mroda88 Oct 3, 2023
47fcffa
Correct copy method
mroda88 Oct 3, 2023
ab84d73
Fixed setting target pdg, check target pdg when probing p4
Oct 3, 2023
022741e
Changes to validation script and checks in various scripts for a vali…
Oct 5, 2023
1a654ab
updated validation script
Oct 6, 2023
314166d
Framework changes to check valid kinematics for NuElectron XSecModels
Oct 13, 2023
39e15aa
Small corrections to xmls and contrib
Oct 13, 2023
28d340e
fixed bug where valid process always returned false. handled case whe…
Nov 8, 2023
b8515e1
fixed bug where valid process always returned false. handled case whe…
Nov 8, 2023
62edd42
updated validation script
Nov 21, 2023
58c222e
Made the test compilable
mroda88 Apr 16, 2024
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: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ src/Framework/Conventions/GVersion.h
*~
*.rootmap
*_ROOT_DICT_*
*.swp
*.swp
13 changes: 13 additions & 0 deletions config/AR23_20i/ModelConfiguration.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,19 @@ STFC, Rutherford Appleton Laboratory
<param type="alg" name="NuclearModel@Pdg=1000260560"> genie::SpectralFunc1d/Default </param>
-->

<!--
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Electron velocity model selection
Options:
- genie::StaticElectronVelocity/Default
- genie::BohrElectronVelocity/Default

The 'ElectronVelocity' option defines the default basic model which should work for _any_ atom.
Specification for particular atoms are possible, by specifying the 'ElectronVelocity@Pdg=10LZZZAAAI' option.

<param type="alg" name="ElectronVelocity"> genie::StaticElectronVelocity/Default </param>
-->
<param type="alg" name="ElectronVelocity"> genie::BohrElectronVelocity/Default </param>

<!--
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
18 changes: 17 additions & 1 deletion config/BardinIMDRadCorPXSec.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,24 @@
Configuration sets for the Bardin-Dokuchaeva inverse muon
decay differential xsec algorithm with 1-loop radiative corrections

<!--
Configuration for the BardinIMDRadCorPXSec xsec algorithm.

Configurable Parameters:
....................................................................................
Name Type Optional Comment Default
XSec-Integrator alg No genie::XSecOnElectron/Default
Electron-Velocity alg No genie::ElectronVelocityMap/Default
N-Integration-Samples int No max iteration in case error doesn't converge 10000
NuE-XSecRelError double No error to accept xsec in integrator 0.001
....................................................................................
-->

<param_set name="Default">
<param type="alg" name="XSec-Integrator"> genie::IMDXSec/Default </param>
<param type="alg" name="XSec-Integrator"> genie::XSecOnElectron/Default </param>
<param type="alg" name="Electron-Velocity"> genie::ElectronVelocityMap/Default </param>
<param type="int" name ="N-Integration-Samples" > 10000 </param>
<param type="double" name ="NuE-XSecRelError" > 0.0001 </param>
</param_set>

</alg_conf>
Expand Down
17 changes: 17 additions & 0 deletions config/BohrElectronVelocity.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="ISO-8859-1"?>

<!--
Configuration for the Bohr Electron Velocity

Configurable Parameters:
.............................................................................................................
Name Type Optional Comment Default
.............................................................................................................

-->

<alg_conf>
<param_set name="Default">
</param_set>

</alg_conf>
27 changes: 15 additions & 12 deletions config/EventGenerator.xml
Original file line number Diff line number Diff line change
Expand Up @@ -425,34 +425,37 @@ XSecModel alg Yes Cross section model used at the thread

<param_set name="IMD">
<param type="string" name="VldContext"> </param>
<param type="int" name="NModules"> 5 </param>
<param type="int" name="NModules"> 6 </param>
<param type="alg" name="Module-0"> genie::InitialStateAppender/Default </param>
<param type="alg" name="Module-1"> genie::VertexGenerator/Default </param>
<param type="alg" name="Module-2"> genie::NuEKinematicsGenerator/Default </param>
<param type="alg" name="Module-3"> genie::NuEPrimaryLeptonGenerator/Default </param>
<param type="alg" name="Module-4"> genie::NuETargetRemnantGenerator/Default </param>
<param type="alg" name="Module-2"> genie::ElectronVelocityMap/Default </param>
<param type="alg" name="Module-3"> genie::NuEKinematicsGenerator/Default </param>
<param type="alg" name="Module-4"> genie::NuEPrimaryLeptonGenerator/Default </param>
<param type="alg" name="Module-5"> genie::NuETargetRemnantGenerator/Default </param>
<param type="alg" name="ILstGen"> genie::NuEInteractionListGenerator/IMD </param>
</param_set>

<param_set name="IMD-ANH">
<param type="string" name="VldContext"> </param>
<param type="int" name="NModules"> 5 </param>
<param type="int" name="NModules"> 6 </param>
<param type="alg" name="Module-0"> genie::InitialStateAppender/Default </param>
<param type="alg" name="Module-1"> genie::VertexGenerator/Default </param>
<param type="alg" name="Module-2"> genie::NuEKinematicsGenerator/Default </param>
<param type="alg" name="Module-3"> genie::NuEPrimaryLeptonGenerator/Default </param>
<param type="alg" name="Module-4"> genie::NuETargetRemnantGenerator/Default </param>
<param type="alg" name="Module-2"> genie::ElectronVelocityMap/Default </param>
<param type="alg" name="Module-3"> genie::NuEKinematicsGenerator/Default </param>
<param type="alg" name="Module-4"> genie::NuEPrimaryLeptonGenerator/Default </param>
<param type="alg" name="Module-5"> genie::NuETargetRemnantGenerator/Default </param>
<param type="alg" name="ILstGen"> genie::NuEInteractionListGenerator/IMD-ANH </param>
</param_set>

<param_set name="NUE-EL">
<param type="string" name="VldContext"> </param>
<param type="int" name="NModules"> 5 </param>
<param type="int" name="NModules"> 6 </param>
<param type="alg" name="Module-0"> genie::InitialStateAppender/Default </param>
<param type="alg" name="Module-1"> genie::VertexGenerator/Default </param>
<param type="alg" name="Module-2"> genie::NuEKinematicsGenerator/Default </param>
<param type="alg" name="Module-3"> genie::NuEPrimaryLeptonGenerator/Default </param>
<param type="alg" name="Module-4"> genie::NuETargetRemnantGenerator/Default </param>
<param type="alg" name="Module-2"> genie::ElectronVelocityMap/Default </param>
<param type="alg" name="Module-3"> genie::NuEKinematicsGenerator/Default </param>
<param type="alg" name="Module-4"> genie::NuEPrimaryLeptonGenerator/Default </param>
<param type="alg" name="Module-5"> genie::NuETargetRemnantGenerator/Default </param>
<param type="alg" name="ILstGen"> genie::NuEInteractionListGenerator/NUE-EL </param>
</param_set>

Expand Down
33 changes: 18 additions & 15 deletions config/G00_00a/EventGenerator.xml
Original file line number Diff line number Diff line change
Expand Up @@ -300,36 +300,39 @@ XSecModel alg Yes Cross section model used at the thread
<param type="alg" name="ILstGen"> genie::DISInteractionListGenerator/CC-Charm-Default </param>
</param_set>

<param_set name="IMD">
<param_set name="IMD">
<param type="string" name="VldContext"> </param>
<param type="int" name="NModules"> 5 </param>
<param type="int" name="NModules"> 6 </param>
<param type="alg" name="Module-0"> genie::InitialStateAppender/Default </param>
<param type="alg" name="Module-1"> genie::VertexGenerator/Default </param>
<param type="alg" name="Module-2"> genie::NuEKinematicsGenerator/Default </param>
<param type="alg" name="Module-3"> genie::NuEPrimaryLeptonGenerator/Default </param>
<param type="alg" name="Module-4"> genie::NuETargetRemnantGenerator/Default </param>
<param type="alg" name="Module-2"> genie::ElectronVelocityMap/Default </param>
<param type="alg" name="Module-3"> genie::NuEKinematicsGenerator/Default </param>
<param type="alg" name="Module-4"> genie::NuEPrimaryLeptonGenerator/Default </param>
<param type="alg" name="Module-5"> genie::NuETargetRemnantGenerator/Default </param>
<param type="alg" name="ILstGen"> genie::NuEInteractionListGenerator/IMD </param>
</param_set>

<param_set name="IMD-ANH">
<param_set name="IMD-ANH">
<param type="string" name="VldContext"> </param>
<param type="int" name="NModules"> 5 </param>
<param type="int" name="NModules"> 6 </param>
<param type="alg" name="Module-0"> genie::InitialStateAppender/Default </param>
<param type="alg" name="Module-1"> genie::VertexGenerator/Default </param>
<param type="alg" name="Module-2"> genie::NuEKinematicsGenerator/Default </param>
<param type="alg" name="Module-3"> genie::NuEPrimaryLeptonGenerator/Default </param>
<param type="alg" name="Module-4"> genie::NuETargetRemnantGenerator/Default </param>
<param type="alg" name="Module-2"> genie::ElectronVelocityMap/Default </param>
<param type="alg" name="Module-3"> genie::NuEKinematicsGenerator/Default </param>
<param type="alg" name="Module-4"> genie::NuEPrimaryLeptonGenerator/Default </param>
<param type="alg" name="Module-5"> genie::NuETargetRemnantGenerator/Default </param>
<param type="alg" name="ILstGen"> genie::NuEInteractionListGenerator/IMD-ANH </param>
</param_set>

<param_set name="NUE-EL">
<param_set name="NUE-EL">
<param type="string" name="VldContext"> </param>
<param type="int" name="NModules"> 5 </param>
<param type="int" name="NModules"> 6 </param>
<param type="alg" name="Module-0"> genie::InitialStateAppender/Default </param>
<param type="alg" name="Module-1"> genie::VertexGenerator/Default </param>
<param type="alg" name="Module-2"> genie::NuEKinematicsGenerator/Default </param>
<param type="alg" name="Module-3"> genie::NuEPrimaryLeptonGenerator/Default </param>
<param type="alg" name="Module-4"> genie::NuETargetRemnantGenerator/Default </param>
<param type="alg" name="Module-2"> genie::ElectronVelocityMap/Default </param>
<param type="alg" name="Module-3"> genie::NuEKinematicsGenerator/Default </param>
<param type="alg" name="Module-4"> genie::NuEPrimaryLeptonGenerator/Default </param>
<param type="alg" name="Module-5"> genie::NuETargetRemnantGenerator/Default </param>
<param type="alg" name="ILstGen"> genie::NuEInteractionListGenerator/NUE-EL </param>
</param_set>

Expand Down
11 changes: 11 additions & 0 deletions config/G00_00a/ModelConfiguration.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,17 @@ STFC, Rutherford Appleton Laboratory
<param type="alg" name="NuclearModel@Pdg=1000260560"> genie::SpectralFunc1d/Default </param>
-->

<!--
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Electron velocity model selection
Options:
- genie::StaticElectronVelocity/Default
- genie::BohrElectronVelocity/Default

The 'ElectronVelocity' option defines the default basic model which should work for _any_ atom.
Specification for particular atoms are possible, by specifying the 'ElectronVelocity@Pdg=10LZZZAAAI' option.
-->
<param type="alg" name="ElectronVelocity"> genie::StaticElectronVelocity/Default </param>

<!--
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
33 changes: 18 additions & 15 deletions config/G00_00b/EventGenerator.xml
Original file line number Diff line number Diff line change
Expand Up @@ -300,36 +300,39 @@ XSecModel alg Yes Cross section model used at the thread
<param type="alg" name="ILstGen"> genie::DISInteractionListGenerator/CC-Charm-Default </param>
</param_set>

<param_set name="IMD">
<param_set name="IMD">
<param type="string" name="VldContext"> </param>
<param type="int" name="NModules"> 5 </param>
<param type="int" name="NModules"> 6 </param>
<param type="alg" name="Module-0"> genie::InitialStateAppender/Default </param>
<param type="alg" name="Module-1"> genie::VertexGenerator/Default </param>
<param type="alg" name="Module-2"> genie::NuEKinematicsGenerator/Default </param>
<param type="alg" name="Module-3"> genie::NuEPrimaryLeptonGenerator/Default </param>
<param type="alg" name="Module-4"> genie::NuETargetRemnantGenerator/Default </param>
<param type="alg" name="Module-2"> genie::ElectronVelocityMap/Default </param>
<param type="alg" name="Module-3"> genie::NuEKinematicsGenerator/Default </param>
<param type="alg" name="Module-4"> genie::NuEPrimaryLeptonGenerator/Default </param>
<param type="alg" name="Module-5"> genie::NuETargetRemnantGenerator/Default </param>
<param type="alg" name="ILstGen"> genie::NuEInteractionListGenerator/IMD </param>
</param_set>

<param_set name="IMD-ANH">
<param_set name="IMD-ANH">
<param type="string" name="VldContext"> </param>
<param type="int" name="NModules"> 5 </param>
<param type="int" name="NModules"> 6 </param>
<param type="alg" name="Module-0"> genie::InitialStateAppender/Default </param>
<param type="alg" name="Module-1"> genie::VertexGenerator/Default </param>
<param type="alg" name="Module-2"> genie::NuEKinematicsGenerator/Default </param>
<param type="alg" name="Module-3"> genie::NuEPrimaryLeptonGenerator/Default </param>
<param type="alg" name="Module-4"> genie::NuETargetRemnantGenerator/Default </param>
<param type="alg" name="Module-2"> genie::ElectronVelocityMap/Default </param>
<param type="alg" name="Module-3"> genie::NuEKinematicsGenerator/Default </param>
<param type="alg" name="Module-4"> genie::NuEPrimaryLeptonGenerator/Default </param>
<param type="alg" name="Module-5"> genie::NuETargetRemnantGenerator/Default </param>
<param type="alg" name="ILstGen"> genie::NuEInteractionListGenerator/IMD-ANH </param>
</param_set>

<param_set name="NUE-EL">
<param_set name="NUE-EL">
<param type="string" name="VldContext"> </param>
<param type="int" name="NModules"> 5 </param>
<param type="int" name="NModules"> 6 </param>
<param type="alg" name="Module-0"> genie::InitialStateAppender/Default </param>
<param type="alg" name="Module-1"> genie::VertexGenerator/Default </param>
<param type="alg" name="Module-2"> genie::NuEKinematicsGenerator/Default </param>
<param type="alg" name="Module-3"> genie::NuEPrimaryLeptonGenerator/Default </param>
<param type="alg" name="Module-4"> genie::NuETargetRemnantGenerator/Default </param>
<param type="alg" name="Module-2"> genie::ElectronVelocityMap/Default </param>
<param type="alg" name="Module-3"> genie::NuEKinematicsGenerator/Default </param>
<param type="alg" name="Module-4"> genie::NuEPrimaryLeptonGenerator/Default </param>
<param type="alg" name="Module-5"> genie::NuETargetRemnantGenerator/Default </param>
<param type="alg" name="ILstGen"> genie::NuEInteractionListGenerator/NUE-EL </param>
</param_set>

Expand Down
13 changes: 12 additions & 1 deletion config/G00_00b/ModelConfiguration.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,18 @@ STFC, Rutherford Appleton Laboratory
<param type="alg" name="NuclearModel@Pdg=1000060120"> genie::SpectralFunc1d/Default </param>
<param type="alg" name="NuclearModel@Pdg=1000260560"> genie::SpectralFunc1d/Default </param>
-->


<!--
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Electron velocity model selection
Options:
- genie::StaticElectronVelocity/Default
- genie::BohrElectronVelocity/Default

The 'ElectronVelocity' option defines the default basic model which should work for _any_ atom.
Specification for particular atoms are possible, by specifying the 'ElectronVelocity@Pdg=10LZZZAAAI' option.
-->
<param type="alg" name="ElectronVelocity"> genie::StaticElectronVelocity/Default </param>

<!--
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
Loading