Skip to content

Commit

Permalink
Merge branch 'master' into smith_moniz_update
Browse files Browse the repository at this point in the history
  • Loading branch information
idkakorin committed Jun 17, 2023
2 parents 8a71042 + 7dd9d05 commit ee3305e
Show file tree
Hide file tree
Showing 256 changed files with 2,861,522 additions and 301 deletions.
34 changes: 34 additions & 0 deletions config/AGKYLowW2019.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,50 @@ KNO-Beta-vp double No b for vp
KNO-Beta-vn double No b for vn KNO-Alpha-vn
KNO-Beta-vbp double No b for vbp KNO-Alpha-vbp
KNO-Beta-vbn double No b for vbn KNO-Alpha-vbn
KNO-EM-Alpha-vp double No a for vp in <mult> = a + blnW^2 KNO-EM-Alpha-vp
KNO-EM-Alpha-vn double Yes a for vn KNO-EM-Alpha-vn
KNO-EM-Alpha-vbp double No a for vbp KNO-EM-Alpha-vbp
KNO-EM-Alpha-vbn double No a for vbn KNO-EM-Alpha-vbn
KNO-EM-Beta-vp double No b for vp KNO-EM-Alpha-vp
KNO-EM-Beta-vn double No b for vn KNO-EM-Alpha-vn
KNO-EM-Beta-vbp double No b for vbp KNO-EM-Alpha-vbp
KNO-EM-Beta-vbn double No b for vbn KNO-EM-Alpha-vbn
KNO-Alpha-Hyperon double No a in Pstrange = a+blnW^2 KNO-Alpha-Hyperon
KNO-Beta-Hyperon double No b in Pstrange = a+blnW^2 KNO-Beta-Hyperon
KNO-LevyC-vp double No Levy function param c for vp KNO-LevyC-vp
KNO-LevyC-vn double No Levy function param c for vn KNO-LevyC-vn
KNO-LevyC-vbp double No Levy function param c for vbp KNO-LevyC-vbp
KNO-LevyC-vbn double No Levy function param c for vbn KNO-LevyC-vbn
KNO-EM-LevyC-vp double No Levy function param c for vp KNO-EM-LevyC-vp
KNO-EM-LevyC-vn double No Levy function param c for vn KNO-EM-LevyC-vn
KNO-EM-LevyC-vbp double No Levy function param c for vbp KNO-EM-LevyC-vbp
KNO-EM-LevyC-vbn double No Levy function param c for vbn KNO-EM-LevyC-vbn
ForceNeugenMultLimit bool Yes force neugen upper multiplicity limit (10) false
Wcut double No W cut in DIS/RES join scheme CommonParam[NonResBackground]
DIS-HMultWgt-vp-CC-m2 double No scaling factor, vp CC, multiplicity=2 CommonParam[NonResBackground]
DIS-HMultWgt-vp-CC-m3 double No scaling factor, vp CC, multiplicity=3 CommonParam[NonResBackground]
DIS-HMultWgt-vp-NC-m2 double No scaling factor, vp NC, multiplicity=2 CommonParam[NonResBackground]
DIS-HMultWgt-vp-NC-m3 double No scaling factor, vp NC, multiplicity=3 CommonParam[NonResBackground]
DIS-HMultWgt-vp-EM-m2 double No scaling factor, vp EM, multiplicity=2 CommonParam[NonResBackground]
DIS-HMultWgt-vp-EM-m3 double No scaling factor, vp EM, multiplicity=3 CommonParam[NonResBackground]
DIS-HMultWgt-vn-CC-m2 double No scaling factor, vn CC, multiplicity=2 CommonParam[NonResBackground]
DIS-HMultWgt-vn-CC-m3 double No scaling factor, vn CC, multiplicity=3 CommonParam[NonResBackground]
DIS-HMultWgt-vn-NC-m2 double No scaling factor, vn NC, multiplicity=2 CommonParam[NonResBackground]
DIS-HMultWgt-vn-NC-m3 double No scaling factor, vn NC, multiplicity=3 CommonParam[NonResBackground]
DIS-HMultWgt-vn-EM-m2 double No scaling factor, vn EM, multiplicity=2 CommonParam[NonResBackground]
DIS-HMultWgt-vn-EM-m3 double No scaling factor, vn EM, multiplicity=3 CommonParam[NonResBackground]
DIS-HMultWgt-vbp-CC-m2 double No scaling factor, vbp CC, multiplicity=2 CommonParam[NonResBackground]
DIS-HMultWgt-vbp-CC-m3 double No scaling factor, vbp CC, multiplicity=3 CommonParam[NonResBackground]
DIS-HMultWgt-vbp-NC-m2 double No scaling factor, vbp NC, multiplicity=2 CommonParam[NonResBackground]
DIS-HMultWgt-vbp-NC-m3 double No scaling factor, vbp NC, multiplicity=3 CommonParam[NonResBackground]
DIS-HMultWgt-vbp-EM-m2 double No scaling factor, vbp EM, multiplicity=2 CommonParam[NonResBackground]
DIS-HMultWgt-vbp-EM-m3 double No scaling factor, vbp EM, multiplicity=3 CommonParam[NonResBackground]
DIS-HMultWgt-vbn-CC-m2 double No scaling factor, vbn CC, multiplicity=2 CommonParam[NonResBackground]
DIS-HMultWgt-vbn-CC-m3 double No scaling factor, vbn CC, multiplicity=3 CommonParam[NonResBackground]
DIS-HMultWgt-vbn-NC-m2 double No scaling factor, vbn NC, multiplicity=2 CommonParam[NonResBackground]
DIS-HMultWgt-vbn-NC-m3 double No scaling factor, vbn NC, multiplicity=3 CommonParam[NonResBackground]
DIS-HMultWgt-vbn-EM-m2 double No scaling factor, vbn EM, multiplicity=2 CommonParam[NonResBackground]
DIS-HMultWgt-vbn-EM-m3 double No scaling factor, vbn EM, multiplicity=3 CommonParam[NonResBackground]
KNO-ProbPi0Pi0 double No probability for pi0 pair KNO-ProbPi0Pi0
KNO-ProbPiplusPiminus double No probability for pi+pi- pair KNO-ProbPiplusPiminus
KNO-ProbKplusKminus double No probability for K+K- pair KNO-ProbKplusKminus
Expand Down Expand Up @@ -75,6 +95,15 @@ KNO-PhaseSpDec-ReweightParm double Yes parameter controlling the reweig
<param type="double" name="KNO-Beta-vn"> 1.42 </param>
<param type="double" name="KNO-Beta-vbp"> 1.28 </param>
<param type="double" name="KNO-Beta-vbn"> 0.95 </param>

