Diffusion nuisancegit 45d9e4183b0f

Fixed auto-merge problems
45d9e4183b0fUnpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Fixed auto-merge problems

Details

Provenance

Patrick Stowell <p.stowell@sheffield.ac.uk>

Authored on Nov 1 2016, 6:20 PM

Parents

rNUISANCEGITc9351ff4c211: MINERvA- and T2K-specific signal definitions now live in exp folders.
rNUISANCEGIT0ce48b5833e9: Fixed missing line in nuiscomp

Branches

Unknown

Tags

Unknown

Event Timeline

patrickstowell committed rNUISANCEGIT45d9e4183b0f: Fixed auto-merge problems (authored by patrickstowell).Nov 1 2016, 6:20 PM

Merged Changes

c9351ff4c211 MINERvA- and T2K-specific signal definitions now live in exp folders.
Author
lp208
Browse Repository
No Builds
No Audits
b0189cd24786 Removes editor temp file. Fixes permissions on data files and README.
Author
lp208
Browse Repository
No Builds
No Audits
34e50c15cada Adds templated methods for particle stack searching for elements of statically…
Author
lp208
Browse Repository
No Builds
No Audits
79d8572c75ca Merges upstream changes.
Author
lp208
Browse Repository
No Builds
No Audits
2b398acee638 Closes ticket #9. Adds LHAPATH to GENIE setup script section.
Author
lp208
Browse Repository
No Builds
No Audits
97b0ad341b5b Unified logging, and fixed some minor compilation warnings
Author
cwilkinson <callum.wilkinson@lhep.unibe.ch>
Browse Repository
No Builds
No Audits
627944a46f0c Fix two minor bugs in the signal defs.
Author
cwilkinson <callum.wilkinson@lhep.unibe.ch>
Browse Repository
No Builds
No Audits

Changes (118)

Path

Size

app/

DumpGiBUUEvents.cxx

PrepareGENIE.cxx

PrepareNuwroEvents.cxx

cmake/

data/

T2K/

CC0pi/

README.pdf

covariance_fluxNormalizationSystematics_analysisI.txt

covariance_shapeSystematics_analysisI.txt

covariance_statisticUncertainty_analysisI.txt

cross-section_analysisI.txt

makedatafile_t2kcc0pi.py~

rps_crossSection_analysis2.txt

rps_fluxNormCov_analysis2.txt

rps_statsCov_analysis2.txt

rps_systCov_analysis2.txt

src/

BEBC/

BEBC_CC1pi0_XSec_1DEnu_nu.cxx

BNL/

BNL_CC1ppip_XSec_1DEnu_nu.cxx

BNL_CCQE_Evt_1DQ2_nu.cxx

FCN/

FitBase/

MCStudies/

GenericFlux_Tester.cxx

MINERvA/

CMakeLists.txt

MINERvA_CC0pi_XSec_1DEe_nue.cxx

	MINERvA_CC0pi_XSec_1DEe_nue.h
	MINERvA_CCinc_XSec_1DEnu_nu.h

MINERvA_CC0pi_XSec_1DQ2_nu_proton.cxx

MINERvA_CC0pi_XSec_1DQ2_nu_proton.h

MINERvA_CC0pi_XSec_1DQ2_nue.cxx

	MINERvA_CC0pi_XSec_1DQ2_nue.h
	MINERvA_CCinc_XSec_1DEnu_nu.h

MINERvA_CC0pi_XSec_1DThetae_nue.cxx

	MINERvA_CC0pi_XSec_1DThetae_nue.h
	MINERvA_CCinc_XSec_1Dx_nu.h

MINERvA_CC1pi0_XSec_1DEnu_antinu.cxx

	MINERvA_CC1pi0_XSec_1DEnu_antinu.h
	MINERvA_CCQE_XSec_1DQ2_antinu.h

MINERvA_CC1pi0_XSec_1DQ2_antinu.cxx

