Skip to content

Update the reweight tool for z expension model #48

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
LiangLiu212 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update the reweight tool for z expension model #48

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f5a435
Update the reweight tool for z expension model
LiangLiu212 Feb 16, 2026
875f4bf
Fix the bug in Axial reweight
LiangLiu212 Mar 13, 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
6 changes: 3 additions & 3 deletions config/GSystUncertaintyTable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,8 +294,8 @@ values for each Reweight tweak dial. All of these have default values of zero.
<param type="double" name="ZExpELFFBN4CCQE@PlusOneSigma"> 41.4534 </param>
<param type="double" name="ZExpELFFBN4CCQE@MinusOneSigma"> 41.4534 </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>
5 changes: 5 additions & 0 deletions src/Apps/gRwght1Param.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
#include "RwCalculators/GReWeightNuXSecNCEL.h"
#include "RwCalculators/GReWeightNuXSecCCQE.h"
#include "RwCalculators/GReWeightNuXSecCCQEELFF.h"
#include "RwCalculators/GReWeightNuXSecCCQEZAFF.h"
#include "RwCalculators/GReWeightNuXSecCCRES.h"
#include "RwCalculators/GReWeightNuXSecCOH.h"
#include "RwCalculators/GReWeightNonResonanceBkg.h"
Expand Down Expand Up @@ -235,6 +236,7 @@ int main(int argc, char ** argv)
rw.AdoptWghtCalc( "xsec_ncel", new GReWeightNuXSecNCEL );
rw.AdoptWghtCalc( "xsec_ccqe", new GReWeightNuXSecCCQE );
rw.AdoptWghtCalc( "xsec_ccqe_elff", new GReWeightNuXSecCCQEELFF );
rw.AdoptWghtCalc( "xsec_ccqe_zaff", new GReWeightNuXSecCCQEZAFF );
rw.AdoptWghtCalc( "xsec_ccqe_axial", new GReWeightNuXSecCCQEaxial );
//rwh - xsec_ccqe_vec is problematic for various tunes
rw.AdoptWghtCalc( "xsec_ccqe_vec", new GReWeightNuXSecCCQEvec );
Expand All @@ -261,11 +263,14 @@ int main(int argc, char ** argv)
rw.AdoptWghtCalc( "delta_rad", new GReWeightDeltaradAngle);

// Get GSystSet and include the (single) input systematic parameter


GSystSet & syst = rw.Systematics();
syst.Init(gOptSyst);

// Fine-tune weight calculators



if ( gOptSyst == kXSecTwkDial_MaCCQE ) {
// By default GReWeightNuXSecCCQE is in `NormAndMaShape' mode
Expand Down
2 changes: 2 additions & 0 deletions src/Apps/gRwghtNCorrelatedParams.cxx
View file
Open in desktop
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
View file
Open in desktop
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