<param type="double" name="KNO-EM-Alpha-vp"> 0.40 </param>
<param type="double" name="KNO-EM-Alpha-vn"> -0.20 </param>
<param type="double" name="KNO-EM-Alpha-vbp"> 0.02 </param>
<param type="double" name="KNO-EM-Alpha-vbn"> 0.80 </param>
<param type="double" name="KNO-EM-Beta-vp"> 1.42 </param>
<param type="double" name="KNO-EM-Beta-vn"> 1.42 </param>
<param type="double" name="KNO-EM-Beta-vbp"> 1.28 </param>
<param type="double" name="KNO-EM-Beta-vbn"> 0.95 </param>

<!--
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand All @@ -99,6 +128,11 @@ KNO-PhaseSpDec-ReweightParm double Yes parameter controlling the reweig
<param type="double" name="KNO-LevyC-vbp"> 5.22 </param>
<param type="double" name="KNO-LevyC-vbn"> 7.93 </param>

<param type="double" name="KNO-EM-LevyC-vp"> 7.93 </param>
<param type="double" name="KNO-EM-LevyC-vn"> 5.22 </param>
<param type="double" name="KNO-EM-LevyC-vbp"> 5.22 </param>
<param type="double" name="KNO-EM-LevyC-vbn"> 7.93 </param>