MINERvA_CC1pi0_XSec_1Dpmu_antinu.cxx

	MINERvA_CC1pi0_XSec_1Dpmu_antinu.h
	MINERvA_CCQE_XSec_1DQ2_antinu.h

MINERvA_CC1pi0_XSec_1Dppi0_antinu.cxx

	MINERvA_CC1pi0_XSec_1Dppi0_antinu.h
	MINERvA_CCQE_XSec_1DQ2_antinu.h

MINERvA_CC1pi0_XSec_1Dth_antinu.cxx

	MINERvA_CC1pi0_XSec_1Dth_antinu.h
	MINERvA_CCQE_XSec_1DQ2_antinu.h

MINERvA_CC1pi0_XSec_1Dthmu_antinu.cxx

	MINERvA_CC1pi0_XSec_1Dthmu_antinu.h
	MINERvA_CCQE_XSec_1DQ2_antinu.h

MINERvA_CC1pip_XSec_1DTpi_20deg_nu.cxx

MINERvA_CC1pip_XSec_1DTpi_nu.cxx

MINERvA_CC1pip_XSec_1Dth_20deg_nu.cxx

MINERvA_CC1pip_XSec_1Dth_nu.cxx

MINERvA_CCNpip_XSec_1DEnu_nu.cxx

	MINERvA_CCNpip_XSec_1DEnu_nu.h
	MINERvA_CCQE_XSec_1DQ2_antinu.h

MINERvA_CCNpip_XSec_1DQ2_nu.cxx

	MINERvA_CCNpip_XSec_1DQ2_nu.h
	MINERvA_CCQE_XSec_1DQ2_antinu.h

MINERvA_CCNpip_XSec_1DTpi_20deg_nu.cxx

	MINERvA_CCNpip_XSec_1DTpi_20deg_nu.h
	MINERvA_CCQE_XSec_1DQ2_antinu.h

MINERvA_CCNpip_XSec_1DTpi_nu.cxx

	MINERvA_CCNpip_XSec_1DTpi_nu.h
	MINERvA_CCinc_XSec_1DEnu_nu.h

MINERvA_CCNpip_XSec_1Dpmu_nu.cxx

	MINERvA_CCNpip_XSec_1Dpmu_nu.h
	MINERvA_CCQE_XSec_1DQ2_antinu.h

MINERvA_CCNpip_XSec_1Dth_20deg_nu.cxx

	MINERvA_CCNpip_XSec_1Dth_20deg_nu.h
	MINERvA_CCQE_XSec_1DQ2_antinu.h

MINERvA_CCNpip_XSec_1Dth_nu.cxx

	MINERvA_CCNpip_XSec_1Dth_nu.h
	MINERvA_CCinc_XSec_1DEnu_nu.h

MINERvA_CCNpip_XSec_1Dthmu_nu.cxx

	MINERvA_CCNpip_XSec_1Dthmu_nu.h
	MINERvA_CCQE_XSec_1DQ2_antinu.h

MINERvA_CCQE_XSec_1DQ2_antinu.cxx

MINERvA_CCQE_XSec_1DQ2_antinu.h

MINERvA_CCQE_XSec_1DQ2_joint.cxx

MINERvA_CCQE_XSec_1DQ2_joint.h

MINERvA_CCQE_XSec_1DQ2_nu.cxx

MINERvA_CCQE_XSec_1DQ2_nu.h

MINERvA_CCinc_XSec_1DEnu_nu.cxx

MINERvA_CCinc_XSec_1DEnu_nu.h

MINERvA_CCinc_XSec_1DEnu_ratio.cxx

MINERvA_CCinc_XSec_1Dx_nu.cxx

MINERvA_CCinc_XSec_1Dx_nu.h

MINERvA_CCinc_XSec_1Dx_ratio.cxx

MINERvA_CCinc_XSec_2DEavq3_nu.cxx

MiniBooNE/

MiniBooNE_CC1pip_XSec_2DTpiCospi_nu.cxx

MiniBooNE_CC1pip_XSec_2DTpiEnu_nu.cxx

