Skip to content

Implementation of 1p1h and npnh Martini et al channels #472

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

Open
lavinia-russo wants to merge 23 commits into
base: master
Choose a base branch
from
+425,973 −189
Open

Implementation of 1p1h and npnh Martini et al channels #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e40601f
2p2h martini et al implementation into G24_12a channel
Apr 10, 2024
0829dd5
try
Apr 10, 2024
40edd61
trying to generate splines for oxygen ecc, not really working
Apr 30, 2024
a210884
O, Ca and C seem to work (little discrepancies with Marco's data). No…
Sep 2, 2024
3eb4046
right hadron tensor tables (FullAll its 2p2h + 3p3h)
Sep 3, 2024
2f92da3
added CCQE but things seem not to work properly still
Oct 24, 2024
7eac9e5
things seem to work, still little things to be understood for CCMEC
Oct 28, 2024
92bde34
changing Eb_ten for o16 and ar40 (or similar), susa still has Eb_ten=…
Oct 2, 2025
15a4dcc
modified to have a smoother line for QE Nieves, shall we keep it?
Oct 2, 2025
16b3f38
deleted subdir for martini htt, will decide what to do
Oct 2, 2025
698d7f2
some comments cleaning but still work to do
Oct 2, 2025
4ff291b
added readme + all tables for 2p2h,3p3h ecc (inverted first line to b…
Oct 3, 2025
126d2dd
now the user can easily change the npnh contribution changing the dir…
Nov 5, 2025
7bd283b
there was a / in the DataPath that caused a problem
Nov 6, 2025
65d26a3
Merge master into martini2p2h, resolved conflicts and kept removal of…
Nov 6, 2025
7a67003
changed Eb_ten = Eb_tgt, not always fEbC, should wait for Stephen's a…
Nov 20, 2025
b6295d8
Matching Eb_ten to tensor_pdg in Xsection files
Dec 1, 2025
3774171
used fEbCa instead of fEbAr, but they are the samegit add src/Physics…
Dec 1, 2025
43fa786
used Calcium tensor_pdg for nuclei with large A
Dec 1, 2025
a7ffbea
used Oxygen for tensor_pdg for A>22 && A<40, but maybe Ca would be be…
Dec 1, 2025
697ac55
Merge branch 'master' into martini2p2h
Jan 20, 2026
c6600bf
using Ca tensor for A>=22 && A<40
Jan 20, 2026
2e41ad6
Address review comments
Feb 11, 2026
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,6 @@ src/Framework/Conventions/GVersion.h
*.rootmap
*_ROOT_DICT_*
*.swp
tobeignored/
subnpnh/
originals/
2 changes: 1 addition & 1 deletion config/EventGenerator.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ XSecModel alg Yes Cross section model used at the thread
<param type="int" name="NModules"> 7 </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::QELEventGeneratorSuSA/Default </param>
<param type="alg" name="Module-2"> genie::QELEventGeneratorSuSA/Default </param>
<param type="alg" name="Module-3"> genie::UnstableParticleDecayer/BeforeHadronTransport </param>
<param type="alg" name="Module-4"> genie::NucDeExcitationSim/Default </param>
<param type="alg" name="Module-5"> genie::HadronTransporter/Default </param>
Expand Down
4 changes: 2 additions & 2 deletions config/G21_11a/CommonParam.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,8 @@ University of Liverpool
<!-- Q3 max for 2p2h model -->
<param type="double" name="NSV-Q3Max"> 2.0 </param>
<!--
<param type="double" name="NSV-Q3Max"> 1.2 </param> // SuSAv2
<param type="double" name="NSV-Q3Max"> 2.0 </param> // Nieves
<param type="double" name="NSV-Q3Max"> 2.0 </param> // SuSAv2
<param type="double" name="NSV-Q3Max"> 1.2 </param> // Nieves
-->
</param_set>

Expand Down
4 changes: 2 additions & 2 deletions config/G21_11a/ModelConfiguration.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ University of Liverpool
<param type="alg" name="XSecModel@genie::EventGenerator/DFR-CC"> genie::ReinDFRPXSec/Default </param>
<param type="alg" name="XSecModel@genie::EventGenerator/DFR-NC"> genie::ReinDFRPXSec/Default </param>

<param type="alg" name="XSecModel@genie::EventGenerator/MEC-CC"> genie::SuSAv2MECPXSec/Default </param>
<param type="alg" name="XSecModel@genie::EventGenerator/MEC-CC"> genie::SuSAv2MECPXSec/Default </param>
<param type="alg" name="XSecModel@genie::EventGenerator/MEC-NC"> genie::EmpiricalMECPXSec2015/Default </param>
<param type="alg" name="XSecModel@genie::EventGenerator/MEC-EM"> genie::SuSAv2MECPXSec/Default </param>
<param type="alg" name="XSecModel@genie::EventGenerator/MEC-EM"> genie::SuSAv2MECPXSec/Default </param>

<param type="alg" name="XSecModel@genie::EventGenerator/NucleonDecay"> genie::DummyPXSec/Default </param>
<param type="alg" name="XSecModel@genie::EventGenerator/NNBarOsc"> genie::NNBarOscDummyPXSec/Default </param>
Expand Down
Loading