<!--
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
AGKY/KNO hadronization model probabilities for producing hadron pairs.
Expand Down
9 changes: 8 additions & 1 deletion config/AR23_20i/CommonParam.xml
Original file line number Diff line number Diff line change
Expand Up @@ -98,19 +98,26 @@ University of Liverpool
<param type="double" name="DIS-HMultWgt-vp-CC-m3"> 0.943153 </param>
<param type="double" name="DIS-HMultWgt-vp-NC-m2"> 0.100 </param>
<param type="double" name="DIS-HMultWgt-vp-NC-m3"> 1.000 </param>
<param type="double" name="DIS-HMultWgt-vp-EM-m2"> 0.100 </param>
<param type="double" name="DIS-HMultWgt-vp-EM-m3"> 1.000 </param>
<param type="double" name="DIS-HMultWgt-vn-CC-m2"> 0.030802 </param>
<param type="double" name="DIS-HMultWgt-vn-CC-m3"> 2.338338 </param>
<param type="double" name="DIS-HMultWgt-vn-NC-m2"> 0.300 </param>
<param type="double" name="DIS-HMultWgt-vn-NC-m3"> 1.000 </param>
<param type="double" name="DIS-HMultWgt-vn-EM-m2"> 0.300 </param>
<param type="double" name="DIS-HMultWgt-vn-EM-m3"> 1.000 </param>
<param type="double" name="DIS-HMultWgt-vbp-CC-m2"> 0.030802 </param>
<param type="double" name="DIS-HMultWgt-vbp-CC-m3"> 2.338338 </param>
<param type="double" name="DIS-HMultWgt-vbp-NC-m2"> 0.300 </param>
<param type="double" name="DIS-HMultWgt-vbp-NC-m3"> 1.000 </param>
<param type="double" name="DIS-HMultWgt-vbp-EM-m2"> 0.300 </param>
<param type="double" name="DIS-HMultWgt-vbp-EM-m3"> 1.000 </param>
<param type="double" name="DIS-HMultWgt-vbn-CC-m2"> 0.008 </param>
<param type="double" name="DIS-HMultWgt-vbn-CC-m3"> 0.943153 </param>
<param type="double" name="DIS-HMultWgt-vbn-NC-m2"> 0.100 </param>
<param type="double" name="DIS-HMultWgt-vbn-NC-m3"> 1.000 </param>

<param type="double" name="DIS-HMultWgt-vbn-EM-m2"> 0.100 </param>
<param type="double" name="DIS-HMultWgt-vbn-EM-m3"> 1.000 </param>
</param_set>


Expand Down
2 changes: 2 additions & 0 deletions config/BergerSehgalRESPXSec2014.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Name Type Optional Comment
......................................................................................................................................
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
minibooneGA bool No tuning to axial form factors by MiniBoone (J. Nowak)
Expand Down Expand Up @@ -47,6 +48,7 @@ XSec-Integrator alg No

<param type="double" name="RES-CC-XSecScale"> 1.000 </param>
<param type="double" name="RES-NC-XSecScale"> 1.000 </param>
<param type="double" name="RES-EM-XSecScale"> 1.000 </param>

<param type="double" name="RES-Omega"> 1.05 </param>
<param type="double" name="RES-Zeta"> 0.76338 </param>
Expand Down
2 changes: 1 addition & 1 deletion config/BostedChristyEMPXSec.xml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ XSec-Integrator alg No
<param type="double" name="BostedChristy-SeparationE@Pdg=1000190380"> 0.018 </param> <!-- 25 < A <= 38 -->
<param type="double" name="BostedChristy-SeparationE@Pdg=1000230550"> 0.028 </param> <!-- 38 < A <= 55 -->
<param type="double" name="BostedChristy-SeparationE@Pdg=1000300600"> 0.018 </param> <!-- 55 < A <= 60 -->
<param type="double" name="BostedChristy-SeparationE@Pdg=1000310610"> 0.028 </param> <!-- 60 < A -->
<param type="double" name="BostedChristy-SeparationE@Pdg=1000310610"> 0.018 </param> <!-- 60 < A -->