MiniBooNE_CC1pip_XSec_2DTuCosmu_nu.cxx

MiniBooNE_CC1pip_XSec_2DTuEnu_nu.cxx

MiniBooNE_NCEL_XSec_Treco_nu.cxx

Routines/

ComparisonRoutines.cxx

MinimizerRoutines.cxx

SplineRoutines.cxx

SystematicRoutines.cxx

Splines/

FitSpline.cxx

T2K/

CMakeLists.txt

T2K_CC0pi_XSec_2DPcos_nu.cxx

T2K_CC0pinp_STV_XSec_1Ddpt_nu.cxx

T2K_CC1pip_CH_XSec_1DQ2_nu.cxx

T2K_CC1pip_CH_XSec_1DWrec_nu.cxx

T2K_CC1pip_CH_XSec_1Dpmu_nu.cxx

T2K_CC1pip_CH_XSec_1Dppi_nu.cxx

T2K_CC1pip_CH_XSec_1Dq3_nu.cxx

T2K_CC1pip_CH_XSec_1Dthmupi_nu.cxx

T2K_CC1pip_CH_XSec_1Dthpi_nu.cxx

T2K_CC1pip_CH_XSec_1Dthq3pi_nu.cxx

Utils/

rNUISANCEGIT45d9e4183b0f

View Options

app/DumpGiBUUEvents.cxx

View Options

app/PrepareGENIE.cxx

View Options

app/PrepareNuwroEvents.cxx

View Options

app/nuiscomp.cxx

View Options

app/nuismin.cxx

View Options

app/nuissplines.cxx

View Options

app/nuissyst.cxx

View Options

cmake/GENIESetup.cmake

View Options

cmake/setup.sh.in

View Options

data/T2K/CC0pi/README.pdf

View Options

data/T2K/CC0pi/covariance_fluxNormalizationSystematics_analysisI.txt

View Options

data/T2K/CC0pi/covariance_shapeSystematics_analysisI.txt

View Options

data/T2K/CC0pi/covariance_statisticUncertainty_analysisI.txt

View Options

data/T2K/CC0pi/cross-section_analysisI.txt

View Options

data/T2K/CC0pi/makedatafile_t2kcc0pi.py~

View Options

data/T2K/CC0pi/rps_crossSection_analysis2.txt

View Options

data/T2K/CC0pi/rps_fluxNormCov_analysis2.txt

View Options

data/T2K/CC0pi/rps_statsCov_analysis2.txt

View Options

data/T2K/CC0pi/rps_systCov_analysis2.txt

View Options

src/BEBC/BEBC_CC1pi0_XSec_1DEnu_nu.cxx

View Options

src/BNL/BNL_CC1ppip_XSec_1DEnu_nu.cxx

View Options

src/BNL/BNL_CCQE_Evt_1DQ2_nu.cxx

View Options

src/FCN/SampleList.cxx

View Options

src/FitBase/EventManager.cxx

View Options

src/FitBase/FitEvent.cxx

View Options

src/FitBase/FitEvent.h

View Options

src/FitBase/FitParticle.h

View Options

src/FitBase/FitWeight.cxx

View Options

src/FitBase/GeneratorUtils.cxx

View Options

src/FitBase/InputHandler.cxx

View Options

src/FitBase/Measurement1D.cxx

View Options

src/FitBase/Measurement2D.cxx

View Options

src/FitBase/MeasurementBase.cxx

View Options

src/FitBase/ParamPull.cxx

View Options

src/FitBase/StdHepEvt.cxx

View Options

src/MCStudies/CMakeLists.txt

View Options

src/MCStudies/GenericFlux_Tester.cxx

View Options

src/MINERvA/CMakeLists.txt

View Options

src/MINERvA/MINERvA_CC0pi_XSec_1DEe_nue.cxx

View Options

src/MINERvA/MINERvA_CC0pi_XSec_1DEe_nue.h

View Options

src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_nu_proton.cxx

View Options

src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_nu_proton.h

View Options

