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

Not merge - QE with spectral functions branch for GENIE review #79

Open
wants to merge 40 commits into
base: master
Choose a base branch
from
Open

Not merge - QE with spectral functions branch for GENIE review #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
6c5bbf2
Finish initial implementation of the quasielastic cross section for t…
sjgardiner Apr 29, 2019
13186d3
Refactor the SpectralFunc class to use histograms instead of graphs
sjgardiner Apr 29, 2019
b653c65
Remove reference to std::to_string, which is a C++11 feature
sjgardiner Apr 30, 2019
0a9e86b
Add missing initialization of the on-shell initial nucleon 4-momentum to
sjgardiner Jun 4, 2019
baee211
Add a new version of the 12C spectral function that matches the table…
sjgardiner Jun 13, 2019
47692bd
Make a few small corrections to factors for the cross section calcula…
sjgardiner Jun 13, 2019
7733a54
Temporarily change various configuration settings to match the conven…
sjgardiner Jun 13, 2019
1f86da5
Account for the imaginary i factor in the Levi-Civita tensor product for
sjgardiner Jun 13, 2019
5272f30
Fix typo when setting the axial second-class current form factor in
sjgardiner Jun 13, 2019
0513f12
Fix overall factor in the FreeNucleonTensor elements. The expression in
sjgardiner Jun 14, 2019
373a80b
Move the testing configuration for the CBF spectral function model in…
sjgardiner Oct 17, 2019
6002301
Fix a problem with Mandelstam s = NaN in the case of very high-momentum
sjgardiner Oct 17, 2019
6d8daa5
Temporarily remove the (small) current-conservation correction in the…
sjgardiner Oct 17, 2019
2aece86
Remove the code for setting a minimum scattering angle for EMQE event…
sjgardiner Oct 18, 2019
7a57077
Switch to using a spectral function data file format that matches Noe…
sjgardiner Oct 18, 2019
38fb9e4
Make the SpectralFunc nuclear model compatible with the maximum
sjgardiner Oct 19, 2019
2a420f9
Switch to using a global Fermi gas as the default nuclear model in the
sjgardiner Oct 19, 2019
35a6d25
Swap order of a few lines in QELUtils.cxx to avoid unnecessary warning
sjgardiner Nov 8, 2019
5aa41b5
Switch to interpreting the tabulated (p, E) values for the spectral
sjgardiner Dec 2, 2019
793b60c
Modify the QELUtils.cxx method BindHitNucleon() to apply the correct
sjgardiner Dec 4, 2019
40e301a
Remove the temporary kPSp3NiEOlEl phase space used for testing the
sjgardiner Dec 4, 2019
77507b1
Fix configuration problems and adjust handling of the spectral functi…
sjgardiner Dec 4, 2019
0ebd762
Remove some currently unused code in the lepton and free nucleon tensor
sjgardiner Feb 19, 2020
d7aad07
Fix typo in the F2V*F3V term in FreeNucleonTensor
sjgardiner Feb 19, 2020
36e767c
Add error handling for missing spectral function files. Also add the new
sjgardiner Feb 20, 2020
c03982b
Merge branch 'master' into cbf_sf
sjgardiner Feb 20, 2020
d83afed
Add missing Interaction.h header in AGKLowW2019.h. A failure to inclu…
sjgardiner Feb 20, 2020
eeb3353
Make corrections to NC form factors in the LwlynSmithFFNC class. Add …
sjgardiner Feb 25, 2020
fa7f40e
Add dsigma/dQ^2 calculation to UnifiedQELPXSec for testing purposes
sjgardiner Feb 26, 2020
6a75596
Switch to using the value of "QEL-Mv" from CommonParam.xml instead of a
sjgardiner Feb 26, 2020
44cebe8
The "fix" proposed in GENIE docDB #133 is incorrect. The original Jac…
sjgardiner Feb 26, 2020
976133d
Eliminate an unused variable warning in AhrensNCELStrangeFF.cxx
sjgardiner Feb 26, 2020
5cad55b
Make FermiMover compatible with the SpectralFunc nuclear model
sjgardiner Feb 26, 2020
3fd126c
Improve robustness of a check for the SpectralFunc nuclear model in
sjgardiner Feb 26, 2020
4628283
Merge latest updates from the master branch
sjgardiner Feb 26, 2020
1085d26
Correct the value of QEL-Mv set for the temporary N19_00a_00_000 tune…
sjgardiner Feb 27, 2020
c163bdb
Merge branch 'master' into cbf_sf
sjgardiner Oct 25, 2020
6623050
Fix minor issue related to overall normalization of the spectral func…
sjgardiner Oct 26, 2020
53f8971
Add a QE utility function for testing the new UnifiedQELPXSec model
sjgardiner Oct 26, 2020
a249492
Change gA to match Noemi's value
sjgardiner Oct 26, 2020
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
4 changes: 2 additions & 2 deletions config/AhrensNCELPXSec.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ Configurable Parameters:
..........................................................................................
Name Type Optional Comment Default
..........................................................................................
QEL-Ma double No Axial Mass ComomnParam[QuasiElastic]
QEL-Mv double No Vector Mass ComomnParam[QuasiElastic]
QEL-Ma double No Axial Mass CommonParam[QuasiElastic]
QEL-Mv double No Vector Mass CommonParam[QuasiElastic]
EL-Axial-Eta double No Strange Axial form factor
QEL-Fa0 double No Fa(q2=0) CommonParam[QuasiElastic]
AnomMagnMoment-P double No p Anomalous Magn Moment CommonParam[MagnMoments]
Expand Down
21 changes: 21 additions & 0 deletions config/AhrensNCELStrangeFF.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="ISO-8859-1"?>