<!-- Fermi momentum are not the same as provided by the FermiMomentumTable
Expand Down
86 changes: 86 additions & 0 deletions config/CRPAQELHadronTensorModel.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
<?xml version="1.0" encoding="ISO-8859-1"?>

<alg_conf>

<!-- Configuration for the SuSAv2QELHadronTensorModel algorithm.
Configurable Parameters:
.....................................................................................................
Name Type Optional Comment Default
.....................................................................................................
DataPath string No Folder in which to look for the
hadron tensor table files
DataPathType string Yes Whether the specified path is relative
absolute or relative to the
root GENIE folder
-->

<param_set name="Default">

<param type="bool" name="WarnIfMissing"> true </param>

<param type="string" name="DataPath"> data/evgen/hadron_tensors/crpa </param>
<param type="string" name="DataPathType"> relative </param>
<!-- Paths can be absolute or relative to the $GENIE folder -->
<!-- <param type="string" name="DataPathType"> relative </param> -->

<param type="string" name="QE_CRPA_Low@Pdg=1000060120"> CRPA_1000060120_QE_Low.dat </param>
<param type="string" name="QE_CRPA_Medium@Pdg=1000060120"> CRPA_1000060120_QE_Medium.dat </param>
<param type="string" name="QE_CRPA_High@Pdg=1000060120"> CRPA_1000060120_QE_High.dat </param>

<param type="string" name="QE_CRPA_Low@Pdg=1000080160"> CRPA_1000080160_QE_Low.dat </param>
<param type="string" name="QE_CRPA_Medium@Pdg=1000080160"> CRPA_1000080160_QE_Medium.dat </param>
<param type="string" name="QE_CRPA_High@Pdg=1000080160"> CRPA_1000080160_QE_High.dat </param>

<param type="string" name="QE_CRPA_Low@Pdg=1000180400"> CRPA_1000180400_QE_Low.dat </param>
<param type="string" name="QE_CRPA_Medium@Pdg=1000180400"> CRPA_1000180400_QE_Medium.dat </param>
<param type="string" name="QE_CRPA_High@Pdg=1000180400"> CRPA_1000180400_QE_High.dat </param>


<param type="string" name="QE_CRPA_anu_Low@Pdg=1000060120"> CRPA_1000060120_anu_QE_Low.dat </param>
<param type="string" name="QE_CRPA_anu_Medium@Pdg=1000060120"> CRPA_1000060120_anu_QE_Medium.dat </param>
<param type="string" name="QE_CRPA_anu_High@Pdg=1000060120"> CRPA_1000060120_anu_QE_High.dat </param>

<param type="string" name="QE_CRPA_anu_Low@Pdg=1000080160"> CRPA_1000080160_anu_QE_Low.dat </param>
<param type="string" name="QE_CRPA_anu_Medium@Pdg=1000080160"> CRPA_1000080160_anu_QE_Medium.dat </param>
<param type="string" name="QE_CRPA_anu_High@Pdg=1000080160"> CRPA_1000080160_anu_QE_High.dat </param>

<param type="string" name="QE_CRPA_anu_Low@Pdg=1000180400"> CRPA_1000180400_anu_QE_Low.dat </param>
<param type="string" name="QE_CRPA_anu_Medium@Pdg=1000180400"> CRPA_1000180400_anu_QE_Medium.dat </param>
<param type="string" name="QE_CRPA_anu_High@Pdg=1000180400"> CRPA_1000180400_anu_QE_High.dat </param>