src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_nue.cxx

View Options

src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_nue.h

View Options

src/MINERvA/MINERvA_CC0pi_XSec_1DThetae_nue.cxx

View Options

src/MINERvA/MINERvA_CC0pi_XSec_1DThetae_nue.h

View Options

src/MINERvA/MINERvA_CC1pi0_XSec_1DEnu_antinu.cxx

View Options

src/MINERvA/MINERvA_CC1pi0_XSec_1DEnu_antinu.h

View Options

src/MINERvA/MINERvA_CC1pi0_XSec_1DQ2_antinu.cxx

View Options

src/MINERvA/MINERvA_CC1pi0_XSec_1Dpmu_antinu.cxx

View Options

src/MINERvA/MINERvA_CC1pi0_XSec_1Dpmu_antinu.h

View Options

src/MINERvA/MINERvA_CC1pi0_XSec_1Dppi0_antinu.cxx

View Options

src/MINERvA/MINERvA_CC1pi0_XSec_1Dppi0_antinu.h

View Options

src/MINERvA/MINERvA_CC1pi0_XSec_1Dth_antinu.cxx

View Options

src/MINERvA/MINERvA_CC1pi0_XSec_1Dth_antinu.h

View Options

src/MINERvA/MINERvA_CC1pi0_XSec_1Dthmu_antinu.cxx

View Options

src/MINERvA/MINERvA_CC1pi0_XSec_1Dthmu_antinu.h

View Options

src/MINERvA/MINERvA_CC1pip_XSec_1DTpi_20deg_nu.cxx

View Options

src/MINERvA/MINERvA_CC1pip_XSec_1DTpi_nu.cxx

View Options

src/MINERvA/MINERvA_CC1pip_XSec_1Dth_20deg_nu.cxx

View Options

src/MINERvA/MINERvA_CC1pip_XSec_1Dth_nu.cxx

View Options

src/MINERvA/MINERvA_CCNpip_XSec_1DEnu_nu.cxx

View Options

src/MINERvA/MINERvA_CCNpip_XSec_1DEnu_nu.h

View Options

src/MINERvA/MINERvA_CCNpip_XSec_1DQ2_nu.cxx

View Options

src/MINERvA/MINERvA_CCNpip_XSec_1DQ2_nu.h

View Options

src/MINERvA/MINERvA_CCNpip_XSec_1DTpi_20deg_nu.cxx

View Options

src/MINERvA/MINERvA_CCNpip_XSec_1DTpi_20deg_nu.h

View Options

src/MINERvA/MINERvA_CCNpip_XSec_1DTpi_nu.cxx

View Options

src/MINERvA/MINERvA_CCNpip_XSec_1DTpi_nu.h

View Options

src/MINERvA/MINERvA_CCNpip_XSec_1Dpmu_nu.cxx

View Options

src/MINERvA/MINERvA_CCNpip_XSec_1Dpmu_nu.h

View Options

src/MINERvA/MINERvA_CCNpip_XSec_1Dth_20deg_nu.cxx

View Options

src/MINERvA/MINERvA_CCNpip_XSec_1Dth_20deg_nu.h

View Options

src/MINERvA/MINERvA_CCNpip_XSec_1Dth_nu.cxx

View Options

src/MINERvA/MINERvA_CCNpip_XSec_1Dth_nu.h

View Options

src/MINERvA/MINERvA_CCNpip_XSec_1Dthmu_nu.cxx

View Options

src/MINERvA/MINERvA_CCNpip_XSec_1Dthmu_nu.h

View Options

src/MINERvA/MINERvA_CCQE_XSec_1DQ2_antinu.cxx

View Options

src/MINERvA/MINERvA_CCQE_XSec_1DQ2_antinu.h

View Options

src/MINERvA/MINERvA_CCQE_XSec_1DQ2_joint.cxx

View Options

src/MINERvA/MINERvA_CCQE_XSec_1DQ2_joint.h

View Options

src/MINERvA/MINERvA_CCQE_XSec_1DQ2_nu.cxx

