Diffusion nuisancegit 6a19256ce184

Merge branch 'master' into Smeargoodies
6a19256ce184
Actions

Description

Merge branch 'master' into Smeargoodies

Fixes some odd behaviour in the new nuisconfig clean up.

Details

Provenance

lp208	Authored on Sep 22 2017, 3:38 AM
lp208	Pushed on Oct 7 2019, 9:59 PM

Parents

rNUISANCEGITb28826a73d80: Added script to dump the model inside a GENIE file.
rNUISANCEGITb4dd15caed00: Merge branch 'master' into Smeargoodies

Branches

Unknown

Tags

Unknown

Event Timeline

lp208 committed rNUISANCEGIT6a19256ce184: Merge branch 'master' into Smeargoodies (authored by lp208).Sep 22 2017, 3:38 AM

Merged Changes

b28826a73d80 Added script to dump the model inside a GENIE file.
Author
patrickstowell <p.stowell@sheffield.ac.uk>
Browse Repository
No Builds
No Audits
40c9e34a55e2 Fixes to NEUT build to properly include StatUtils
Author
patrickstowell <p.stowell@sheffield.ac.uk>
Browse Repository
No Builds
No Audits
a4a2b7cc0ef1 Remove line break to have nuissamples report correct number of samples and…
Author
cwret <cwret14@imperial.ac.uk>
Browse Repository
No Builds
No Audits
87b6e1c260f2 Merge branch 'master' of login.hepforge.org…
Author
cwret <cwret14@imperial.ac.uk>
Browse Repository
No Builds
No Audits
3823d5cf50e6 Fixed nuissamples to cut out strings with { at end
Author
cwret <cwret14@imperial.ac.uk>
Browse Repository
No Builds
No Audits
511d5d9720e0 Merge branch 'master' of login.hepforge.org…
Author
patrickstowell <p.stowell@sheffield.ac.uk>
Browse Repository
No Builds
No Audits
70ddb8f45e8b Updated Version tag to freeze state before Utils functions are split up.
Author
patrickstowell <p.stowell@sheffield.ac.uk>
Browse Repository
No Builds
No Audits
2e14232720b7 Split up Utils folder
Author
patrickstowell <p.stowell@sheffield.ac.uk>
Browse Repository
No Builds
No Audits
0cadce4a4b0e Extra changes to account for config cleaning up.
Author
patrickstowell <p.stowell@sheffield.ac.uk>
Browse Repository
No Builds
No Audits
ec98c9e5b3b9 Finally removed the old deprecated FitParameters class and moved all the…
Author
patrickstowell <p.stowell@sheffield.ac.uk>
Browse Repository
No Builds
No Audits
cd8609889dbc Added BayesianRoutines application to do throws of the JointFCN without…
Author
patrickstowell <p.stowell@sheffield.ac.uk>
Browse Repository
No Builds
No Audits
99df7319854b Small changes to MINERvA CC1pi0 numu implementation
Author
cwret <cwret14@imperial.ac.uk>
Browse Repository
No Builds
No Audits
536efd2769c2 Merge branch 'master' of login.hepforge.org…
Author
patrickstowell <jstowell@minervagpvm04.fnal.gov>
Browse Repository
No Builds
No Audits
4dfb57442df7 Fixed a bad memory leak when merging error throws in nuissyst
Author
patrickstowell <jstowell@minervagpvm04.fnal.gov>
Browse Repository
No Builds
No Audits
3264d62a732a Added alternative model loading with GENIE 213
Author
patrickstowell <jstowell@minervagpvm04.fnal.gov>
Browse Repository
No Builds
No Audits
af522f6f14c9 Added option to manually choose the GENIE version.
Author
patrickstowell <jstowell@minervagpvm04.fnal.gov>
Browse Repository
No Builds
No Audits
299644611103 Added a way to apply VERY ad-hoc RPA weights to GENIE resonant events.
Author
patrickstowell <p.stowell@sheffield.ac.uk>
Browse Repository
No Builds
No Audits
0d4f7c1f6f73 Added missing include for new seed. Ooops.
Author
patrickstowell <jstowell@minervagpvm03.fnal.gov>
Browse Repository
No Builds
No Audits
766f17d4fceb Added better seed definition in SystematicRoutines.
Author
patrickstowell <jstowell@minervagpvm03.fnal.gov>
Browse Repository
No Builds
No Audits
80324cea2a24 Merge branch 'master' of login.hepforge.org…
Author
patrickstowell <jstowell@minervagpvm03.fnal.gov>
Browse Repository
No Builds
No Audits
f291077b3d52 Fixed an ordering bug in GetChi2FromCovar that was messing with staterror…
Author
patrickstowell <jstowell@minervagpvm03.fnal.gov>
Browse Repository
No Builds
No Audits
ff351603b68c Fix merge conflict
Author
patrickstowell <p.stowell@sheffield.ac.uk>
Browse Repository
No Builds
No Audits
c93245fd826e Added RikRPA weight calculator
Author
patrickstowell <p.stowell@sheffield.ac.uk>
Browse Repository
No Builds
No Audits
148732376c83 Added example code allowing GENIE models to be changed inside RW engine.
Author
patrickstowell <p.stowell@sheffield.ac.uk>
Browse Repository
No Builds
No Audits
94a0062c30b5 Merge branch 'master' of login.hepforge.org…
Author
cwret <cwret14@imperial.ac.uk>
Browse Repository
No Builds
No Audits
3f1bca71316c Adding implementation of MINERvA CC1pi0, sorry\!
Author
cwret <cwret14@imperial.ac.uk>
Browse Repository
No Builds
No Audits
504aec03d66d Merge branch 'master' of login.hepforge.org…
Author
patrickstowell <jstowell@minervagpvm03.fnal.gov>
Browse Repository
No Builds
No Audits
56e14a77aaa1 Added MINERvA CC0pi ptpz class (no data) modified…
Author
patrickstowell <jstowell@minervagpvm03.fnal.gov>
Browse Repository
No Builds
No Audits

Changes (115)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

Path

Size

app/

	app/
	src/	Utils/

DumpROOTClassesFromVector.cxx

cmake/

parameters/

scripts/

src/

	Config/
	Routines/

CMakeLists.txt

FCN/

	#JointFCN.cxx#
	JointFCN.cxx

FitBase/

	FitBase/
	Utils/

InputHandler/

	Logger/
	Routines/

CMakeLists.txt

	Logger/
	Utils/

MCStudies/

ElectronFlux_FlatTree.cxx

GenericFlux_Tester.cxx

GenericFlux_Vectors.cxx

MCStudy_CCQEHistograms.cxx

MCStudy_CCQEHistograms.h

MCStudy_KaonPreSelection.cxx

MCStudy_MuonValidation.cxx

MCStudy_NCpi0PreSelection.cxx

Smear_SVDUnfold_Propagation_Osc.cxx

Smearceptance_Tester.cxx

MINERvA/

CMakeLists.txt

MINERvAUtils.cxx

MINERvA_CC0pi_XSec_1DQ2_TgtRatio_nu.cxx

MINERvA_CC0pi_XSec_2Dptpx_nu.cxx

MINERvA_CC1pi0_XSec_1D_nu.cxx

MINERvA_CC1pi0_XSec_1D_nu.h

Reweight/

CMakeLists.txt

GENIEWeightEngine.cxx

MINERvAWeightCalcs.cxx

MINERvAWeightCalcs.h

NUISANCESyst.h

NUISANCEWeightCalcs.h

WeightUtils.h

weightRPA.h

Routines/

	BayesianRoutines.cxx
	ComparisonRoutines.cxx

	BayesianRoutines.h
	SplineRoutines.h

CMakeLists.txt

ComparisonRoutines.cxx

ComparisonRoutines.h

MinimizerRoutines.cxx

SystematicRoutines.cxx

SciBooNE/

Splines/

	Statistical/
	Routines/

CMakeLists.txt

	Statistical/
	Utils/

Tests/

Utils/

DumpROOTClassesFromVector.cxx

rNUISANCEGIT6a19256ce184

View Options

CMakeLists.txt

Load File

View Options

VERSION

Load File

View Options

app/CMakeLists.txt

Load File

View Options

app/DumpROOTClassesFromVector.cxx

Load File

View Options

app/PrepareNEUT.cxx

Load File

View Options

app/nuisbayes.cxx

Load File

View Options

app/nuisflat.cxx

Load File

View Options

app/nuissmear.cxx

Load File

View Options

cmake/GENIESetup.cmake

Load File

View Options

cmake/cacheVariables.cmake

Load File

View Options

parameters/config.xml

Load File

View Options

scripts/dumpgenieconfig.py

Load File

View Options

scripts/nuissamples

Load File

View Options

src/Config/CMakeLists.txt

Load File

View Options

src/Config/NuisConfig.cxx

Load File

View Options

src/Config/NuisConfig.h

Load File

View Options

src/Config/NuisKey.cxx

Load File

View Options

src/Config/NuisKey.h

Load File

View Options

src/FCN/#JointFCN.cxx#

Load File

View Options

src/FCN/JointFCN.cxx

Load File

View Options

src/FCN/JointFCN.h

Load File

View Options

src/FCN/SampleList.cxx

Load File

View Options

src/FitBase/CMakeLists.txt

Load File

View Options

src/FitBase/JointMeas1D.h

Load File

View Options

src/FitBase/Measurement1D.cxx

Load File

View Options

src/FitBase/Measurement1D.h

Load File

View Options

src/FitBase/Measurement2D.cxx

Load File

View Options

src/FitBase/Measurement2D.h

Load File

View Options

src/FitBase/MeasurementBase.h

Load File

View Options

src/FitBase/SampleSettings.cxx

Load File

View Options

src/FitBase/StackBase.cxx

Load File

View Options

src/FitBase/StackBase.h

Load File

View Options

src/FitBase/StandardStacks.cxx

Load File

View Options

src/FitBase/StandardStacks.h

Load File

View Options

src/InputHandler/FitEvent.h

Load File

View Options

src/InputHandler/InputUtils.cxx

Load File

View Options

src/Logger/CMakeLists.txt

Load File

View Options

src/Logger/FitLogger.cxx

Load File

View Options

src/Logger/FitLogger.h

Load File

View Options

src/Logger/Initialiser.cxx

Load File

View Options

src/Logger/Initialiser.h

Load File

View Options

src/Logger/PythiaQuiet.f

Load File

View Options

src/MCStudies/ElectronFlux_FlatTree.cxx

Load File

View Options

src/MCStudies/GenericFlux_Tester.cxx

Load File

View Options

src/MCStudies/GenericFlux_Vectors.cxx

Load File

View Options

src/MCStudies/MCStudy_CCQEHistograms.cxx

Load File

View Options

src/MCStudies/MCStudy_CCQEHistograms.h

Load File

View Options

src/MCStudies/MCStudy_KaonPreSelection.cxx

Load File

View Options

src/MCStudies/MCStudy_MuonValidation.cxx

Load File

View Options

src/MCStudies/MCStudy_NCpi0PreSelection.cxx

Load File

View Options

src/MCStudies/Smear_SVDUnfold_Propagation_Osc.cxx

Load File

View Options

src/MCStudies/Smearceptance_Tester.cxx

Load File

View Options

src/MINERvA/CMakeLists.txt

Load File

View Options

src/MINERvA/MINERvAUtils.cxx

Load File

View Options

src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_TgtRatio_nu.cxx

Load File

View Options

src/MINERvA/MINERvA_CC0pi_XSec_2Dptpx_nu.cxx

Load File

View Options

src/MINERvA/MINERvA_CC1pi0_XSec_1D_nu.cxx

Load File

View Options

src/MINERvA/MINERvA_CC1pi0_XSec_1D_nu.h

Load File

View Options

src/Reweight/CMakeLists.txt

Load File

View Options

src/Reweight/GENIEWeightEngine.cxx

Load File

View Options

src/Reweight/MINERvAWeightCalcs.cxx

Load File

View Options

src/Reweight/MINERvAWeightCalcs.h

Load File

View Options

src/Reweight/NUISANCESyst.h

Load File

View Options

src/Reweight/NUISANCEWeightCalcs.h

Load File

View Options

src/Reweight/WeightUtils.h

Load File

View Options

src/Reweight/weightRPA.h

Load File

View Options

src/Routines/BayesianRoutines.cxx

Load File

View Options

src/Routines/BayesianRoutines.h

Load File

View Options

src/Routines/CMakeLists.txt

Load File

View Options

src/Routines/ComparisonRoutines.cxx

Load File

View Options

src/Routines/ComparisonRoutines.h

Load File

View Options

src/Routines/MinimizerRoutines.cxx

Load File

View Options

src/Routines/MinimizerRoutines.h

Load File

View Options

src/Routines/Simple_MH_Sampler.h

Load File

View Options

src/Routines/SplineRoutines.cxx

Load File

View Options

src/Routines/SplineRoutines.h

Load File

View Options

src/Routines/SystematicRoutines.cxx

Load File

View Options

src/Routines/SystematicRoutines.h

Load File

View Options

src/SciBooNE/SciBooNEUtils.cxx

Load File

View Options

src/Splines/FitSpline.h

Load File

View Options

src/Splines/FitSplineHead.h

Load File

View Options

src/Splines/Spline.h

Load File

View Options

src/Splines/SplineMerger.h

Load File

View Options

src/Splines/SplineReader.h

Load File

View Options

src/Splines/SplineWriter.h

Load File

View Options

src/Statistical/CMakeLists.txt

Load File

View Options

src/Statistical/StatUtils.cxx

Load File

View Options

src/Statistical/StatUtils.h

Load File

View Options

src/Tests/ParserTests.cxx

Load File

View Options

src/Utils/CMakeLists.txt

Load File

View Options

src/Utils/DumpROOTClassesFromVector.cxx

Load File

View Options

src/Utils/FitLogger.cxx

Load File

View Options

src/Utils/FitLogger.h

Load File

View Options

src/Utils/FitParameters.cxx

Load File

View Options

src/Utils/FitParameters.h

Load File

View Options

src/Utils/FitUtils.h

Load File

View Options

src/Utils/Initialiser.cxx

Load File

View Options

src/Utils/Initialiser.h

Load File

View Options

src/Utils/NuisConfig.cxx

Load File

View Options

src/Utils/NuisConfig.h

Load File

View Options

src/Utils/NuisKey.cxx

Load File

View Options

src/Utils/NuisKey.h

Load File

View Options

src/Utils/ParserUtils.h

Load File

View Options

src/Utils/PlotUtils.cxx

Load File

View Options

src/Utils/PlotUtils.h

Load File

View Options

src/Utils/PythiaQuiet.f

Load File

View Options

src/Utils/StackBase.cxx

Load File

View Options

src/Utils/StackBase.h

Load File

View Options

src/Utils/StandardStacks.cxx

Load File

View Options

src/Utils/StandardStacks.h

Load File

View Options

src/Utils/StatUtils.cxx

Load File

View Options

src/Utils/StatUtils.h

Load File

Merge branch 'master' into Smeargoodies6a19256ce184Actions

Description

Details

Event Timeline

Merged Changes

Changes (115)Show All Changes

Very Large Commit

rNUISANCEGIT6a19256ce184

CMakeLists.txt

VERSION

app/CMakeLists.txt

app/DumpROOTClassesFromVector.cxx

app/PrepareNEUT.cxx

app/nuisbayes.cxx

app/nuisflat.cxx

app/nuissmear.cxx

cmake/GENIESetup.cmake

cmake/cacheVariables.cmake

parameters/config.xml

scripts/dumpgenieconfig.py

scripts/nuissamples

src/Config/CMakeLists.txt

src/Config/NuisConfig.cxx

src/Config/NuisConfig.h

src/Config/NuisKey.cxx

src/Config/NuisKey.h

src/FCN/#JointFCN.cxx#

src/FCN/JointFCN.cxx

src/FCN/JointFCN.h

src/FCN/SampleList.cxx

src/FitBase/CMakeLists.txt

src/FitBase/JointMeas1D.h

src/FitBase/Measurement1D.cxx

src/FitBase/Measurement1D.h

src/FitBase/Measurement2D.cxx

src/FitBase/Measurement2D.h

src/FitBase/MeasurementBase.h

src/FitBase/SampleSettings.cxx

src/FitBase/StackBase.cxx

src/FitBase/StackBase.h

src/FitBase/StandardStacks.cxx

src/FitBase/StandardStacks.h

src/InputHandler/FitEvent.h

src/InputHandler/InputUtils.cxx

src/Logger/CMakeLists.txt

src/Logger/FitLogger.cxx

src/Logger/FitLogger.h

src/Logger/Initialiser.cxx

src/Logger/Initialiser.h

src/Logger/PythiaQuiet.f

src/MCStudies/ElectronFlux_FlatTree.cxx

src/MCStudies/GenericFlux_Tester.cxx

src/MCStudies/GenericFlux_Vectors.cxx

src/MCStudies/MCStudy_CCQEHistograms.cxx

src/MCStudies/MCStudy_CCQEHistograms.h

src/MCStudies/MCStudy_KaonPreSelection.cxx

src/MCStudies/MCStudy_MuonValidation.cxx

src/MCStudies/MCStudy_NCpi0PreSelection.cxx

src/MCStudies/Smear_SVDUnfold_Propagation_Osc.cxx

src/MCStudies/Smearceptance_Tester.cxx

src/MINERvA/CMakeLists.txt

src/MINERvA/MINERvAUtils.cxx

src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_TgtRatio_nu.cxx

src/MINERvA/MINERvA_CC0pi_XSec_2Dptpx_nu.cxx

src/MINERvA/MINERvA_CC1pi0_XSec_1D_nu.cxx

src/MINERvA/MINERvA_CC1pi0_XSec_1D_nu.h

src/Reweight/CMakeLists.txt

src/Reweight/GENIEWeightEngine.cxx

src/Reweight/MINERvAWeightCalcs.cxx

src/Reweight/MINERvAWeightCalcs.h

src/Reweight/NUISANCESyst.h

src/Reweight/NUISANCEWeightCalcs.h

src/Reweight/WeightUtils.h

src/Reweight/weightRPA.h

src/Routines/BayesianRoutines.cxx

src/Routines/BayesianRoutines.h

src/Routines/CMakeLists.txt

src/Routines/ComparisonRoutines.cxx

src/Routines/ComparisonRoutines.h

src/Routines/MinimizerRoutines.cxx

Merge branch 'master' into Smeargoodies
6a19256ce184
Actions

Changes (115)
Show All Changes