<param type="string" name="QE_HF_Low@Pdg=1000060120"> HF_1000060120_QE_Low.dat </param>
<param type="string" name="QE_HF_Medium@Pdg=1000060120"> HF_1000060120_QE_Medium.dat </param>
<param type="string" name="QE_HF_High@Pdg=1000060120"> HF_1000060120_QE_High.dat </param>

<param type="string" name="QE_HF_Low@Pdg=1000080160"> HF_1000080160_QE_Low.dat </param>
<param type="string" name="QE_HF_Medium@Pdg=1000080160"> HF_1000080160_QE_Medium.dat </param>
<param type="string" name="QE_HF_High@Pdg=1000080160"> HF_1000080160_QE_High.dat </param>

<param type="string" name="QE_HF_Low@Pdg=1000180400"> HF_1000180400_QE_Low.dat </param>
<param type="string" name="QE_HF_Medium@Pdg=1000180400"> HF_1000180400_QE_Medium.dat </param>
<param type="string" name="QE_HF_High@Pdg=1000180400"> HF_1000180400_QE_High.dat </param>


<param type="string" name="QE_HF_anu_Low@Pdg=1000060120"> HF_1000060120_anu_QE_Low.dat </param>
<param type="string" name="QE_HF_anu_Medium@Pdg=1000060120"> HF_1000060120_anu_QE_Medium.dat </param>
<param type="string" name="QE_HF_anu_High@Pdg=1000060120"> HF_1000060120_anu_QE_High.dat </param>

<param type="string" name="QE_HF_anu_Low@Pdg=1000080160"> HF_1000080160_anu_QE_Low.dat </param>
<param type="string" name="QE_HF_anu_Medium@Pdg=1000080160"> HF_1000080160_anu_QE_Medium.dat </param>
<param type="string" name="QE_HF_anu_High@Pdg=1000080160"> HF_1000080160_anu_QE_High.dat </param>

<param type="string" name="QE_HF_anu_Low@Pdg=1000180400"> HF_1000180400_anu_QE_Low.dat </param>
<param type="string" name="QE_HF_anu_Medium@Pdg=1000180400"> HF_1000180400_anu_QE_Medium.dat </param>
<param type="string" name="QE_HF_anu_High@Pdg=1000180400"> HF_1000180400_anu_QE_High.dat </param>




</param_set>

</alg_conf>
10 changes: 9 additions & 1 deletion config/CommonParam.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ University of Liverpool
<param_set name="Tunable">
<!-- Reserved register for tuning -->

<!-- <param type="double" name="DIS-XSecScale"> 1.032 </param> -->
<!-- <param type="double" name="DIS-CC-XSecScale"> 1.032 </param> -->
<!-- <param type="double" name="MEC-CC-XSecScale"> 1.000 </param> -->


Expand Down Expand Up @@ -97,18 +97,26 @@ University of Liverpool
<param type="double" name="DIS-HMultWgt-vp-CC-m3"> 1.000 </param>
<param type="double" name="DIS-HMultWgt-vp-NC-m2"> 0.100 </param>
<param type="double" name="DIS-HMultWgt-vp-NC-m3"> 1.000 </param>
<param type="double" name="DIS-HMultWgt-vp-EM-m2"> 0.100 </param>
<param type="double" name="DIS-HMultWgt-vp-EM-m3"> 1.000 </param>
<param type="double" name="DIS-HMultWgt-vn-CC-m2"> 0.300 </param>
<param type="double" name="DIS-HMultWgt-vn-CC-m3"> 1.000 </param>
<param type="double" name="DIS-HMultWgt-vn-NC-m2"> 0.300 </param>
<param type="double" name="DIS-HMultWgt-vn-NC-m3"> 1.000 </param>
<param type="double" name="DIS-HMultWgt-vn-EM-m2"> 0.300 </param>
<param type="double" name="DIS-HMultWgt-vn-EM-m3"> 1.000 </param>
<param type="double" name="DIS-HMultWgt-vbp-CC-m2"> 0.300 </param>
<param type="double" name="DIS-HMultWgt-vbp-CC-m3"> 1.000 </param>
<param type="double" name="DIS-HMultWgt-vbp-NC-m2"> 0.300 </param>
<param type="double" name="DIS-HMultWgt-vbp-NC-m3"> 1.000 </param>
<param type="double" name="DIS-HMultWgt-vbp-EM-m2"> 0.300 </param>
<param type="double" name="DIS-HMultWgt-vbp-EM-m3"> 1.000 </param>
<param type="double" name="DIS-HMultWgt-vbn-CC-m2"> 0.100 </param>
<param type="double" name="DIS-HMultWgt-vbn-CC-m3"> 1.000 </param>
<param type="double" name="DIS-HMultWgt-vbn-NC-m2"> 0.100 </param>
<param type="double" name="DIS-HMultWgt-vbn-NC-m3"> 1.000 </param>
<param type="double" name="DIS-HMultWgt-vbn-EM-m2"> 0.100 </param>
<param type="double" name="DIS-HMultWgt-vbn-EM-m3"> 1.000 </param>

