Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
85 changes: 2 additions & 83 deletions config/GSystUncertaintyTable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -298,88 +298,7 @@ values for each Reweight tweak dial. All of these have default values of zero.
form factors, added by Liang Liu -->
<param type="double" name="ZExpELFFCCQE@PlusOneSigma"> 1.0 </param>
<param type="double" name="ZExpELFFCCQE@MinusOneSigma"> 1.0 </param>
<param type="double" name="ZExpELFFAP1CCQE@PlusOneSigma"> 0.00651536 </param>
<param type="double" name="ZExpELFFAP1CCQE@MinusOneSigma"> 0.00651536 </param>
<param type="double" name="ZExpELFFAP2CCQE@PlusOneSigma"> 0.542931 </param>
<param type="double" name="ZExpELFFAP2CCQE@MinusOneSigma"> 0.542931 </param>
<param type="double" name="ZExpELFFAP3CCQE@PlusOneSigma"> 0.0806644 </param>
<param type="double" name="ZExpELFFAP3CCQE@MinusOneSigma"> 0.0806644 </param>
<param type="double" name="ZExpELFFAP4CCQE@PlusOneSigma"> 0.31642 </param>
<param type="double" name="ZExpELFFAP4CCQE@MinusOneSigma"> 0.31642 </param>
<param type="double" name="ZExpELFFBP1CCQE@PlusOneSigma"> 0.00732559 </param>
<param type="double" name="ZExpELFFBP1CCQE@MinusOneSigma"> 0.00732559 </param>
<param type="double" name="ZExpELFFBP2CCQE@PlusOneSigma"> 0.957567 </param>
<param type="double" name="ZExpELFFBP2CCQE@MinusOneSigma"> 0.957567 </param>
<param type="double" name="ZExpELFFBP3CCQE@PlusOneSigma"> 0.122259 </param>
<param type="double" name="ZExpELFFBP3CCQE@MinusOneSigma"> 0.122259 </param>
<param type="double" name="ZExpELFFBP4CCQE@PlusOneSigma"> 1.07998 </param>
<param type="double" name="ZExpELFFBP4CCQE@MinusOneSigma"> 1.07998 </param>
<param type="double" name="ZExpELFFAN1CCQE@PlusOneSigma"> 0.211503 </param>
<param type="double" name="ZExpELFFAN1CCQE@MinusOneSigma"> 0.211503 </param>
<param type="double" name="ZExpELFFAN2CCQE@PlusOneSigma"> 0.227601 </param>
<param type="double" name="ZExpELFFAN2CCQE@MinusOneSigma"> 0.227601 </param>
<param type="double" name="ZExpELFFAN3CCQE@PlusOneSigma"> 2.08218 </param>
<param type="double" name="ZExpELFFAN3CCQE@MinusOneSigma"> 2.08218 </param>
<param type="double" name="ZExpELFFAN4CCQE@PlusOneSigma"> 1.57799 </param>
<param type="double" name="ZExpELFFAN4CCQE@MinusOneSigma"> 1.57799 </param>
<param type="double" name="ZExpELFFBN1CCQE@PlusOneSigma"> 0.0276021 </param>
<param type="double" name="ZExpELFFBN1CCQE@MinusOneSigma"> 0.0276021 </param>
<param type="double" name="ZExpELFFBN2CCQE@PlusOneSigma"> 0.773313 </param>
<param type="double" name="ZExpELFFBN2CCQE@MinusOneSigma"> 0.773313 </param>
<param type="double" name="ZExpELFFBN3CCQE@PlusOneSigma"> 0.283653 </param>
<param type="double" name="ZExpELFFBN3CCQE@MinusOneSigma"> 0.283653 </param>
<param type="double" name="ZExpELFFBN4CCQE@PlusOneSigma"> 41.4534 </param>
<param type="double" name="ZExpELFFBN4CCQE@MinusOneSigma"> 41.4534 </param>

</param_set>

<!-- Additional parameter sets for z-expansion axial form factors added by J. Plows -->
<!-- T. Cai et al (MINERvA), Nature 614 (2023) 48-53, kmax=8 -->
<param_set name="ZExpAxialFF-minervaNature">
<param type="double" name="ZExpA1CCQE@PlusOneSigma"> 0.31 </param>
<param type="double" name="ZExpA1CCQE@MinusOneSigma"> 0.31 </param>

<param type="double" name="ZExpA2CCQE@PlusOneSigma"> 0.7 </param>
<param type="double" name="ZExpA2CCQE@MinusOneSigma"> 0.7 </param>

<param type="double" name="ZExpA3CCQE@PlusOneSigma"> 1.9 </param>
<param type="double" name="ZExpA3CCQE@MinusOneSigma"> 1.9 </param>

<param type="double" name="ZExpA4CCQE@PlusOneSigma"> 3.5 </param>
<param type="double" name="ZExpA4CCQE@MinusOneSigma"> 3.5 </param>
</param_set>

<!-- A. Meyer et al (MINERvA), arXiv: 2512.14097, kmax=6 -->
<!-- This publication also includes a LQCD fit so we put this in too -->
<param_set name="ZExpAxialFF-minervaElementaryTarget">
<param type="double" name="ZExpA1CCQE@PlusOneSigma"> 0.24 </param>
<param type="double" name="ZExpA1CCQE@MinusOneSigma"> 0.24 </param>

