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

NC Coherent Gamma production #123

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

NC Coherent Gamma production #123

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
362 commits
Select commit Hold shift + click to select a range
2ddcc37
Trace[1][1] implemented
mroda88 May 26, 2020
5964a1a
implemented trace 1,2
mroda88 May 29, 2020
8f9cd91
Add direct traces 1,3 to 3,3
jsensenig Jul 8, 2020
3fea82b
Add trace for crossed diagram
jsensenig Jul 14, 2020
c2e43a1
Clean up COHDeltaCurrent for building.
jsensenig Jul 14, 2020
a527f99
Clean up code for building, scope variables correctly
jsensenig Jul 14, 2020
bd3deab
Clean up code for building, now compiles
jsensenig Jul 14, 2020
754ffc5
Add +,* operations to GTrace and implement getR calculation
jsensenig Jul 15, 2020
da168cd
Add scalar +,* to GTrace and use correct form factor in R()
jsensenig Jul 15, 2020
97cfa51
Fix +, * operator for GTrace and implement Delta propagator and suppo…
jsensenig Jul 16, 2020
883227a
Fix leftover bugs so code compiles
Jul 17, 2020
60d52dd
Fix the pointer to the Gtrace matrix in *= operator
jsensenig Jul 17, 2020
8f65584
Scheleton for AlvarezRusoSalaCOHGamma cross section
mroda88 Jul 20, 2020
3fe30da
Update LinkDef
mroda88 Jul 20, 2020
2c551f6
Adding FourireBesselFFCalculator
mroda88 Jul 20, 2020
e415836
Update rest of the system to new Calculator idea
mroda88 Jul 20, 2020
c9bcfc5
starting writing interpolation
mroda88 Jul 20, 2020
7f1727e
Add COH Gamma Diff XSection files.
jsensenig Jul 20, 2020
2e5f420
Tidy up CHOGamma code for building
jsensenig Jul 20, 2020
adba501
Add missing include in AlvarezRusoSalaCOHGammaPXSec and fix typo.
jsensenig Jul 20, 2020
0a2edc2
Interpolated function written
mroda88 Jul 21, 2020
eace982
Add (anti)nu contractions, R sum, and calculation of cross section
jsensenig Jul 22, 2020
1fa9cd4
Complete implementation for INterpolation
mroda88 Jul 23, 2020
c109ddd
Proper handling of bool flag
mroda88 Jul 23, 2020
7abbf8a
Add configuration file for Interpolator
mroda88 Jul 23, 2020
5ca1e3c
merge with Jon's work
mroda88 Jul 23, 2020
14b3160
Fix compilation issues
mroda88 Jul 23, 2020
3522032
Tidy up code, change Fermi mom. calculation for propagator
jsensenig Jul 23, 2020
6d50479
Add GTrace contraction, change avg. Fermi mom.
jsensenig Jul 23, 2020
0538ae1
Finish GTrace trace contraction operator
jsensenig Jul 24, 2020
d40db41
Update matrix trace contraction.
jsensenig Jul 24, 2020
ee77214
Sync with Jon's branch
mroda88 Jul 24, 2020
bc682e7
Fix compiling issues
mroda88 Jul 24, 2020
138c06c
Define Complex
mroda88 Jul 24, 2020
75b0134
Add ComplexMatrix
mroda88 Jul 24, 2020
3f93d2d
Fix Gtrace
mroda88 Jul 24, 2020
d8039aa
Little cleanup
mroda88 Jul 24, 2020
4331cd6
Fix compiling issues
mroda88 Jul 24, 2020
77d049f
Merge with Marco's NCGamma branch.
jsensenig Jul 24, 2020
c909875
remove any usage of full vector of incoming neutrinos
mroda88 Jul 30, 2020
1bba81f
Merge with Old generator
mroda88 Jul 30, 2020
b19a235
Adnjust file names
mroda88 Jul 30, 2020
82f0757
Merge branch 'kas771-ksutton_ncgamma_Aug19_phase2' into NCGammaGen
mroda88 Jul 30, 2020
ee75378
Fix compilation error
mroda88 Jul 30, 2020
7393982
other compiling errors
mroda88 Jul 30, 2020
f839237
Fix compilationa and remove old remnants from old code
mroda88 Jul 30, 2020
3955c41
Add NCGamma XSec config, COHDeltaCurrent config and fix bugs in inerp…
jsensenig Jul 31, 2020
4da49f0
Merge Marco NCGamma branch into mine.
jsensenig Jul 31, 2020
6a6ebbd
Add test macro for COH NCGamma model.
jsensenig Jul 31, 2020
9f8045d
Add dependencies on phase spaces
mroda88 Aug 3, 2020
a7982f8
Generator improvements
mroda88 Aug 3, 2020
3fae956
Fixed event generator for rotations
mroda88 Aug 3, 2020
c78a37b
Adding fixes for COH Hadronic generator
mroda88 Aug 3, 2020
1ecef55
Fix compilation issues
mroda88 Aug 3, 2020
da45574
Fix compilation issues
mroda88 Aug 3, 2020
3225d9f
Merge back with John Branch
mroda88 Aug 3, 2020
17e0576
Fix merge issues
mroda88 Aug 3, 2020
81f902c
Merge
mroda88 Aug 3, 2020
a2aa190
Merge branch 'NCGamma' into NCGammaGen
mroda88 Aug 3, 2020
0da3090
Fix running and configuration issues
mroda88 Aug 6, 2020
7a3a5b5
Switch nu and anti-nu contractions to be correct. Add xsection macro.
jsensenig Aug 6, 2020
315b0a8
Fix sync issues
mroda88 Aug 6, 2020
ff32829
Fix sync issues
mroda88 Aug 6, 2020
6e17e8f
Merge branch 'jsensenig-NCGamma' into NCGammaGen
mroda88 Aug 6, 2020
e4c9611
Add kps to COH NC Gamma test
Aug 7, 2020
b40bc19
Complete formula for Lepton energy evaluation
mroda88 Aug 7, 2020
bb22727
Change calculation of Delta propagator p2 and include external xsecti…
Aug 10, 2020
b69ff06
Start event analysis macro
mroda88 Aug 10, 2020
243efc2
First draft of the event processor
mroda88 Aug 10, 2020
1aebecf
Added more plots to the macro
mroda88 Aug 10, 2020
7fbdb2d
Fix momenta used for delta propagators and form factors
mroda88 Aug 11, 2020
a880768
Add t in the iteraction required to generate cross section
mroda88 Aug 11, 2020
a266b12
fix compilation error
mroda88 Aug 11, 2020
2d15098
Fix phase space
mroda88 Aug 11, 2020
cd47ca5
Correct definition of p0 in COH NC Delta R calculation
jsensenig Aug 11, 2020
403b497
Change definition of p0 in trace calclations
jsensenig Aug 13, 2020
613f0a2
Fix diff cross section
mroda88 Aug 15, 2020
5863e0d
Clean machine dependent files
mroda88 Aug 15, 2020
50773e7
Optimise Delta In medium
mroda88 Aug 17, 2020
cacd0d8
Added Eduardo's code in contrib
mroda88 Aug 17, 2020
01d947b
Remove stupid files
mroda88 Aug 17, 2020
42979f8
Clean up COHNCGamma test macro code
jsensenig Aug 18, 2020
6327d67
Attempt to optimise test
mroda88 Aug 20, 2020
58fac75
better output for test
mroda88 Aug 20, 2020
2f38b02
Fix gamma vacuum
mroda88 Aug 20, 2020
b4f1c46
Updated configurations
mroda88 Aug 20, 2020
f5e5e4a
Allow optional configuration of Fermi Momentum Table
mroda88 Aug 20, 2020
7319256
Define functor in the 5D phase space
mroda88 Aug 20, 2020
9c29176
Allow configurable phase space selection
mroda88 Aug 20, 2020
cf2a1b6
Updated integrator
mroda88 Aug 20, 2020
f8fb08d
Adding different integrator
mroda88 Aug 21, 2020
e274fcf
Fix configuration to Angle interation
mroda88 Aug 21, 2020
dbf4369
Add multiplication of nucleon mass with R in COH Gamma model.
jsensenig Aug 26, 2020
91af15c
Specify mass for nucleons
mroda88 Aug 27, 2020
c6f8f17
Add COH gamma to default event generator
mroda88 Aug 27, 2020
63d5744
Add NC GAMMA to NC event generator list
mroda88 Aug 27, 2020
95ca193
Add the DeVries coefficients.
jsensenig Sep 8, 2020
e06ea5e
Fix typos in DeVries coefficients config file.
jsensenig Sep 9, 2020
1458730
Add condition to FF interpolation HasNucleus check.
jsensenig Sep 10, 2020
5f7a913
Add all available nuclei to FF map and interpolation configs. Fix typ…
jsensenig Sep 10, 2020
9a9075d
Add loop over all DeVries FFs to COH NC Gamma xsec test macro.
jsensenig Sep 10, 2020
7db130f
Fix Interpolation constructor
mroda88 Sep 17, 2020
0c9a899
Revert to Map
mroda88 Sep 17, 2020
2016da8
Fix t definition in XSection
mroda88 Sep 18, 2020
7e7a257
Remove noisy output
mroda88 Sep 18, 2020
0966820
Change configurations
mroda88 Sep 20, 2020
2a23f43
Rename form factors
mroda88 Sep 20, 2020
9db7d9a
Optimisation for furhter cuts
mroda88 Sep 21, 2020
20b4b8f
chaing series evaluation order
mroda88 Sep 21, 2020
77f7206
Add DeVries form factor Q range cutoff config and check
jsensenig Sep 21, 2020
740d39f
Add interpolation for Q range
mroda88 Sep 22, 2020
c399e32
Silence the output
mroda88 Sep 22, 2020
1ce6514
Adding QRange for COHFormFactorI
mroda88 Sep 28, 2020
b3af309
Add QRange for Map and Interpolation
mroda88 Sep 28, 2020
af6db3a
Adding skeleton for FF test
mroda88 Sep 28, 2020
c036db0
Finish adding functionality to DeVries form factor test macro
jsensenig Sep 28, 2020
47019c7
Add time information to sline generation
mroda88 Sep 29, 2020
f725ddb
Remove time monitoring from COH Gamma integrator
mroda88 Sep 29, 2020
bb7663e
Updated DeVriesFormFactor.xml
mroda88 Oct 1, 2020
0fe6c03
Make minimum optional
mroda88 Oct 1, 2020
7642950
Merge branch 'NCGammaFix' of github.com:mroda88/Generator into NCGamm…
mroda88 Oct 1, 2020
bf824ac
Interface for COHGammaIntegrationlimits
mroda88 Oct 1, 2020
5a676ac
Write skeleton for integration limit
mroda88 Oct 1, 2020
ac879af
Add xml file
mroda88 Oct 1, 2020
d7145ac
Updated master
mroda88 Oct 1, 2020
6dca4a8
Optimise form factor
mroda88 Oct 1, 2020
1c05712
fix form factor divergence
mroda88 Oct 1, 2020
2653e0f
Add configuration in xml for integrator
mroda88 Oct 2, 2020
b8b377a
Add subalgo for integration limits
mroda88 Oct 2, 2020
1642369
Correct typo
mroda88 Oct 2, 2020
4c4745e
Add configuration for COHKinematicGenerator
mroda88 Oct 2, 2020
8d1e9e5
Add more flags
mroda88 Oct 2, 2020
11fb087
Added pointer to limits to kine generator
mroda88 Oct 2, 2020
8fa48d9
Conform limist
mroda88 Oct 2, 2020
2564bf0
Uniform limits implemented
mroda88 Oct 2, 2020
16027cb
Working consistent limits
mroda88 Oct 2, 2020
830bdaf
Configuration for separate COH algos
mroda88 Oct 3, 2020
7b94bc1
Remove Gamma stuff from COH Pion generator
mroda88 Oct 3, 2020
2215155
Code refactored
mroda88 Oct 3, 2020
d4d9002
Fix configuration for Gamm
mroda88 Oct 3, 2020
f4bd90e
Add configurable initial points
mroda88 Oct 3, 2020
43e2ef4
Fix configuration
mroda88 Oct 3, 2020
03a3cc3
Fix typo from table
mroda88 Oct 8, 2020
df80f76
Restore proper QMax for Carbon
mroda88 Oct 8, 2020
a4df6a0
Changed sub algo hierarchy
mroda88 Oct 8, 2020
6c8719f
updated GammaIntegrationLimits with form factor values
mroda88 Oct 8, 2020
acb5533
Remove x cuts from functors as they are proved to be ineffective and …
mroda88 Oct 9, 2020
72bc284
Add t integration functor for NCGamma model.
jsensenig Oct 14, 2020
6f867b7
Adding new phase space and optimising functor
mroda88 Oct 14, 2020
9a0deaf
Fix typo
mroda88 Oct 14, 2020
bd6ebc6
Add Jacobian for NCGamma model t integration
jsensenig Oct 14, 2020
89042b8
Add new t dependant functor to Linkdef
jsensenig Oct 15, 2020
bf5084b
Fix Jacobian to be always positive and optimize cotan
jsensenig Oct 15, 2020
f4d8543
Add t flag
mroda88 Oct 15, 2020
c4e2f0c
Added functions for NCGamma t functor
jsensenig Oct 15, 2020
4f40399
Merge branch 'NCGammaFix' of github.com:mroda88/Generator into NCGamm…
mroda88 Oct 15, 2020
0d6ce86
Add integration on t
mroda88 Oct 15, 2020
567a2e6
Add event generation in t - single theta_l value only
mroda88 Oct 16, 2020
3e29516
Add chiecks on functor
mroda88 Oct 16, 2020
350e569
Restore functionality
mroda88 Oct 16, 2020
a486b1c
Proper evaluation of kinematical variables
mroda88 Oct 16, 2020
951cd89
set proper variables
mroda88 Oct 20, 2020
521280d
Avoid negative E_l for angle functor
mroda88 Oct 21, 2020
aa4c877
Avoid negative E_l in all functors
mroda88 Oct 21, 2020
2880820
Implement scan for Maximum cross section evaluation
mroda88 Oct 22, 2020
5faefb2
Add macro for event generation validation
jsensenig Oct 23, 2020
bfb09d1
Proper theta_l limit
mroda88 Oct 25, 2020
49fb076
Updated configurations
mroda88 Oct 25, 2020
75475b2
Machinery tested to work up to 500 GeV
mroda88 Oct 25, 2020
a9fee75
Merge branch 'NCGammaFix' of github.com:mroda88/Generator into NCGamm…
mroda88 Oct 25, 2020
5ec597d
minor refinement
mroda88 Oct 25, 2020
c00fbfa
Clean up event gen validiation macro.
jsensenig Oct 27, 2020
2c853dc
Refine event validation macro
jsensenig Oct 27, 2020
0e2f14d
Add variable theta_g
mroda88 Oct 27, 2020
81b672c
implementing configurable rejection
mroda88 Oct 27, 2020
d5b51ec
Clean up event validation macro
jsensenig Oct 27, 2020
3a8db67
Merge branch 'NCGammaFix' of github.com:mroda88/Generator into NCGamm…
mroda88 Oct 28, 2020
bb35ac3
Automate event validation macro.
jsensenig Oct 30, 2020
6f619b0
added form factors for He and N
Nov 5, 2020
0deb930
commented out qmin
Nov 5, 2020
a183172
added remaining qmax values
Nov 5, 2020
15f8c2b
updated interpolation xml
Nov 5, 2020
43794c6
Fix nitrogen
mroda88 Nov 6, 2020
28552b2
Add plot for tritium
mroda88 Nov 6, 2020
a598f48
Fix form factor scanning macro
mroda88 Nov 6, 2020
61e667b
Remove min t from Argon
mroda88 Nov 6, 2020
3954d65
Add rescaling for neutron form factor
mroda88 Nov 12, 2020
5511631
Scheleton for COHProtonFormFactorInterpolation
mroda88 Nov 19, 2020
710c7eb
Some functionality implemented
mroda88 Nov 19, 2020
dafef00
add configuration file
mroda88 Nov 23, 2020
4884789
Add file in master
mroda88 Nov 23, 2020
bd247a7
It seems it compiles
mroda88 Nov 23, 2020
8fe8067
Fix a few small things
mroda88 Nov 23, 2020
bf76e85
All isn fixed
mroda88 Nov 23, 2020
19305f7
sync with master
mroda88 Dec 11, 2020
f53a903
Fix
mroda88 Dec 11, 2020
b602bda
Merge branch 'GENIE-MC-master' into NCGammaFix
mroda88 Dec 11, 2020
50bee4f
Add COHGAMMA to spline generation scripts
mroda88 Dec 11, 2020
70a26a6
Update COH Gamma xsec extraction macro to be faster
jsensenig Dec 18, 2020
cca6659
Changing theta_l binning edges
jsensenig Dec 18, 2020
945e386
Sync with master
mroda88 Jul 29, 2021
bf01390
Merge branch 'GENIE-MC-master' into NCGammaFix
mroda88 Jul 29, 2021
d54a738
change integraion limit xml
mroda88 Jul 29, 2021
1d4a808
proper Gamma limits
mroda88 Jul 29, 2021
7b0f533
Proper Nuclear limits
mroda88 Jul 29, 2021
f2ec7af
Better configuration and W cut
mroda88 Jul 29, 2021
96056d9
Small optimisation for validation code
mroda88 Jul 30, 2021
46779bc
Remove DeVriesFormFactorInterpolation
mroda88 Aug 12, 2021
eefed53
Update AlvarezRusoSalaCOHGammaPXSec.h
mroda88 Aug 13, 2021
b88d53a
Fix space
mroda88 Aug 17, 2021
d6dd41a
fix spelling error
mroda88 Aug 17, 2021
1a8b621
Fix hidden tabs
mroda88 Aug 17, 2021
23259c5
Clang format gSplineXml2Root.cxx
mroda88 Aug 17, 2021
224d2e6
Proper order for phase spaces definitions
mroda88 Aug 17, 2021
f8debf0
Attempt to remove exit
mroda88 Aug 17, 2021
8f5a192
Fix compilation error
mroda88 Aug 17, 2021
f62a7cf
Format COHGammaKinematicGenerator
mroda88 Aug 17, 2021
379115d
More fixing
mroda88 Aug 17, 2021
e315783
Fix typo
mroda88 Aug 17, 2021
46d0b32
Add parenthesis for clarity
mroda88 Aug 17, 2021
8f99b6a
Clang format the COH Pion Generator
mroda88 Aug 17, 2021
fb9da98
Add comment
mroda88 Aug 17, 2021
57bbe2c
Indent DeVriesFormFactorMap
mroda88 Aug 17, 2021
6b9ca47
removed comment
mroda88 Aug 17, 2021
34cd86b
Fix typos
mroda88 Aug 17, 2021
ae54a93
Proper R0 treatment
mroda88 Aug 17, 2021
a6d733a
add Ca5_0 to xml file
mroda88 Aug 18, 2021
471fd3e
Add Ca5_0 in DeltaTransitionFormFactor
mroda88 Aug 18, 2021
5add956
fix conflicts
mroda88 Aug 19, 2021
45db318
Merge branch 'GENIE-MC-master' into NCGammaFix
mroda88 Aug 19, 2021
9e0fa9e
Add small fixes according to review
mroda88 Sep 24, 2021
9f59c10
sort conflicts
mroda88 Sep 24, 2021
0e710fc
Remove pointless decayer
mroda88 Sep 24, 2021
9891881
Proper restart point when failing generation
mroda88 Sep 24, 2021
faea194
A more stringent limit
mroda88 Sep 24, 2021
b568fd0
avoid time wasting
mroda88 Sep 24, 2021
f3a1982
increasing search for maximum cross section
mroda88 Sep 27, 2021
bfcd3d8
Merge with master
mroda88 Feb 6, 2023
7e28865
Fix compilation errors
mroda88 Feb 10, 2023
5a873bb
restore visibility for xsec results
mroda88 Feb 10, 2023
aefffa1
Restore functionality and added new minimisation logic to find max xsec
mroda88 Feb 17, 2023
59a0432
Sync with master
mroda88 Mar 16, 2023
995bf4b
Add correct configuration for CA5(0)
mroda88 Mar 23, 2023
063568a
Fix error
mroda88 Mar 23, 2023
e65bac2
CA5 formula checked
mroda88 Mar 23, 2023
f5a085c
Put pion decay constant in the Resonances CommonParam
mroda88 Mar 23, 2023
a1749e7
Merge pull request #37 from GENIE-MC/master
mroda88 Apr 18, 2023
a657aaf
Merge remote-tracking branch 'origin/NCGammaFix' into GammaSync
mroda88 Apr 18, 2023
4c1518d
Move configuration in AR tune
mroda88 Apr 18, 2023
a2525e9
Fix typo
mroda88 Apr 18, 2023
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
Prev Previous commit
Next Next commit
added form factors for He and N
  • Loading branch information
