Merge branch 'geniev3'
93647ed11e97
Actions

Description

Merge branch 'geniev3'

Details

Provenance

lp208	Authored on Feb 28 2019, 4:16 PM
lp208	Pushed on Oct 7 2019, 9:23 PM

Parents

rNUISANCEGIT82f121902e88: Adds NOvAReWeight support.
rNUISANCEGIT0e4069fa2210: Merge branch 'master' of ssh://phab.hepforge.org/source/nuisancegit

Branches

Unknown

Tags

Unknown

Event Timeline

lp208 committed rNUISANCEGIT93647ed11e97: Merge branch 'geniev3' (authored by lp208).Feb 28 2019, 4:16 PM

Merged Changes

82f121902e88 Adds NOvAReWeight support.
Author
lp208
Browse Repository
No Builds
No Audits
b07dd5fd4e97 Small tweaks and fixes in PrepareGENIE, should now be able to UPDATE input file…
Author
lp208
Browse Repository
No Builds
No Audits
90f45cf5e900 Fixes bug in parseconfigapp where the found app wasn't getting reset causing…
Author
lp208
Browse Repository
No Builds
No Audits
27de15cae986 Removes debugging cmessage that caused build hard stop.
Author
lp208
Browse Repository
No Builds
No Audits
640c78541ce7 Removes spurious GENIE_LIB setter that got in the way
Author
lp208
Browse Repository
No Builds
No Audits
a9a41c13e8ad Merge branch 'geniev3' of ssh://phab.hepforge.org/source/nuisancegit into…
Author
lp208
Browse Repository
No Builds
No Audits
e0b0493322bf Adds GENIE_LIB_DIR override for when genie-config is misbehaving (seems like…
Author
lp208
Browse Repository
No Builds
No Audits
c2de216cf221 Merge branch 'master' into geniev3
Author
lp208
Browse Repository
No Builds
No Audits
e99fb6354c0f Tidies, and probably makes more complicated, the GENIESetup.cmake script. Moves…
Author
lp208
Browse Repository
No Builds
No Audits
581a09fe443c Merge remote-tracking branch 'mastbaum/mastbaum_argoneut-cc1pi' into…
Author
lp208
Browse Repository
No Builds
No Audits
c14ea8a53292 Merge remote-tracking branch 'mastbaum/mastbaum_geniev3' into mastbaum_fixes
Author
lp208
Browse Repository
No Builds
No Audits
2068c96aa7a8 Merge remote-tracking branch 'mastbaum/mastbaum_bugfix' into mastbaum_fixes
Author
lp208
Browse Repository
No Builds
No Audits
9c2225577044 additional argoneut cc1pi antinu samples
Author
Andrew Mastbaum <mastbaum@uchicago.edu>
Browse Repository
No Builds
No Audits
fc1f7e7211b6 support both genie v2 and genie v3 + reweight v1
Author
Andrew Mastbaum <mastbaum@uchicago.edu>
Browse Repository
No Builds
No Audits
a0adf49a9ccb add ArgoNeuT CC1pi samples
Author
Andrew Mastbaum <mastbaum@uchicago.edu>
Browse Repository
No Builds
No Audits
a1f0eeab5a7d add std namespace to fix a compiler error
Author
Andrew Mastbaum <mastbaum@uchicago.edu>
Browse Repository
No Builds
No Audits
ed037ec6de69 fix a variety of bugs including a memory leak in the genie handler
Author
Andrew Mastbaum <mastbaum@uchicago.edu>
Browse Repository
No Builds
No Audits

Changes (61)

Path

Size

app/

cmake/

ReweightEnginesSetup.cmake

data/

ArgoNeuT/

CC1Pi_dsig_dmumom_nu.dat

CC1Pi_dsig_dmumom_nubar.dat

CC1Pi_dsig_dthetamu_nu.dat

CC1Pi_dsig_dthetamu_nubar.dat

CC1Pi_dsig_dthetamupi_nu.dat

CC1Pi_dsig_dthetamupi_nubar.dat

CC1Pi_dsig_dthetapi_nu.dat

CC1Pi_dsig_dthetapi_nubar.dat

parameters/

config.xml

src/

ArgoNeuT/

	ArgoNeuT_CC1Pi_XSec_1Dpmu_antinu.cxx
	ArgoNeuT_CCInc_XSec_1Dpmu_nu.cxx

	ArgoNeuT_CC1Pi_XSec_1Dpmu_nu.cxx
	ArgoNeuT_CCInc_XSec_1Dpmu_nu.cxx

	ArgoNeuT_CC1Pi_XSec_1Dthetamu_antinu.cxx
	ArgoNeuT_CCInc_XSec_1Dpmu_nu.cxx

	ArgoNeuT_CC1Pi_XSec_1Dthetamu_nu.cxx
	ArgoNeuT_CCInc_XSec_1Dpmu_nu.cxx

	ArgoNeuT_CC1Pi_XSec_1Dthetamupi_antinu.cxx
	ArgoNeuT_CCInc_XSec_1Dpmu_nu.cxx

	ArgoNeuT_CC1Pi_XSec_1Dthetamupi_nu.cxx
	ArgoNeuT_CCInc_XSec_1Dpmu_nu.cxx

	ArgoNeuT_CC1Pi_XSec_1Dthetapi_antinu.cxx
	ArgoNeuT_CCInc_XSec_1Dpmu_nu.cxx

	ArgoNeuT_CC1Pi_XSec_1Dthetapi_nu.cxx
	ArgoNeuT_CCInc_XSec_1Dpmu_nu.cxx

CMakeLists.txt

	ArgoNeuT/
	BEBC/

	ArgoNeuT_CC1Pi_XSec_1Dpmu_antinu.h
	BEBC_CC1pi0_XSec_1DEnu_nu.h

	ArgoNeuT_CC1Pi_XSec_1Dthetamu_nu.h
	BEBC_CC1pi0_XSec_1DEnu_nu.h

	ArgoNeuT_CC1Pi_XSec_1Dthetapi_nu.h
	BEBC_CC1pi0_XSec_1DEnu_nu.h

	ArgoNeuT/
	FNAL/

	ArgoNeuT_CC1Pi_XSec_1Dpmu_nu.h
	FNAL_CC1ppip_Evt_1DQ2_nu.h

	ArgoNeuT/
	ANL/

	ArgoNeuT_CC1Pi_XSec_1Dthetamu_antinu.h
	ANL_CC2pi_1pim1pip_Evt_1Dppip_nu.h

	ArgoNeuT_CC1Pi_XSec_1Dthetamupi_antinu.h
	ANL_CC2pi_1pim1pip_Evt_1Dppim_nu.h

	ArgoNeuT_CC1Pi_XSec_1Dthetamupi_nu.h
	ANL_CC2pi_1pip1pip_Evt_1Dpmu_nu.h

	ArgoNeuT_CC1Pi_XSec_1Dthetapi_antinu.h
	ANL_CC2pi_1pim1pip_Evt_1Dppip_nu.h

FCN/

FitBase/

InputHandler/

GENIEInputHandler.cxx

GENIEInputHandler.h

MINERvA/

MINERvA_CC0pi_XSec_2D_nu.cxx

MiniBooNE/

MiniBooNE_NCEL_XSec_Treco_nu.cxx

Reweight/

CMakeLists.txt

FitWeight.cxx

GENIEWeightEngine.cxx

Routines/

ComparisonRoutines.cxx

SciBooNE/

SciBooNEUtils.cxx

Statistical/

StatUtils.cxx

StatUtils.h

rNUISANCEGIT93647ed11e97

View Options

app/PrepareGENIE.cxx

View Options

app/nuiscomp.cxx

View Options

app/nuismin.cxx

View Options

cmake/GENIESetup.cmake

View Options

cmake/NOvARwgtSetup.cmake

View Options

cmake/ReweightEnginesSetup.cmake

View Options

cmake/cacheVariables.cmake

View Options

cmake/parseConfigApp.cmake

View Options

cmake/pythia6Setup.cmake

View Options

cmake/setup.sh.in

View Options

data/ArgoNeuT/CC1Pi_dsig_dmumom_nu.dat

View Options

data/ArgoNeuT/CC1Pi_dsig_dmumom_nubar.dat

View Options

data/ArgoNeuT/CC1Pi_dsig_dthetamu_nu.dat

View Options

data/ArgoNeuT/CC1Pi_dsig_dthetamu_nubar.dat

View Options

data/ArgoNeuT/CC1Pi_dsig_dthetamupi_nu.dat

View Options

data/ArgoNeuT/CC1Pi_dsig_dthetamupi_nubar.dat

View Options

data/ArgoNeuT/CC1Pi_dsig_dthetapi_nu.dat

View Options

data/ArgoNeuT/CC1Pi_dsig_dthetapi_nubar.dat

View Options

parameters/config.xml

View Options

src/ArgoNeuT/ArgoNeuT_CC1Pi_XSec_1Dpmu_antinu.cxx

View Options

src/ArgoNeuT/ArgoNeuT_CC1Pi_XSec_1Dpmu_antinu.h

View Options

src/ArgoNeuT/ArgoNeuT_CC1Pi_XSec_1Dpmu_nu.cxx

View Options

src/ArgoNeuT/ArgoNeuT_CC1Pi_XSec_1Dpmu_nu.h

View Options

src/ArgoNeuT/ArgoNeuT_CC1Pi_XSec_1Dthetamu_antinu.cxx

View Options

src/ArgoNeuT/ArgoNeuT_CC1Pi_XSec_1Dthetamu_antinu.h

View Options

src/ArgoNeuT/ArgoNeuT_CC1Pi_XSec_1Dthetamu_nu.cxx

View Options

src/ArgoNeuT/ArgoNeuT_CC1Pi_XSec_1Dthetamu_nu.h

View Options

src/ArgoNeuT/ArgoNeuT_CC1Pi_XSec_1Dthetamupi_antinu.cxx

View Options

src/ArgoNeuT/ArgoNeuT_CC1Pi_XSec_1Dthetamupi_antinu.h

View Options

src/ArgoNeuT/ArgoNeuT_CC1Pi_XSec_1Dthetamupi_nu.cxx

View Options

src/ArgoNeuT/ArgoNeuT_CC1Pi_XSec_1Dthetamupi_nu.h

View Options

src/ArgoNeuT/ArgoNeuT_CC1Pi_XSec_1Dthetapi_antinu.cxx

View Options

src/ArgoNeuT/ArgoNeuT_CC1Pi_XSec_1Dthetapi_antinu.h

View Options

src/ArgoNeuT/ArgoNeuT_CC1Pi_XSec_1Dthetapi_nu.cxx

View Options

src/ArgoNeuT/ArgoNeuT_CC1Pi_XSec_1Dthetapi_nu.h

View Options

src/ArgoNeuT/CMakeLists.txt

View Options

src/FCN/JointFCN.cxx

View Options

src/FCN/SampleList.cxx

View Options

src/FitBase/JointMeas1D.cxx

View Options

src/FitBase/Measurement1D.cxx

View Options

src/FitBase/Measurement2D.cxx

View Options

src/FitBase/MeasurementBase.cxx

View Options

src/FitBase/MeasurementBase.h

View Options

src/InputHandler/BaseFitEvt.h

View Options

src/InputHandler/GENIEInputHandler.cxx

View Options

src/InputHandler/GENIEInputHandler.h

View Options

src/MINERvA/MINERvA_CC0pi_XSec_2D_nu.cxx

View Options

src/MiniBooNE/MiniBooNE_NCEL_XSec_Treco_nu.cxx

View Options

src/Reweight/CMakeLists.txt

View Options

src/Reweight/FitWeight.cxx

View Options

src/Reweight/GENIEWeightEngine.cxx

View Options

src/Reweight/GENIEWeightEngine.h

View Options

src/Reweight/MINERvAWeightCalcs.h

View Options

src/Reweight/NOvARwgtEngine.cxx

View Options

src/Reweight/NOvARwgtEngine.h

View Options

src/Reweight/WeightUtils.cxx

View Options

src/Reweight/WeightUtils.h

View Options

src/Routines/ComparisonRoutines.cxx

View Options

src/SciBooNE/SciBooNEUtils.cxx

View Options

src/Statistical/StatUtils.cxx

View Options

src/Statistical/StatUtils.h

Merge branch 'geniev3'93647ed11e97Actions

Description

Details

Event Timeline

Merged Changes

Changes (61)

rNUISANCEGIT93647ed11e97

app/PrepareGENIE.cxx

app/nuiscomp.cxx

app/nuismin.cxx

cmake/GENIESetup.cmake

cmake/NOvARwgtSetup.cmake

cmake/ReweightEnginesSetup.cmake

cmake/cacheVariables.cmake

cmake/parseConfigApp.cmake

cmake/pythia6Setup.cmake

cmake/setup.sh.in

data/ArgoNeuT/CC1Pi_dsig_dmumom_nu.dat

data/ArgoNeuT/CC1Pi_dsig_dmumom_nubar.dat

data/ArgoNeuT/CC1Pi_dsig_dthetamu_nu.dat

data/ArgoNeuT/CC1Pi_dsig_dthetamu_nubar.dat

data/ArgoNeuT/CC1Pi_dsig_dthetamupi_nu.dat

data/ArgoNeuT/CC1Pi_dsig_dthetamupi_nubar.dat

data/ArgoNeuT/CC1Pi_dsig_dthetapi_nu.dat

data/ArgoNeuT/CC1Pi_dsig_dthetapi_nubar.dat

parameters/config.xml

src/ArgoNeuT/ArgoNeuT_CC1Pi_XSec_1Dpmu_antinu.cxx

src/ArgoNeuT/ArgoNeuT_CC1Pi_XSec_1Dpmu_antinu.h

src/ArgoNeuT/ArgoNeuT_CC1Pi_XSec_1Dpmu_nu.cxx

src/ArgoNeuT/ArgoNeuT_CC1Pi_XSec_1Dpmu_nu.h

src/ArgoNeuT/ArgoNeuT_CC1Pi_XSec_1Dthetamu_antinu.cxx

src/ArgoNeuT/ArgoNeuT_CC1Pi_XSec_1Dthetamu_antinu.h

src/ArgoNeuT/ArgoNeuT_CC1Pi_XSec_1Dthetamu_nu.cxx

src/ArgoNeuT/ArgoNeuT_CC1Pi_XSec_1Dthetamu_nu.h

src/ArgoNeuT/ArgoNeuT_CC1Pi_XSec_1Dthetamupi_antinu.cxx

src/ArgoNeuT/ArgoNeuT_CC1Pi_XSec_1Dthetamupi_antinu.h

src/ArgoNeuT/ArgoNeuT_CC1Pi_XSec_1Dthetamupi_nu.cxx

src/ArgoNeuT/ArgoNeuT_CC1Pi_XSec_1Dthetamupi_nu.h

src/ArgoNeuT/ArgoNeuT_CC1Pi_XSec_1Dthetapi_antinu.cxx

src/ArgoNeuT/ArgoNeuT_CC1Pi_XSec_1Dthetapi_antinu.h

src/ArgoNeuT/ArgoNeuT_CC1Pi_XSec_1Dthetapi_nu.cxx

src/ArgoNeuT/ArgoNeuT_CC1Pi_XSec_1Dthetapi_nu.h

src/ArgoNeuT/CMakeLists.txt

src/FCN/JointFCN.cxx

src/FCN/SampleList.cxx

src/FitBase/JointMeas1D.cxx

src/FitBase/Measurement1D.cxx

src/FitBase/Measurement2D.cxx

src/FitBase/MeasurementBase.cxx

src/FitBase/MeasurementBase.h

src/InputHandler/BaseFitEvt.h

src/InputHandler/GENIEInputHandler.cxx

src/InputHandler/GENIEInputHandler.h

src/MINERvA/MINERvA_CC0pi_XSec_2D_nu.cxx

src/MiniBooNE/MiniBooNE_NCEL_XSec_Treco_nu.cxx

src/Reweight/CMakeLists.txt

src/Reweight/FitWeight.cxx

src/Reweight/GENIEWeightEngine.cxx

src/Reweight/GENIEWeightEngine.h

src/Reweight/MINERvAWeightCalcs.h

src/Reweight/NOvARwgtEngine.cxx

src/Reweight/NOvARwgtEngine.h

src/Reweight/WeightUtils.cxx

src/Reweight/WeightUtils.h

src/Routines/ComparisonRoutines.cxx

src/SciBooNE/SciBooNEUtils.cxx

src/Statistical/StatUtils.cxx

src/Statistical/StatUtils.h

Merge branch 'geniev3'
93647ed11e97
Actions