-
Notifications
You must be signed in to change notification settings - Fork 109
BDM Resonant Scattering #471
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
Open
ZWorr
wants to merge
350
commits into
GENIE-MC:master
Choose a base branch
from
ZWorr:Resonant-BDM-Resolved
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
350 commits
Select commit
Hold shift + click to select a range
8dff89d
re-updated
d1e3781
re-updated
fb8d2db
include DMRes
85d6e0d
RemovedUnitarityCondition
90ea641
Updated
50dfefb
Updated
1de3205
Updated
6f0433a
DM consistency check
50d3113
EM-NoPauliBlock
efb59b6
Consistency Checks
6c10db1
Consistency Checks
ec1c1e0
Consistency Checks
4402238
Consistency Checks
0fb7885
DM cross checks
bf9906e
DM cross checks
337a183
DM cross check params
6362134
DM cross check
1c12aba
DM cross check
880d318
DM cross check
ff4f483
DM cross check
2ee4782
removed MedMass divide by zero
4098ea5
New Charge params
4e92a42
New test spline
f0e3494
DM mass
aa522df
updated
5d4c62f
update
3178293
flipped signs
b99e381
flipped sign
3b01892
Updated mZ term
9dd9c93
DM params
9077514
Update
f50d071
Update
280c415
Update
bc8bacd
Update
c0d4421
Including Scalar DM
f6b46b3
nu_e + proton NCRES spline
0614b32
e + proton EMRES spline
3fef142
nu_e + proton DMRES spline
d16b143
e + proton DMRES spline
6c8e6f6
Updated
28dfbe8
revert to orginal
a609344
10000 nu_e + proton NCRES @2Gev event generator
96e3992
10000 e + proton NCRES @2Gev event generator
fa703cc
update benchmark DM params
c1bff3a
comments
48be2ff
Remove EMRES_2GeV.root file
e449189
Add NonRes Events to DM
9282c09
Add files via upload
ZWorr bd2abdf
DM params set for v0 model
e081105
Set to DM Rain
6264051
NonRes
36b4395
Add existing project files to Git
8c8dcfc
Adding all
51a1009
Add All
ZWorr 28ad267
All v2 splines
ZWorr f92f8c6
remove DS_Store
ZWorr 7ab36b7
Remove .DS_Store
ZWorr 99c3c33
Update README.md
jberger7 5c78fcb
Remove Excess
ZWorr 0c56c11
oUpdated CommonParam and DMRESPXSec
ZWorr ce3f5d6
Removed unnecesarry files
ZWorr 0b77e5b
Merge branch 'master' of https://github.com/ZWorr/Generator
ZWorr 5020d1c
finalized RESDM
ZWorr e3b11d9
Finalized RES DM
ZWorr 97483b1
Finalized for DM RES
ZWorr 259aae7
Finalized for DM RES
ZWorr 3dbbfd8
Remove .DS_Stroe files from ../Resonance/..
ZWorr c5fcafe
removed gntp.0.ghep.root
ZWorr 076e806
Update KinePhaseSpace.h
ZWorr 0a4ca1a
Update EventGeneratorListAssembler.xml
ZWorr 1725025
Update Messenger Logs for DM RES and fix division by int in DMHAmpl
ZWorr d054789
Merge branch 'master' of https://github.com/ZWorr/Generator
ZWorr 3c0afe2
Testing github fork
45a2ad9
Testing Fork
8d9ddbd
Forking DM HelicAmpls
f599aa2
Forking DM HelicAmpls
60a9290
Forking DM HelicAmpls
22a58e8
Forking DM HelicAmpls
4872aeb
Forking DM HelicAmpls
86238d4
Forking DM HelicAmpls
0e4741e
Forking DM HelicAmpls
9c9f560
Forking DM HelicAmpls
004d521
Forking DM Res XSec
df1d86d
Forking DM Res XSec
64d9de5
Adding DM Res
0edb23c
Add DM Res
c550d0a
Add DM Res
9a23597
Add DM Res
a6cd675
Update Copy
cadbc33
Add DM Res
bf6980b
Add DM Res
0560f3c
Add DM Res
652f641
Add DM Res
61d0515
Add DM Res
dad25ad
Add DM Res
a68fe76
Update
ba2c2ce
New for DM Res EventGen
5d72f5a
New for DM Res EventGen
e757ff1
New for DM Res EventGen
128eb6f
New for DM Res EventGen
6442399
New for DM Res EventGen
d51a6e5
New for DM Res EventGen
b170afd
New for DM Res EventGen
753eefb
New for DM Res EventGen
3c8e75b
New for DM Res EventGen
5fe9975
New for DM Res EventGen
7cc5dc3
New for DM Res EventGen
cdad271
Updated Res DM
901efa6
Updated Res DM
478ee3b
Updated Res DM
c9342f7
Updated Res DM
f83623c
Updated Res DM
7f1bcf2
Updated Res DM
df3e895
Updated Res DM
12d53d8
Updated Res DM
37fcfc6
Updated Res DM
5a1c2f0
Updated Res DM
aba1b9f
Updated Res DM
b392d00
Updated Res DM
613d948
Updated Res DM
b005eeb
Updated Res DM
5e20732
Updated Res DM
aaf29a4
Updated Res DM
c7054ef
Updated Res DM
0743ebe
Updated Res DM
9184a47
Updated Res DM
5dc89c2
Updated Res DM
05816c1
Updated Res DM
d3c193d
Updated Res DM
1865848
Update to include Res DM
f88e1c5
Update to include Res DM
024f15a
Update to include Res DM
5b5f7a5
Update to include Res DM
7b725d5
Update to include Res DM
def6497
Update to include Res DM
72491e2
Update to include Res DM
37cf307
Update to include Res DM
6521df1
Added for DM RES
b786cc6
Added for DM RES
0c87fc8
Added for DM RES
2a8d0e6
Added for DM RES
e5217ba
New BDM RES
a013f16
New BDM RES
d3abda2
New BDM RES
1a41de5
New BDM RES
35404b2
New BDM RES
f4c8cec
New BDM RES
6f57dea
New BDM RES
28be04c
New BDM RES
06d674b
New BDM RES
0dec067
New BDM RES
dcb05ea
New BDM RES
316faa5
New BDM RES
b39cd39
New BDM RES
adb4ab8
New BDM RES
a43f1d7
Fixed DM XSecScale
178b8ec
Include new form factors
1b9750a
Include quark charge
cfc9232
Include quark charge
92cd45b
update params
9bc0a6b
New Form Factors
a18a6a6
New Form Factors
b7b9e53
New DMRES Fast
0786910
New DMRES Fast
4a4ba4c
New DMRES Fast
9808ec3
New DMRES Fast
c3c3a13
New DMRES Fast
10b4993
New DMRES Fast
342f676
New DMRES Fast
e3b7ee4
New DMRES Fast
4616444
re-updated
fd338f1
re-updated
8098d1f
include DMRes
b768908
RemovedUnitarityCondition
262ffe0
Updated
63cebf6
Updated
c9c1aad
Updated
b10e7b9
DM consistency check
d87d53f
EM-NoPauliBlock
7115c85
Consistency Checks
f794a6a
Consistency Checks
a5ea6a3
Consistency Checks
5d18944
Consistency Checks
cdd1566
DM cross checks
a870edf
DM cross checks
0ae8754
DM cross check params
bdb7901
DM cross check
acbe24c
DM cross check
ff80707
DM cross check
9b7afef
DM cross check
02220dc
removed MedMass divide by zero
a8850ab
New Charge params
a2a7b20
New test spline
b06ff71
DM mass
2b2da23
updated
6a6be81
update
963b99c
flipped signs
b8cc4ef
flipped sign
2b88010
Updated mZ term
350449b
DM params
81e4459
Update
396be6d
Update
ceff538
Update
7e19885
Update
e27dac0
Including Scalar DM
6abf6c3
nu_e + proton NCRES spline
ed4d85a
e + proton EMRES spline
96d52ab
nu_e + proton DMRES spline
d325955
e + proton DMRES spline
bedcfcf
Updated
ce163eb
revert to orginal
670a374
10000 nu_e + proton NCRES @2Gev event generator
87a75bf
10000 e + proton NCRES @2Gev event generator
043c0da
update benchmark DM params
f728838
comments
1ace78f
Remove EMRES_2GeV.root file
41d3fd7
Add NonRes Events to DM
d5f124a
DM params set for v0 model
7544b2a
Set to DM Rain
0bc9726
NonRes
f2d10cf
Add existing project files to Git
8a126d1
Adding all
4ecd166
Add All
ZWorr 8198f07
Removed unnecessary .DS_Store
ZWorr 5a726f1
Add files via upload
ZWorr 3c678b1
remove DS_Store
ZWorr 4efb95c
Remove .DS_Store
ZWorr 7d4a87c
oUpdated CommonParam and DMRESPXSec
ZWorr 730d368
Removed unnecesarry files
ZWorr 204616f
Update README.md
jberger7 8a6a3bc
finalized RESDM
ZWorr 3c01e0e
Finalized RES DM
ZWorr b3ca18b
Finalized for DM RES
ZWorr 1ee0b6e
Finalized for DM RES
ZWorr 1cbf495
Remove .DS_Stroe files from ../Resonance/..
ZWorr 15f3e46
removed gntp.0.ghep.root
ZWorr c538213
Update Messenger Logs for DM RES and fix division by int in DMHAmpl
ZWorr 57a6044
Update KinePhaseSpace.h
ZWorr 1d75ed2
Update EventGeneratorListAssembler.xml
ZWorr 5729326
removed comments added kScNorm=110
ZWorr 7e049c3
removed DMRES comments
ZWorr f08e982
removed ForceInteration
ZWorr 027334f
cleanup comments
ZWorr 92c74e8
Merging. removed comments. returned README to original format.
ZWorr 144f7c5
removed ForceInteraction
ZWorr abb174c
Update functions to sync with master
ZWorr 5891bc2
Update to sync with master
ZWorr 788fa2e
Merge branch 'master' into Resonant-BDM-Resolved
ZWorr c4aa7da
Update KPhaseSpace.cxx
ZWorr cc7a60c
Update EventGenerator.xml
ZWorr 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| <?xml version="1.0" encoding="ISO-8859-1"?> | ||
|
|
||
| <alg_conf> | ||
|
|
||
| <!-- | ||
| Configuration sets for the RESHadronSystemGenerator EventRecordVisitorI | ||
|
|
||
| Configurable Parameters: | ||
| ....................................................................................................... | ||
| Name Type Optional Comment Default | ||
| ....................................................................................................... | ||
| Decayer alg No | ||
| --> | ||
|
|
||
| <param_set name="Default"> | ||
| <param type="alg" name="Decayer"> genie::UnstableParticleDecayer/BeforeHadronTransport </param> | ||
| <!-- | ||
| <param type="alg" name="PreTransportDecayer"> genie::UnstableParticleDecayer/BeforeHadronTransport </param> | ||
| --> | ||
| </param_set> | ||
|
|
||
| </alg_conf> |
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 |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| <?xml version="1.0" encoding="ISO-8859-1"?> | ||
|
|
||
| <!-- | ||
| Configuration for the RESInteractionListGenerator InteractionListGeneratorI | ||
|
|
||
| Configurable Parameters: | ||
| .......................................................................................................................... | ||
| Name Type Opt Comment Default | ||
| .......................................................................................................................... | ||
| ResonanceNameList string No list of resonances to be taken into account CommonParam[Resonances] | ||
| is-DM bool Yes set true for DM list false | ||
| --> | ||
|
|
||
| <alg_conf> | ||
|
|
||
| <param_set name="Default"> | ||
| <param type="string" name="CommonParam"> Resonances </param> | ||
| </param_set> | ||
|
|
||
| <param_set name="DM-Default"> | ||
| <param type="bool" name="is-DM"> true </param> | ||
| </param_set> | ||
|
|
||
| </alg_conf> |
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 |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| <?xml version="1.0" encoding="ISO-8859-1"?> | ||
|
|
||
| <alg_conf> | ||
|
|
||
| <!-- | ||
| Configuration for the RESKinematicsGenerator EventRecordVisitorI | ||
|
|
||
| Algorithm Configurable Parameters: | ||
| ....................................................................................................................... | ||
| Name Type Opt Comment Default | ||
| ....................................................................................................................... | ||
| UniformOverPhaseSpace bool Yes kinematics uniformly over allowd phase space false | ||
| wgt = (phase_space_volume)*(diff_xsec)/(xsec) | ||
| MaxXSec-SafetyFactor double Yes multiplies max xsec in rejection method 1.25 | ||
| MaxXSec-DiffTolerance double Yes max allowed 200*(xsec-xsecmax)/(xsec+xsecmax) 999999 (disable) | ||
| if xsec>xsecmax | ||
| Cache-MinEnergy double Yes minimum energy for which max xsec is cached 1.00 | ||
| --> | ||
|
|
||
| <param_set name="Default"> | ||
| <param type="string" name="CommonParam"> NonResBackground </param> | ||
| </param_set> | ||
|
|
||
|
|
||
| <param_set name="RES"> | ||
|
|
||
| <param type="double" name="MaxXSec-SafetyFactor"> 1.400 </param> | ||
| <param type="double" name="Cache-MinEnergy"> 0.500 </param> | ||
| </param_set> | ||
|
|
||
| <param_set name="SPP"> | ||
| <param type="double" name="MaxXSec-SafetyFactor"> 1.400 </param> | ||
| </param_set> | ||
|
|
||
| </alg_conf> |
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 |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| <?xml version="1.0" encoding="ISO-8859-1"?> | ||
|
|
||
| <alg_conf> | ||
|
|
||
| <!-- | ||
| Configuration for the DMRESPrimaryLeptonGenerator EventRecordVisitorI | ||
|
|
||
| Configurable Parameters: | ||
| ....................................................................................................................... | ||
| Name Type Opt Comment Default | ||
| ....................................................................................................................... | ||
| --> | ||
|
|
||
| <param_set name="Default"> | ||
| <param type="string" name="CommonParam"> Lepton </param> | ||
|
|
||
| </param_set> | ||
|
|
||
| </alg_conf> |
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 |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| <?xml version="1.0" encoding="ISO-8859-1"?> | ||
|
|
||
|
|
||
| <!-- | ||
| Configuration for the Rein-Sehgal RES excitation d^xsec / dQ^2 dW xsec algorithm | ||
| for Dark Matter | ||
|
|
||
| Configurable Parameters: | ||
| ...................................................................................................................................... | ||
| Name Type Optional Comment Default | ||
| ...................................................................................................................................... | ||
| RES-CC-XSecScale double No XSec rescaling factor | ||
| RES-NC-XSecScale double No Xsec rescaling factor | ||
| RES-EM-XSecScale double No Xsec rescaling factor | ||
| RES-Zeta double No FKR's Z parameter | ||
| RES-Omega double No FKR's Omega parameter | ||
| RES-Ma double No RES axial mass | ||
| RES-Mv double No RES vector mass | ||
| WeinbergAngle double No Weinberg Angle CommonParam[WeakInt] | ||
| CKM-Vud double No Magnitude of ud-element of CKM-matrix CommonParam[CKM] | ||
| BreitWeignerWeight bool Yes Weight xsec with breit-wigner? true | ||
| BreitWignerNorm bool Yes Normalize breit-wigner? true | ||
| UseNuTauScalingFactors bool Yes Load/Use NEUGEN reduction factor splines for nutaus true | ||
| UseDRJoinScheme bool No Use DIS/RES joining scheme? CommonParam[NonResBackground] | ||
| Wcut double No Param used in DIS/RES joining CommonParam[NonResBackground] | ||
| MaxNWidthForN2Res double Yes x in limiting allowed W phase space for n=2 res according to 2.0 | ||
| W < min{ Wmin(physical), MassRes + x * WidthRes } | ||
| MaxNWidthForN0Res double Yes As above for n=0 resonances 6.0 | ||
| MaxNWidthForGNres double Yes As above for the remaining resonances 4.0 | ||
| RFG-UseParametrization bool No use parametrization for Fermi momentum and binging energy CommonParam[FermiGas] | ||
|
|
||
| FermiMomentumTable string No Table of Fermi momentum (kF) constants for various nuclei CommonParam[FermiGas] | ||
| XSec-Integrator alg No | ||
| --> | ||
|
|
||
| <alg_conf> | ||
| <param_set name="Velocity0"> | ||
| <param type="string" name="CommonParam"> WeakInt,NonResBackground,CKM,FermiGas,BoostedDarkMatter </param> | ||
|
|
||
| <param type="alg" name="XSec-Integrator"> genie::DMRESXSecFast/Default </param> | ||
|
|
||
| <param type="int" name="velocity-mode"> 0 </param> | ||
| <param type="double" name="RES-DM-XSecScale"> 1.000 </param> | ||
| <param type="double" name="RES-Omega"> 1.05 </param> | ||
| <param type="double" name="RES-Zeta"> 0.76338 </param> <!-- 0.75 --> | ||
| <param type="double" name="RES-Ma"> 1.120 </param> | ||
| <param type="double" name="RES-Mv"> 0.840 </param> | ||
| </param_set> | ||
|
|
||
| <param_set name="Velocity2"> | ||
| <param type="string" name="CommonParam"> WeakInt,NonResBackground,CKM,FermiGas,BoostedDarkMatter </param> | ||
|
|
||
| <param type="alg" name="XSec-Integrator"> genie::DMRESXSecFast/Default </param> | ||
|
|
||
| <param type="int" name="velocity-mode"> 2 </param> | ||
| <param type="double" name="RES-DM-XSecScale"> 1.000 </param> | ||
| <param type="double" name="RES-Omega"> 1.05 </param> | ||
| <param type="double" name="RES-Zeta"> 0.76338 </param> <!-- 0.75 --> | ||
| <param type="double" name="RES-Ma"> 1.120 </param> | ||
| <param type="double" name="RES-Mv"> 0.840 </param> | ||
|
|
||
| </param_set> | ||
|
|
||
| </alg_conf> |
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 |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| <?xml version="1.0" encoding="ISO-8859-1"?> | ||
|
|
||
| <alg_conf> | ||
|
|
||
| <!-- | ||
| Configuration for the DMRESXSec cross section algorithm | ||
| --> | ||
|
|
||
|
|
||
| <param_set name="Default"> | ||
| <param type="string" name ="CommonParam"> Resonances </param> | ||
| <param type="double" name ="ESplineMax"> 500 </param> | ||
| <param type="string" name ="gsl-integration-type"> adaptive </param> | ||
| <param type="int" name ="gsl-max-eval"> 1000000000 </param> | ||
| <param type="double" name ="gsl-relative-tolerance"> 1e-9 </param> | ||
| <!-- NC Scattering uses no Pauli Blocking--> | ||
| <param type="bool" name="UsePauliBlockingForRES"> false </param> | ||
| </param_set> | ||
| </alg_conf> |
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 |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| <?xml version="1.0" encoding="ISO-8859-1"?> | ||
|
|
||
| <alg_conf> | ||
|
|
||
| <!-- | ||
| Configuration for the DMRESXSecFast cross section algorithm | ||
| --> | ||
|
|
||
|
|
||
| <param_set name="Default"> | ||
| <param type="string" name ="CommonParam"> Resonances </param> | ||
| <param type="double" name ="ESplineMax"> 500 </param> | ||
| <param type="string" name ="gsl-integration-type"> adaptive </param> | ||
| <param type="int" name ="gsl-max-eval"> 1000000000 </param> | ||
| <param type="double" name ="gsl-relative-tolerance"> 1e-9 </param> | ||
| <!-- NC Scattering uses no Pauli Blocking--> | ||
| <param type="bool" name="UsePauliBlockingForRES"> false </param> | ||
| </param_set> | ||
| </alg_conf> |
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.