Kathryn Sutton committed Nov 5, 2020
commit 6f619b0c25598950e99613ed3b5d7c2e448c61d9
9 changes: 8 additions & 1 deletion config/DeVriesFormFactor.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ DV-QMax double No Maximum Q value for the validity of th

<param type="double" name="DV-Radius"> 5.0 </param>

<param type="double" name="DV-QMin"> 0.18 </param>
<param type="double" name="DV-QMax"> 10.10 </param>


<param type="vec-double" name="DV-Coefficient" delim=";">
0.20020e-1 ; 0.41934e-1 ; 0.36254e-1 ; 0.17941e-1 ; 0.46608e-2 ;
0.46834e-2 ; 0.52042e-2 ; 0.38280e-2 ; 0.25661e-2 ; 0.14182e-2 ;
Expand All @@ -71,7 +75,10 @@ DV-QMax double No Maximum Q value for the validity of th
<param type="int" name="DV-Nucleus"> 1000070150 </param>

<param type="double" name="DV-Radius"> 7.0 </param>

<param type="double" name="DV-QMin"> 0.22 </param>
<param type="double" name="DV-QMax"> 3.17 </param>


<param type="vec-double" name="DV-Coefficient" delim=";">
0.25491e-1 ; 0.50618e-1 ; 029822e-1 ; -0.55196e-2 ; -0.15913e-1 ;
-0.76184e-2 ; -0.23992e-2 ; -0.47940e-3
Expand Down
2 changes: 2 additions & 0 deletions config/DeVriesFormFactorMap.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ COH-DV-FormFactor vec-alg No Vector of DeVries sub algo and

<param_set name="Default">
<param type="vec-alg" name="COH-DV-FormFactor" delim=";">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason the lighter elements are left out of this map? 3H and 3He ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. The model is not supposed to be valid for those light nuclei. In fact the model is valid from Carbon only, according to Luis' desires. So removing the FF from here ensures that the process is not considered valid.

genie::DeVriesFormFactor/3He ;
genie::DeVriesFormFactor/12C ;
genie::DeVriesFormFactor/15N ;
genie::DeVriesFormFactor/40Ar
</param>
</param_set>
Expand Down