<param type="double" name="ZExpA2CCQE@PlusOneSigma"> 0.30 </param>
<param type="double" name="ZExpA2CCQE@MinusOneSigma"> 0.30 </param>

<param type="double" name="ZExpA3CCQE@PlusOneSigma"> 0.0 </param>
<param type="double" name="ZExpA3CCQE@MinusOneSigma"> 0.0 </param>

<param type="double" name="ZExpA4CCQE@PlusOneSigma"> 0.0 </param>
<param type="double" name="ZExpA4CCQE@MinusOneSigma"> 0.0 </param>
</param_set>

<param_set name="ZExpAxialFF-LQCD">
<param type="double" name="ZExpA1CCQE@PlusOneSigma"> 0.052 </param>
<param type="double" name="ZExpA1CCQE@MinusOneSigma"> 0.052 </param>

<param type="double" name="ZExpA2CCQE@PlusOneSigma"> 0.13 </param>
<param type="double" name="ZExpA2CCQE@MinusOneSigma"> 0.13 </param>

<param type="double" name="ZExpA3CCQE@PlusOneSigma"> 0.0 </param>
<param type="double" name="ZExpA3CCQE@MinusOneSigma"> 0.0 </param>

<param type="double" name="ZExpA4CCQE@PlusOneSigma"> 0.0 </param>
<param type="double" name="ZExpA4CCQE@MinusOneSigma"> 0.0 </param>
</param_set>

<param_set name="CovarianceMatrix">
<param type="mat-double" name="ZExpELFF@CovarianceMatrix" importfile="true"> data/covariances/ELZExpFF.dat </param>
<param type="double" name="ZExpAFF@PlusOneSigma"> 1.0 </param>
<param type="double" name="ZExpAFF@MinusOneSigma"> 1.0 </param>
</param_set>
</alg_conf>
2 changes: 2 additions & 0 deletions src/Apps/gRwght1Param.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
#include "RwFramework/GReWeight.h"
#include "RwCalculators/GReWeightNuXSecNCEL.h"
#include "RwCalculators/GReWeightNuXSecCCQE.h"
#include "RwCalculators/GReWeightNuXSecCCQEZAFF.h"
#include "RwCalculators/GReWeightNuXSecCCQEELFF.h"
#include "RwCalculators/GReWeightNuXSecCCRES.h"
#include "RwCalculators/GReWeightNuXSecCOH.h"
Expand Down Expand Up @@ -236,6 +237,7 @@ int main(int argc, char ** argv)
GReWeight rw;
rw.AdoptWghtCalc( "xsec_ncel", new GReWeightNuXSecNCEL );
rw.AdoptWghtCalc( "xsec_ccqe", new GReWeightNuXSecCCQE );
rw.AdoptWghtCalc( "xsec_ccqe_zaff", new GReWeightNuXSecCCQEZAFF );
rw.AdoptWghtCalc( "xsec_ccqe_elff", new GReWeightNuXSecCCQEELFF );
rw.AdoptWghtCalc( "xsec_ccqe_axial", new GReWeightNuXSecCCQEaxial );
//rwh - xsec_ccqe_vec is problematic for various tunes
Expand Down
2 changes: 2 additions & 0 deletions src/Apps/gRwghtNCorrelatedParams.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -895,6 +895,7 @@ void AdoptWeightCalcs (vector<GSyst_t> lsyst, GReWeight & rw)
rw.AdoptWghtCalc( "xsec_mec", new GReWeightXSecMEC );
}
break;
/*
case kXSecTwkDial_ZExpELFF_AN1:
case kXSecTwkDial_ZExpELFF_AN2:
case kXSecTwkDial_ZExpELFF_AN3:
Expand All @@ -916,6 +917,7 @@ void AdoptWeightCalcs (vector<GSyst_t> lsyst, GReWeight & rw)
rw.AdoptWghtCalc( "xsec_ccqe_elff", new GReWeightNuXSecCCQEELFF );
}
break;
*/
default: // no fine-tuning needed
break;
}
Expand Down
4 changes: 2 additions & 2 deletions src/RwCalculators/GReWeightNuXSecCCQE.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ void GReWeightNuXSecCCQE::Reconfigure(void)
for (int i=0;i<fZExpMaxCoef;i++)
{
alg_key.str(""); // algorithm key for each coefficient
alg_key << fZExpPath << "QEL-Z_A" << i+1;
alg_key << fZExpPath << "QEL-Z_A-" << i;
r.Set(alg_key.str(), fZExpCurr[i]);
}
}
Expand Down Expand Up @@ -478,7 +478,7 @@ void GReWeightNuXSecCCQE::Init(void)
for (int i=0;i<fZExpMaxSyst;i++)
{
alg_key.str("");
alg_key << fZExpPath << "QEL-Z_A" << i+1;
alg_key << fZExpPath << "QEL-Z_A-" << i;
if (fModelIsZExp && i < fZExpMaxCoef)
{ fZExpDef[i] = fXSecModelConfig->GetDouble(alg_key.str()); }
else
Expand Down
Loading