View Options

src/MINERvA/MINERvA_CCQE_XSec_1DQ2_nu.h

View Options

src/MINERvA/MINERvA_CCinc_XSec_1DEnu_nu.cxx

View Options

src/MINERvA/MINERvA_CCinc_XSec_1DEnu_nu.h

View Options

src/MINERvA/MINERvA_CCinc_XSec_1DEnu_ratio.cxx

View Options

src/MINERvA/MINERvA_CCinc_XSec_1Dx_nu.cxx

View Options

src/MINERvA/MINERvA_CCinc_XSec_1Dx_nu.h

View Options

src/MINERvA/MINERvA_CCinc_XSec_1Dx_ratio.cxx

View Options

src/MINERvA/MINERvA_CCinc_XSec_2DEavq3_nu.cxx

View Options

src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTpiCospi_nu.cxx

View Options

src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTpiEnu_nu.cxx

View Options

src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTuCosmu_nu.cxx

View Options

src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTuEnu_nu.cxx

View Options

src/MiniBooNE/MiniBooNE_NCEL_XSec_Treco_nu.cxx

View Options

src/Routines/ComparisonRoutines.cxx

View Options

src/Routines/MinimizerRoutines.cxx

View Options

src/Routines/SplineRoutines.cxx

View Options

src/Routines/SystematicRoutines.cxx

View Options

src/Splines/FitSpline.cxx

View Options

src/T2K/CMakeLists.txt

View Options

src/T2K/T2K_CC0pi_XSec_2DPcos_nu.cxx

View Options

src/T2K/T2K_CC0pinp_STV_XSec_1Ddpt_nu.cxx

View Options

src/T2K/T2K_CC1pip_CH_XSec_1DQ2_nu.cxx

View Options

src/T2K/T2K_CC1pip_CH_XSec_1DWrec_nu.cxx

View Options

src/T2K/T2K_CC1pip_CH_XSec_1Dpmu_nu.cxx

View Options

src/T2K/T2K_CC1pip_CH_XSec_1Dppi_nu.cxx

View Options

src/T2K/T2K_CC1pip_CH_XSec_1Dq3_nu.cxx

View Options

src/T2K/T2K_CC1pip_CH_XSec_1Dthmupi_nu.cxx

View Options

src/T2K/T2K_CC1pip_CH_XSec_1Dthpi_nu.cxx

View Options

src/T2K/T2K_CC1pip_CH_XSec_1Dthq3pi_nu.cxx

View Options

src/Utils/FitUtils.cxx

View Options

src/Utils/GeneralUtils.cxx

View Options

src/Utils/GeneralUtils.h

View Options

src/Utils/PlotUtils.cxx

View Options

src/Utils/SignalDef.cxx

View Options

src/Utils/SignalDef.h

View Options

Fixed auto-merge problems45d9e4183b0fUnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (118)

rNUISANCEGIT45d9e4183b0f

app/DumpGiBUUEvents.cxx

app/PrepareGENIE.cxx

app/PrepareNuwroEvents.cxx

app/nuiscomp.cxx

app/nuismin.cxx

app/nuissplines.cxx

app/nuissyst.cxx

cmake/GENIESetup.cmake

cmake/setup.sh.in

data/T2K/CC0pi/README.pdf

data/T2K/CC0pi/covariance_fluxNormalizationSystematics_analysisI.txt

data/T2K/CC0pi/covariance_shapeSystematics_analysisI.txt

data/T2K/CC0pi/covariance_statisticUncertainty_analysisI.txt

data/T2K/CC0pi/cross-section_analysisI.txt

data/T2K/CC0pi/makedatafile_t2kcc0pi.py~

data/T2K/CC0pi/rps_crossSection_analysis2.txt

data/T2K/CC0pi/rps_fluxNormCov_analysis2.txt

data/T2K/CC0pi/rps_statsCov_analysis2.txt

data/T2K/CC0pi/rps_systCov_analysis2.txt