<alg_conf>

<!--
Configuration sets for Ahrens NCEL strange form factors

Configurable Parameters:
........................................................................................................
Name Type Optional Comment Default
AxialFormFactorModel alg No Axial form factor model
EL-Axial-Eta double No FAs = -1. * Eta * FA_CC
........................................................................................................
-->

<param_set name="Default">
<param type="alg" name="AxialFormFactorModel"> genie::DipoleAxialFormFactorModel/Default </param>
<param type="double" name="EL-Axial-Eta"> 0.12 </param>
</param_set>

</alg_conf>
7 changes: 2 additions & 5 deletions config/BBA03ELFormFactorsModel.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Configurable Parameters:
.........................................................................................
Name Type Optional Comment Default
.........................................................................................
EL-Mv double No Vector Mass
QEL-Mv double No Vector Mass CommonParam[QuasiElastic]
AnomMagnMoment-P double No p Anomalous Magn Moment CommonParam[MagnMoments]
AnomMagnMoment-N double No n Anomalous Magn Moment CommonParam[MagnMoments]
Gep-a2 double No BBA2003 fit param for Gep bba2003::kGep_a2
Expand Down Expand Up @@ -38,9 +38,7 @@ Q2Max double No Q2>Q2max :Gep/Gmp is const bba2003::kQ2M

<param_set name="Default">

<param type="string" name="CommonParam"> MagnMoments </param>

<param type="double" name="EL-Mv"> 0.840 </param>
<param type="string" name="CommonParam"> QuasiElastic,MagnMoments </param>

<!--
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down Expand Up @@ -75,4 +73,3 @@ Q2Max double No Q2>Q2max :Gep/Gmp is const bba2003::kQ2M
</param_set>

</alg_conf>

8 changes: 2 additions & 6 deletions config/DipoleELFormFactorsModel.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,14 @@ Algorithm Configurable Parameters:
.........................................................................................
Name Type Optional Comment Default
.........................................................................................
EL-Mv double No Vector Mass
QEL-Mv double No Vector Mass CommonParam[QuasiElastic]
AnomMagnMoment-P double No p Anomalous Magn Moment CommonParam[MagnMoments]
AnomMagnMoment-N double No n Anomalous Magn Moment CommonParam[MagnMoments]

-->

<param_set name="Default">
<param type="string" name="CommonParam"> MagnMoments </param>



<param type="string" name="CommonParam"> QuasiElastic,MagnMoments </param>
</param_set>

</alg_conf>

33 changes: 33 additions & 0 deletions config/LwlynSmithFFEM.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="ISO-8859-1"?>

<alg_conf>

<!--
Configuration sets for Llewellyn-Smith QEL EM form factors

Configurable Parameters:
..........................................................................................................
Name Type Optional Comment Default
..........................................................................................................
ElasticFormFactorsModel alg No Elastic form factors model CommonParam[ElasticFF]
UseElFFTransverseEnhancement bool No CommonParam[ElasticFF]
TransverseEnhancement alg No TransverseEnhancement model CommonParam[ElasticFF]
AxialFormFactorModel alg No Axial form factor model
AnomMagnMoment-P double No CommonParam[MagnMoments]
AnomMagnMoment-N double No CommonParam[MagnMoments]
WeinbergAngle double No Weinberg angle CommonParam[WeakInt]
SU3-D double No CommonParam[StrongInt]
SU3-F double No CommonParam[StrongInt]
-->

<param_set name="Default">

<param type="string" name="CommonParam"> WeakInt,MagnMoments,StrongInt,ElasticFF </param>

<!-- Dummy axial form factor model required since this class inherits from LwlynSmithFF.
All axial form factors are set to zero by LwlynSmithFFEM. -->
<param type="alg" name="AxialFormFactorModel"> genie::DipoleAxialFormFactorModel/Default </param>

</param_set>

</alg_conf>
11 changes: 7 additions & 4 deletions config/LwlynSmithFFNC.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,25 @@ Configuration sets for Llewellyn-Smith QEL NC form factors
Configurable Parameters:
........................................................................................................
Name Type Optional Comment Default
ElasticFormFactorsModel alg No Elastic form factors model CommonParam[ElasticFF]
ElasticFormFactorsModel alg No Elastic form factors model CommonParam[ElasticFF]
UseElFFTransverseEnhancement bool No CommonParam[ElasticFF]
TransverseEnhancement alg No TransverseEnhancement model CommonParam[ElasticFF]
AxialFormFactorModel alg No Axial form factor model
TransverseEnhancement alg No TransverseEnhancement model CommonParam[ElasticFF]
AxialFormFactorModel alg No Axial form factor model
AnomMagnMoment-P double No CommonParam[MagnMoments]
AnomMagnMoment-N double No CommonParam[MagnMoments]
WeinbergAngle double No Weinberg angle CommonParam[WeakInt]
WeinbergAngle double No Weinberg angle CommonParam[WeakInt]
SU3-D double No CommonParam[StrongInt]
SU3-F double No CommonParam[StrongInt]
StrangeFormFactorsModel alg No NC strange form factors model
........................................................................................................
-->

<param_set name="Default">

<param type="string" name="CommonParam"> WeakInt,MagnMoments,StrongInt,ElasticFF </param>

<param type="alg" name="AxialFormFactorModel"> genie::DipoleAxialFormFactorModel/Default </param>
<param type="alg" name="StrangeFormFactorsModel"> genie::AhrensNCELStrangeFF/Default </param>

</param_set>

Expand Down
Loading