</param_set>

Expand Down
10 changes: 9 additions & 1 deletion config/EX00_00a/CommonParam.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ University of Liverpool
<param_set name="Tunable">
<!-- Reserved register for tuning -->

<!-- <param type="double" name="DIS-XSecScale"> 1.032 </param> -->
<!-- <param type="double" name="DIS-CC-XSecScale"> 1.032 </param> -->
<!-- <param type="double" name="MEC-CC-XSecScale"> 1.000 </param> -->


Expand Down Expand Up @@ -97,18 +97,26 @@ University of Liverpool
<param type="double" name="DIS-HMultWgt-vp-CC-m3"> 1.000 </param>
<param type="double" name="DIS-HMultWgt-vp-NC-m2"> 0.100 </param>
<param type="double" name="DIS-HMultWgt-vp-NC-m3"> 1.000 </param>
<param type="double" name="DIS-HMultWgt-vp-EM-m2"> 0.100 </param>
<param type="double" name="DIS-HMultWgt-vp-EM-m3"> 1.000 </param>
<param type="double" name="DIS-HMultWgt-vn-CC-m2"> 0.300 </param>
<param type="double" name="DIS-HMultWgt-vn-CC-m3"> 1.000 </param>
<param type="double" name="DIS-HMultWgt-vn-NC-m2"> 0.300 </param>
<param type="double" name="DIS-HMultWgt-vn-NC-m3"> 1.000 </param>
<param type="double" name="DIS-HMultWgt-vn-EM-m2"> 0.300 </param>
<param type="double" name="DIS-HMultWgt-vn-EM-m3"> 1.000 </param>
<param type="double" name="DIS-HMultWgt-vbp-CC-m2"> 0.300 </param>
<param type="double" name="DIS-HMultWgt-vbp-CC-m3"> 1.000 </param>
<param type="double" name="DIS-HMultWgt-vbp-NC-m2"> 0.300 </param>
<param type="double" name="DIS-HMultWgt-vbp-NC-m3"> 1.000 </param>
<param type="double" name="DIS-HMultWgt-vbp-EM-m2"> 0.300 </param>
<param type="double" name="DIS-HMultWgt-vbp-EM-m3"> 1.000 </param>
<param type="double" name="DIS-HMultWgt-vbn-CC-m2"> 0.100 </param>
<param type="double" name="DIS-HMultWgt-vbn-CC-m3"> 1.000 </param>
<param type="double" name="DIS-HMultWgt-vbn-NC-m2"> 0.100 </param>
<param type="double" name="DIS-HMultWgt-vbn-NC-m3"> 1.000 </param>
<param type="double" name="DIS-HMultWgt-vbn-EM-m2"> 0.100 </param>
<param type="double" name="DIS-HMultWgt-vbn-EM-m3"> 1.000 </param>

</param_set>

Expand Down
Loading

0 comments on commit ee3305e

Please sign in to comment.