src/BEBC/BEBC_CC1pi0_XSec_1DEnu_nu.cxx

src/BNL/BNL_CC1ppip_XSec_1DEnu_nu.cxx

src/BNL/BNL_CCQE_Evt_1DQ2_nu.cxx

src/FCN/SampleList.cxx

src/FitBase/EventManager.cxx

src/FitBase/FitEvent.cxx

src/FitBase/FitEvent.h

src/FitBase/FitParticle.h

src/FitBase/FitWeight.cxx

src/FitBase/GeneratorUtils.cxx

src/FitBase/InputHandler.cxx

src/FitBase/Measurement1D.cxx

src/FitBase/Measurement2D.cxx

src/FitBase/MeasurementBase.cxx

src/FitBase/ParamPull.cxx

src/FitBase/StdHepEvt.cxx

src/MCStudies/CMakeLists.txt

src/MCStudies/GenericFlux_Tester.cxx

src/MINERvA/CMakeLists.txt

src/MINERvA/MINERvA_CC0pi_XSec_1DEe_nue.cxx

src/MINERvA/MINERvA_CC0pi_XSec_1DEe_nue.h

src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_nu_proton.cxx

src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_nu_proton.h

src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_nue.cxx

src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_nue.h

src/MINERvA/MINERvA_CC0pi_XSec_1DThetae_nue.cxx

src/MINERvA/MINERvA_CC0pi_XSec_1DThetae_nue.h

src/MINERvA/MINERvA_CC1pi0_XSec_1DEnu_antinu.cxx

src/MINERvA/MINERvA_CC1pi0_XSec_1DEnu_antinu.h

src/MINERvA/MINERvA_CC1pi0_XSec_1DQ2_antinu.cxx

src/MINERvA/MINERvA_CC1pi0_XSec_1Dpmu_antinu.cxx

src/MINERvA/MINERvA_CC1pi0_XSec_1Dpmu_antinu.h

src/MINERvA/MINERvA_CC1pi0_XSec_1Dppi0_antinu.cxx

src/MINERvA/MINERvA_CC1pi0_XSec_1Dppi0_antinu.h

src/MINERvA/MINERvA_CC1pi0_XSec_1Dth_antinu.cxx

src/MINERvA/MINERvA_CC1pi0_XSec_1Dth_antinu.h

src/MINERvA/MINERvA_CC1pi0_XSec_1Dthmu_antinu.cxx

src/MINERvA/MINERvA_CC1pi0_XSec_1Dthmu_antinu.h

src/MINERvA/MINERvA_CC1pip_XSec_1DTpi_20deg_nu.cxx

src/MINERvA/MINERvA_CC1pip_XSec_1DTpi_nu.cxx

src/MINERvA/MINERvA_CC1pip_XSec_1Dth_20deg_nu.cxx

src/MINERvA/MINERvA_CC1pip_XSec_1Dth_nu.cxx

src/MINERvA/MINERvA_CCNpip_XSec_1DEnu_nu.cxx

src/MINERvA/MINERvA_CCNpip_XSec_1DEnu_nu.h

src/MINERvA/MINERvA_CCNpip_XSec_1DQ2_nu.cxx

src/MINERvA/MINERvA_CCNpip_XSec_1DQ2_nu.h

src/MINERvA/MINERvA_CCNpip_XSec_1DTpi_20deg_nu.cxx

src/MINERvA/MINERvA_CCNpip_XSec_1DTpi_20deg_nu.h

src/MINERvA/MINERvA_CCNpip_XSec_1DTpi_nu.cxx

src/MINERvA/MINERvA_CCNpip_XSec_1DTpi_nu.h

src/MINERvA/MINERvA_CCNpip_XSec_1Dpmu_nu.cxx

src/MINERvA/MINERvA_CCNpip_XSec_1Dpmu_nu.h

src/MINERvA/MINERvA_CCNpip_XSec_1Dth_20deg_nu.cxx

Fixed auto-merge problems
45d9e4183b0fUnpublished
Actions