Merge branch 'master' of github.com:NUISANCEMC/nuisance
3edc1008dd65
Actions

Description

Merge branch 'master' of github.com:NUISANCEMC/nuisance

Details

Provenance

lp208	Authored on Dec 10 2020, 9:02 PM
cwret	Pushed on Feb 17 2021, 1:33 AM

Parents

rNUISANCEGITbc71834d8a7a: Adds parameter mirroring to comparison and minimizer routines, Set mirror_point…
rNUISANCEGIT6ca68736bef2: Merge branch 'feature/chi1_calc_zerobin'

Branches

Unknown

Tags

Unknown

Event Timeline

lp208 committed rNUISANCEGIT3edc1008dd65: Merge branch 'master' of github.com:NUISANCEMC/nuisance (authored by lp208).Dec 10 2020, 9:02 PM

Merged Changes

6ca68736bef2 Merge branch 'feature/chi1_calc_zerobin'
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
e0ee340ed756 Simplify the allowed names
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
7cff4ae7c43b Add option to remove signal flags, and fix the mad W definition
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
64c885018b4c X axis units should be radians not GeV
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
059e8d08e07b Produce some half-sensible looking output
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
a0baa356908c Make fDataHist (slightly) more sensible
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
63ee98547b3e Fix units issue
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
784e62eaeac5 Allow multi-flavour usage of the MiniBooNE NC1pi0 samples
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
47b052775344 Add a check for incorrect pdg codes. It's inefficient, but I don't think it…
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
a6f451177388 Remove erroneous printout
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
deaad9a03421 Oops, fix a minor boo boo
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
6e6c4fd3d82d Minor clean up
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
4cd400e39b49 Temporarily work around the NEUT CC diffractive issue
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
f6cade01a25c Minor aesthetic change
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
34cef6ebb051 Add in references for BNL papers
Author
cwret
Browse Repository
No Builds
No Audits
dcd486080dcb Fix seperate --> separate typo just because it got on my nerves
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
ded1c13b7b37 Extra info in case of an issue (but I haven't fixed the issue)
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
c1ed426d48ff Make the mode stacks and separate mode hists have proper axis titles
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
506772ff7917 Correct typo in axis title
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
d2b4e530e15f Lovely lined up printouts (just for you Luke)
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
cefb1dbcb285 A truly minor/inane style change
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
413382026972 Fix potential memory leak/annoying ROOT warning message. The residual hist was…
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
0dc6c1a55ff8 Remove redundant warning (GiBUUInputHandler overrides this method)
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
70b8ab5b9611 Add a uBooNE flux from the data release for 1905.09694v3
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
e3c2da135026 Fix the barrage of int/uint warnings
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
18726a77bc6e Remove C++11
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
05999c8c6084 Hide openmp pragma behind ifdef
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
4fb7907d8556 Additional debug
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
220b55ed97a3 Fix unused variable warnings (just because)
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
e3944a26e92c Avoid c++11
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
2400d80ad124 Fix nt/uint warning
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
ae24f2c47592 Standardise the logging
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
ae198506f20f Compiler warnings...
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
c106c255f430 Compiler warnings
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
70efd2ed99be Minor clean up to avoid annoying compiler warnings
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
697d70e1df87 Hide nova_wgts behind bool, standardise logging
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
4b85ada2ecdb Stop the libraries from getting overexcited
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
6b5af6180338 Merge branch 'feature/chi2_calc_zerobin' of https://github.
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
a8498af89ac7 Fix the XSEC histogram --- this also fixes the multiple FLUX histo bug…
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
ea53171a1533 Neaten up output and give info on removed XML nodes
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
b356002fe42a Make the Stop/StartTalking redirection to work again
Author
wilkinson-nu <cwilkinson@lbl.gov>
Browse Repository
No Builds
No Audits
0bcbb45e51c0 Change dimension of mapping histogram. Mapping histogram currently ignores bins…
Author
cwret
Browse Repository
No Builds
No Audits
0e646e9832d2 Update bin checking error message to account for that we're skipping the…
Author
cwret
Browse Repository
No Builds
No Audits
c6c30d5520fe Merge branch 'master' of github.com:NUISANCEMC/nuisance
Author
cwret
Browse Repository
No Builds
No Audits
7ff41f4288f4 Check which no-pie should be used in gfort
Author
cwret
Browse Repository
No Builds
No Audits

Changes (78)

Path

Size

app/

PrepareGENIE.cxx

PrepareNuwroEvents.cxx

cmake/

data/

flux/

MicroBooNE_FHC_numu_flux.root

doc/

tutorial_inputs.dox

parameters/

config.xml

scripts/

nuiscardcreator.py

src/

ANL/

ANL_CCQE_XSec_1DEnu_nu.cxx

BNL/

BNL_CC1npip_Evt_1DQ2_nu.cxx

BNL_CC1npip_Evt_1DQ2_nu.h

BNL_CC1npip_XSec_1DEnu_nu.cxx

BNL_CC1npip_XSec_1DEnu_nu.h

BNL_CC1pi0_Evt_1DQ2_nu.cxx

BNL_CC1pi0_Evt_1DQ2_nu.h

BNL_CC1pi0_XSec_1DEnu_nu.cxx

BNL_CC1pi0_XSec_1DEnu_nu.h

BNL_CC1ppip_Evt_1DQ2_nu.cxx

BNL_CC1ppip_Evt_1DQ2_nu.h

BNL_CC1ppip_Evt_1DcosthAdler_nu.cxx

BNL_CC1ppip_Evt_1DcosthAdler_nu.h

BNL_CC1ppip_Evt_1Dphi_nu.cxx

BNL_CC1ppip_Evt_1Dphi_nu.h

BNL_CC1ppip_XSec_1DEnu_nu.cxx

BNL_CC1ppip_XSec_1DEnu_nu.h

Config/

FCN/

FitBase/

InputHandler/

Logger/

MCStudies/

GenericFlux_Vectors.cxx

GenericFlux_Vectors.h

MCStudy_KaonPreSelection.cxx

MCStudy_NCpi0PreSelection.cxx

MINERvA/

MINERvA_CCinc_XSec_2DEavq3_nu.cxx

MicroBooNE/

MicroBooNE_CCInc_XSec_2DPcos_nu.cxx

MiniBooNE/

MiniBooNE_CC1pip_XSec_1DQ2_nu.cxx

MiniBooNE_NC1pi0_XSec_1Dcospi0_antinu.cxx

MiniBooNE_NC1pi0_XSec_1Dcospi0_nu.cxx

MiniBooNE_NC1pi0_XSec_1Dppi0_antinu.cxx

MiniBooNE_NC1pi0_XSec_1Dppi0_nu.cxx

MiniBooNE_NCEL_XSec_Treco_nu.cxx

Reweight/

NEUTWeightEngine.cxx

Routines/

ComparisonRoutines.cxx

ComparisonRoutines.h

MinimizerRoutines.h

SplineRoutines.cxx

SystematicRoutines.cxx

SystematicRoutines.h

Splines/

SplineWriter.cxx

Statistical/

StatUtils.cxx

T2K/

T2K_CC0piWithProtons_XSec_2018_multidif_0p_1p_Np.cxx

T2K_CC0piWithProtons_XSec_2018_multidif_0p_1p_Np.h

T2K_CC0pi_XSec_2DPcos_nu_II.cxx

T2K_CC0pi_XSec_H2O_2DPcos_anu.cxx

T2K_CC0pinp_STV_XSec_1Ddat_nu.cxx

T2K_CC0pinp_STV_XSec_1Ddphit_nu.cxx

T2K_CC1pip_CH_XSec_2Dpmucosmu_nu.cxx

T2K_NuMuAntiNuMu_CC0pi_CH_XSec_2DPcos.cxx

T2K_NuMu_CC0pi_OC_XSec_2DPcos.cxx

Utils/

BeamUtils.h

PlotUtils.cxx

TargetUtils.h

rNUISANCEGIT3edc1008dd65

View Options

app/PrepareGENIE.cxx

View Options

app/PrepareNuwroEvents.cxx

View Options

app/neut_NUISANCE.cxx

View Options

app/nuismin.cxx

View Options

app/nuissplines.cxx

View Options

cmake/NEUTSetup.cmake

View Options

data/flux/MicroBooNE_FHC_numu_flux.root

View Options

doc/tutorial_inputs.dox

View Options

parameters/config.xml

View Options

scripts/nuiscardcreator.py

View Options

src/ANL/ANL_CCQE_XSec_1DEnu_nu.cxx

View Options

src/BNL/BNL_CC1npip_Evt_1DQ2_nu.cxx

View Options

src/BNL/BNL_CC1npip_Evt_1DQ2_nu.h

View Options

src/BNL/BNL_CC1npip_XSec_1DEnu_nu.cxx

View Options

src/BNL/BNL_CC1npip_XSec_1DEnu_nu.h

View Options

src/BNL/BNL_CC1pi0_Evt_1DQ2_nu.cxx

View Options

src/BNL/BNL_CC1pi0_Evt_1DQ2_nu.h

View Options

src/BNL/BNL_CC1pi0_XSec_1DEnu_nu.cxx

View Options

src/BNL/BNL_CC1pi0_XSec_1DEnu_nu.h

View Options

src/BNL/BNL_CC1ppip_Evt_1DQ2_nu.cxx

View Options

src/BNL/BNL_CC1ppip_Evt_1DQ2_nu.h

View Options

src/BNL/BNL_CC1ppip_Evt_1DcosthAdler_nu.cxx

View Options

src/BNL/BNL_CC1ppip_Evt_1DcosthAdler_nu.h

View Options

src/BNL/BNL_CC1ppip_Evt_1Dphi_nu.cxx

View Options

src/BNL/BNL_CC1ppip_Evt_1Dphi_nu.h

View Options

src/BNL/BNL_CC1ppip_XSec_1DEnu_nu.cxx

View Options

src/BNL/BNL_CC1ppip_XSec_1DEnu_nu.h

View Options

src/Config/NuisConfig.cxx

View Options

src/FCN/JointFCN.cxx

View Options

src/FCN/SampleList.cxx

View Options

src/FitBase/JointMeas1D.cxx

View Options

src/FitBase/JointMeas1D.h

View Options

src/FitBase/Measurement1D.cxx

View Options

src/FitBase/Measurement1D.h

View Options

src/FitBase/Measurement2D.cxx

View Options

src/FitBase/Measurement2D.h

View Options

src/FitBase/ParamPull.cxx

View Options

src/FitBase/StackBase.cxx

View Options

src/FitBase/StackBase.h

View Options

src/FitBase/TemplateMeas1D.cxx

View Options

src/InputHandler/FitEvent.h

View Options

src/InputHandler/InputHandler.cxx

View Options

src/InputHandler/InputUtils.h

View Options

src/InputHandler/NEUTInputHandler.cxx

View Options

src/Logger/FitLogger.cxx

View Options

src/MCStudies/GenericFlux_Vectors.cxx

View Options

src/MCStudies/GenericFlux_Vectors.h

View Options

src/MCStudies/MCStudy_KaonPreSelection.cxx

View Options

src/MCStudies/MCStudy_NCpi0PreSelection.cxx

View Options

src/MINERvA/MINERvA_CCinc_XSec_2DEavq3_nu.cxx

View Options

src/MicroBooNE/MicroBooNE_CCInc_XSec_2DPcos_nu.cxx

View Options

src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DQ2_nu.cxx

View Options

src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dcospi0_antinu.cxx

View Options

src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dcospi0_nu.cxx

View Options

src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dppi0_antinu.cxx

View Options

src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dppi0_nu.cxx

View Options

src/MiniBooNE/MiniBooNE_NCEL_XSec_Treco_nu.cxx

View Options

src/Reweight/NEUTWeightEngine.cxx

View Options

src/Routines/ComparisonRoutines.cxx

View Options

src/Routines/ComparisonRoutines.h

View Options

src/Routines/MinimizerRoutines.h

View Options

src/Routines/SplineRoutines.cxx

View Options

src/Routines/SystematicRoutines.cxx

View Options

src/Routines/SystematicRoutines.h

View Options

src/Splines/SplineWriter.cxx

View Options

src/Statistical/StatUtils.cxx

View Options

src/T2K/T2K_CC0piWithProtons_XSec_2018_multidif_0p_1p_Np.cxx

View Options

src/T2K/T2K_CC0piWithProtons_XSec_2018_multidif_0p_1p_Np.h

View Options

src/T2K/T2K_CC0pi_XSec_2DPcos_nu_II.cxx

View Options

src/T2K/T2K_CC0pi_XSec_H2O_2DPcos_anu.cxx

View Options

src/T2K/T2K_CC0pinp_STV_XSec_1Ddat_nu.cxx

View Options

src/T2K/T2K_CC0pinp_STV_XSec_1Ddphit_nu.cxx

View Options

src/T2K/T2K_CC1pip_CH_XSec_2Dpmucosmu_nu.cxx

View Options

src/T2K/T2K_NuMuAntiNuMu_CC0pi_CH_XSec_2DPcos.cxx

View Options

src/T2K/T2K_NuMu_CC0pi_OC_XSec_2DPcos.cxx

View Options

src/Utils/BeamUtils.h

View Options

src/Utils/PlotUtils.cxx

View Options

Merge branch 'master' of github.com:NUISANCEMC/nuisance3edc1008dd65Actions

Description

Details

Event Timeline

Merged Changes

Changes (78)

rNUISANCEGIT3edc1008dd65

app/PrepareGENIE.cxx

app/PrepareNuwroEvents.cxx

app/neut_NUISANCE.cxx

app/nuismin.cxx

app/nuissplines.cxx

cmake/NEUTSetup.cmake

data/flux/MicroBooNE_FHC_numu_flux.root

doc/tutorial_inputs.dox

parameters/config.xml

scripts/nuiscardcreator.py

src/ANL/ANL_CCQE_XSec_1DEnu_nu.cxx

src/BNL/BNL_CC1npip_Evt_1DQ2_nu.cxx

src/BNL/BNL_CC1npip_Evt_1DQ2_nu.h

src/BNL/BNL_CC1npip_XSec_1DEnu_nu.cxx

src/BNL/BNL_CC1npip_XSec_1DEnu_nu.h

src/BNL/BNL_CC1pi0_Evt_1DQ2_nu.cxx

src/BNL/BNL_CC1pi0_Evt_1DQ2_nu.h

src/BNL/BNL_CC1pi0_XSec_1DEnu_nu.cxx

src/BNL/BNL_CC1pi0_XSec_1DEnu_nu.h

src/BNL/BNL_CC1ppip_Evt_1DQ2_nu.cxx

src/BNL/BNL_CC1ppip_Evt_1DQ2_nu.h

src/BNL/BNL_CC1ppip_Evt_1DcosthAdler_nu.cxx

src/BNL/BNL_CC1ppip_Evt_1DcosthAdler_nu.h

src/BNL/BNL_CC1ppip_Evt_1Dphi_nu.cxx

src/BNL/BNL_CC1ppip_Evt_1Dphi_nu.h

src/BNL/BNL_CC1ppip_XSec_1DEnu_nu.cxx

src/BNL/BNL_CC1ppip_XSec_1DEnu_nu.h

src/Config/NuisConfig.cxx

src/FCN/JointFCN.cxx

src/FCN/SampleList.cxx

src/FitBase/JointMeas1D.cxx

src/FitBase/JointMeas1D.h

src/FitBase/Measurement1D.cxx

src/FitBase/Measurement1D.h

src/FitBase/Measurement2D.cxx

src/FitBase/Measurement2D.h

src/FitBase/ParamPull.cxx

src/FitBase/StackBase.cxx

src/FitBase/StackBase.h

src/FitBase/TemplateMeas1D.cxx

src/InputHandler/FitEvent.h

src/InputHandler/InputHandler.cxx

src/InputHandler/InputUtils.h

src/InputHandler/NEUTInputHandler.cxx

src/Logger/FitLogger.cxx

src/MCStudies/GenericFlux_Vectors.cxx

src/MCStudies/GenericFlux_Vectors.h

src/MCStudies/MCStudy_KaonPreSelection.cxx

src/MCStudies/MCStudy_NCpi0PreSelection.cxx

src/MINERvA/MINERvA_CCinc_XSec_2DEavq3_nu.cxx

src/MicroBooNE/MicroBooNE_CCInc_XSec_2DPcos_nu.cxx

src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DQ2_nu.cxx

src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dcospi0_antinu.cxx

src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dcospi0_nu.cxx

src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dppi0_antinu.cxx

src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dppi0_nu.cxx

src/MiniBooNE/MiniBooNE_NCEL_XSec_Treco_nu.cxx

src/Reweight/NEUTWeightEngine.cxx

src/Routines/ComparisonRoutines.cxx

src/Routines/ComparisonRoutines.h

src/Routines/MinimizerRoutines.h

src/Routines/SplineRoutines.cxx

src/Routines/SystematicRoutines.cxx

src/Routines/SystematicRoutines.h

src/Splines/SplineWriter.cxx

src/Statistical/StatUtils.cxx

src/T2K/T2K_CC0piWithProtons_XSec_2018_multidif_0p_1p_Np.cxx

src/T2K/T2K_CC0piWithProtons_XSec_2018_multidif_0p_1p_Np.h

src/T2K/T2K_CC0pi_XSec_2DPcos_nu_II.cxx

src/T2K/T2K_CC0pi_XSec_H2O_2DPcos_anu.cxx

src/T2K/T2K_CC0pinp_STV_XSec_1Ddat_nu.cxx

src/T2K/T2K_CC0pinp_STV_XSec_1Ddphit_nu.cxx

src/T2K/T2K_CC1pip_CH_XSec_2Dpmucosmu_nu.cxx

Merge branch 'master' of github.com:NUISANCEMC/nuisance
3edc1008dd65
Actions