Diffusion nuisancegit a6c4143c8874

Fix merge conflict
a6c4143c8874
Actions

Tags

None

Subscribers

None

This commit has been deleted in the repository: it is no longer reachable from any branch, tag, or ref.

Description

Fix merge conflict

Details

Provenance

patrickstowell <p.stowell@sheffield.ac.uk>	Authored on Aug 28 2017, 4:59 PM
lp208	Pushed on Oct 7 2019, 9:23 PM

Parents

rNUISANCEGIT0969c3ac5982: Added RikRPA weight calculator
rNUISANCEGIT436dc3c483a0: Merge branch 'master' of login.hepforge.org…

Branches

Unknown

Tags

Unknown

Event Timeline

patrickstowell committed rNUISANCEGITa6c4143c8874: Fix merge conflict (authored by patrickstowell).Aug 28 2017, 4:59 PM

Merged Changes

436dc3c483a0 Merge branch 'master' of login.hepforge.org…
Author
cwret <cwret14@imperial.ac.uk>
Browse Repository
No Builds
No Audits
ce4411ca4bff Adding implementation of MINERvA CC1pi0, sorry\!
Author
cwret <cwret14@imperial.ac.uk>
Browse Repository
No Builds
No Audits
24327a0a695b Merge branch 'master' of login.hepforge.org…
Author
patrickstowell <jstowell@minervagpvm03.fnal.gov>
Browse Repository
No Builds
No Audits
e90813664a9f Added MINERvA CC0pi ptpz class (no data) modified…
Author
patrickstowell <jstowell@minervagpvm03.fnal.gov>
Browse Repository
No Builds
No Audits
d8bb6043892a updates Doxyfile
Author
lp208
Browse Repository
No Builds
No Audits
20584c2598e4 adds the word function.
Author
lp208
Browse Repository
No Builds
No Audits
3aaf3e05020c Another dummy...
Author
cwret <cwret14@imperial.ac.uk>
Browse Repository
No Builds
No Audits
ceb1341413af Dummy commit to test GitHub integration, sorry
Author
cwret <cwret14@imperial.ac.uk>
Browse Repository
No Builds
No Audits
82e12771ba93 Update to ANL and BNL Adler angles
Author
cwret <cwret14@imperial.ac.uk>
Browse Repository
No Builds
No Audits
a54178ae0750 Added MINERvA CC1pi0 numu 2017
Author
cwret <cwret14@imperial.ac.uk>
Browse Repository
No Builds
No Audits
94ddc2056adb Merge branch 'master' of login.hepforge.org…
Author
cwret <cwret14@imperial.ac.uk>
Browse Repository
No Builds
No Audits
dd80ace88256 Adding formatted MINERvA 2017 CC1pi0 neutrino data
Author
cwret <cwret14@imperial.ac.uk>
Browse Repository
No Builds
No Audits
05815bf35339 directories are now added to the path by a helper function that checks if they…
Author
lp208
Browse Repository
No Builds
No Audits
b2c637268a40 Added CC0pi ptpz data (without data release) modified…
Author
patrickstowell <jstowell@minervagpvm03.fnal.gov>
Browse Repository
No Builds
No Audits
99f3b060284d Merge branch 'master' of login.hepforge.org…
Author
patrickstowell <jstowell@minervagpvm03.fnal.gov>
Browse Repository
No Builds
No Audits
e31645b9852a Merge branch 'master' of login.hepforge.org…
Author
patrickstowell <p.stowell@sheffield.ac.uk>
Browse Repository
No Builds
No Audits
0be027d6983f Fixed a nucleon target bug in nuwro_nuisance.
Author
patrickstowell <p.stowell@sheffield.ac.uk>
Browse Repository
No Builds
No Audits
3542266724d5 Fixed a nucleon bug in the target definition inside nuwro_nuisance.
Author
patrickstowell <jstowell@minervagpvm03.fnal.gov>
Browse Repository
No Builds
No Audits
a9ce3400682d Hopefully fixes the build case where you want to use a version of NuWro with…
Author
lp208
Browse Repository
No Builds
No Audits
c94390e4b727 Merge branch 'master' of login.hepforge.org…
Author
cwilkinson <callum.wilkinson@lhep.unibe.ch>
Browse Repository
No Builds
No Audits
7f5fbf817b67 Add shape-only covariance to the JointMeas1D class (still not in 2D though).
Author
cwilkinson <callum.wilkinson@lhep.unibe.ch>
Browse Repository
No Builds
No Audits
5546a0ae2a57 Slightly change the output for the shape-only extraction function.
Author
cwilkinson <callum.wilkinson@lhep.unibe.ch>
Browse Repository
No Builds
No Audits
6fddb137b6c0 Slightly improved these samples, and let them use the new shape-only covariance.
Author
cwilkinson <callum.wilkinson@lhep.unibe.ch>
Browse Repository
No Builds
No Audits
3ce0e9325195 Add shape covariance so a shape-only data histogram can be written if requested…
Author
cwilkinson <callum.wilkinson@lhep.unibe.ch>
Browse Repository
No Builds
No Audits
63a7e85c0111 Add functionality to save shape-only data histograms using the shape-only…
Author
cwilkinson <callum.wilkinson@lhep.unibe.ch>
Browse Repository
No Builds
No Audits
dcc26105a9df Remove some old NEUT mode array commands which were causing issues.
Author
cwilkinson <callum.wilkinson@lhep.unibe.ch>
Browse Repository
No Builds
No Audits
40fb35a74d23 Add function to do the shape-only matrix extraction using the MiniBooNE formula.
Author
cwilkinson <callum.wilkinson@lhep.unibe.ch>
Browse Repository
No Builds
No Audits
238534404426 Merge branch 'master' of login.hepforge.org…
Author
cwilkinson <callum.wilkinson@lhep.unibe.ch>
Browse Repository
No Builds
No Audits
2633a185aed4 Minor ordering issue was causing this dataset to segfault...
Author
cwilkinson <callum.wilkinson@lhep.unibe.ch>
Browse Repository
No Builds
No Audits

Changes (111)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

Path

Size

app/

nuwro_NUISANCE.cxx

cmake/

NuWroSetup.cmake

data/

MINERvA/

CC1pi0/

2017_nu/

Correlation_Table_Delta_pi_phi_xsec.csv

Correlation_Table_Delta_pi_theta_xsec.csv

Correlation_Table_Enu_xsec.csv

Correlation_Table_QSq_xsec.csv

Correlation_Table_QSq_xsec_HighEnu.csv

Correlation_Table_QSq_xsec_LowEnu.csv

Correlation_Table_W_xsec.csv

Correlation_Table_deltaInvMass_xsec.csv

Correlation_Table_deltaInvMass_xsec_DeltaRich.csv

Correlation_Table_muon_P_xsec.csv

Correlation_Table_muon_theta_xsec.csv

Correlation_Table_pi0_KE_xsec.csv

Correlation_Table_pi0_theta_xsec.csv

XSec_Table_Delta_pi_phi_xsec.csv

XSec_Table_Delta_pi_theta_xsec.csv

XSec_Table_Enu_xsec.csv

XSec_Table_QSq_xsec.csv

XSec_Table_QSq_xsec_HighEnu.csv

XSec_Table_QSq_xsec_LowEnu.csv

XSec_Table_W_xsec.csv

XSec_Table_deltaInvMass_xsec.csv

XSec_Table_deltaInvMass_xsec_DeltaRich.csv

XSec_Table_muon_P_xsec.csv

XSec_Table_muon_theta_xsec.csv

XSec_Table_pi0_KE_xsec.csv

XSec_Table_pi0_theta_xsec.csv

Errors_Table_Delta_pi_phi_xsec.csv

Errors_Table_Delta_pi_theta_xsec.csv

Errors_Table_Enu_xsec.csv

Errors_Table_QSq_xsec.csv

Errors_Table_QSq_xsec_HighEnu.csv

Errors_Table_QSq_xsec_LowEnu.csv

Errors_Table_W_xsec.csv

Errors_Table_deltaInvMass_xsec.csv

Errors_Table_deltaInvMass_xsec_DeltaRich.csv

Errors_Table_muon_P_xsec.csv

Errors_Table_muon_theta_xsec.csv

Errors_Table_pi0_KE_xsec.csv

Errors_Table_pi0_theta_xsec.csv

doc/

parameters/

src/

ANL/

ANL_CC1ppip_Evt_1DcosthAdler_nu.cxx

ANL_CC1ppip_Evt_1Dphi_nu.cxx

BNL/

BNL_CC1ppip_Evt_1DcosthAdler_nu.cxx

BNL_CC1ppip_Evt_1Dphi_nu.cxx

FCN/

FitBase/

JointMeas1D.cxx

Measurement1D.cxx

Measurement1D.h

Measurement2D.cxx

K2K/

K2K_NC1pi0_Evt_1Dppi0_nu.cxx

MINERvA/

MINERvA_CC0pi_XSec_2Dptpx_antinu.cxx

MINERvA_CC0pi_XSec_2Dptpx_antinu.h

MINERvA_CC0pi_XSec_2Dptpx_nu.cxx

MINERvA_CC0pi_XSec_2Dptpx_nu.h

MINERvA_CC1pi0_XSec_1DEnu_antinu.cxx

MINERvA_CC1pi0_XSec_1DQ2_antinu.cxx

MINERvA_CC1pi0_XSec_1DTpi0_antinu.cxx

MINERvA_CC1pi0_XSec_1D_nu.cxx

MINERvA_CC1pi0_XSec_1D_nu.h

MINERvA_CC1pi0_XSec_1Dpmu_antinu.cxx

MINERvA_CC1pi0_XSec_1Dth_antinu.cxx

MINERvA_CC1pi0_XSec_1Dthmu_antinu.cxx

MINERvA_CC1pip_XSec_1D_2017Update.cxx

MINERvA_CCCOHPI_XSec_joint.cxx

MINERvA_CCCOHPI_XSec_joint.h

MINERvA_SignalDef.cxx

MINERvA_SignalDef.h

MiniBooNE/

MiniBooNE_CC1pi0_XSec_1DEnu_nu.cxx

MiniBooNE_CC1pi0_XSec_1DQ2_nu.cxx

MiniBooNE_CC1pi0_XSec_1DTu_nu.cxx

MiniBooNE_CC1pi0_XSec_1Dcosmu_nu.cxx

MiniBooNE_CC1pi0_XSec_1Dcospi0_nu.cxx

MiniBooNE_CC1pi0_XSec_1Dppi0_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

Routines/

SystematicRoutines.cxx

T2K/

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

T2K_CC1pip_H2O_XSec_1DEnuDelta_nu.cxx

T2K_CC1pip_H2O_XSec_1DEnuMB_nu.cxx

T2K_CC1pip_H2O_XSec_1Dcosmu_nu.cxx

T2K_CC1pip_H2O_XSec_1Dcosmupi_nu.cxx

T2K_CC1pip_H2O_XSec_1Dcospi_nu.cxx

T2K_CC1pip_H2O_XSec_1Dpmu_nu.cxx

T2K_CC1pip_H2O_XSec_1Dppi_nu.cxx

Utils/

rNUISANCEGITa6c4143c8874

app/nuwro_NUISANCE.cxx

cmake/NuWroSetup.cmake

cmake/setup.sh.in

data/MINERvA/CC1pi0/2017_nu/corr/Correlation_Table_Delta_pi_phi_xsec.csv

data/MINERvA/CC1pi0/2017_nu/corr/Correlation_Table_Delta_pi_theta_xsec.csv

data/MINERvA/CC1pi0/2017_nu/corr/Correlation_Table_Enu_xsec.csv

data/MINERvA/CC1pi0/2017_nu/corr/Correlation_Table_QSq_xsec.csv

data/MINERvA/CC1pi0/2017_nu/corr/Correlation_Table_QSq_xsec_HighEnu.csv

data/MINERvA/CC1pi0/2017_nu/corr/Correlation_Table_QSq_xsec_LowEnu.csv

data/MINERvA/CC1pi0/2017_nu/corr/Correlation_Table_W_xsec.csv

data/MINERvA/CC1pi0/2017_nu/corr/Correlation_Table_deltaInvMass_xsec.csv

data/MINERvA/CC1pi0/2017_nu/corr/Correlation_Table_deltaInvMass_xsec_DeltaRich.csv

data/MINERvA/CC1pi0/2017_nu/corr/Correlation_Table_muon_P_xsec.csv

data/MINERvA/CC1pi0/2017_nu/corr/Correlation_Table_muon_theta_xsec.csv

data/MINERvA/CC1pi0/2017_nu/corr/Correlation_Table_pi0_KE_xsec.csv

data/MINERvA/CC1pi0/2017_nu/corr/Correlation_Table_pi0_theta_xsec.csv

data/MINERvA/CC1pi0/2017_nu/data/XSec_Table_Delta_pi_phi_xsec.csv

data/MINERvA/CC1pi0/2017_nu/data/XSec_Table_Delta_pi_theta_xsec.csv

data/MINERvA/CC1pi0/2017_nu/data/XSec_Table_Enu_xsec.csv

data/MINERvA/CC1pi0/2017_nu/data/XSec_Table_QSq_xsec.csv

data/MINERvA/CC1pi0/2017_nu/data/XSec_Table_QSq_xsec_HighEnu.csv

data/MINERvA/CC1pi0/2017_nu/data/XSec_Table_QSq_xsec_LowEnu.csv

data/MINERvA/CC1pi0/2017_nu/data/XSec_Table_W_xsec.csv

data/MINERvA/CC1pi0/2017_nu/data/XSec_Table_deltaInvMass_xsec.csv

data/MINERvA/CC1pi0/2017_nu/data/XSec_Table_deltaInvMass_xsec_DeltaRich.csv

data/MINERvA/CC1pi0/2017_nu/data/XSec_Table_muon_P_xsec.csv

data/MINERvA/CC1pi0/2017_nu/data/XSec_Table_muon_theta_xsec.csv

data/MINERvA/CC1pi0/2017_nu/data/XSec_Table_pi0_KE_xsec.csv

data/MINERvA/CC1pi0/2017_nu/data/XSec_Table_pi0_theta_xsec.csv

data/MINERvA/CC1pi0/2017_nu/errors/Errors_Table_Delta_pi_phi_xsec.csv

data/MINERvA/CC1pi0/2017_nu/errors/Errors_Table_Delta_pi_theta_xsec.csv

data/MINERvA/CC1pi0/2017_nu/errors/Errors_Table_Enu_xsec.csv

data/MINERvA/CC1pi0/2017_nu/errors/Errors_Table_QSq_xsec.csv

data/MINERvA/CC1pi0/2017_nu/errors/Errors_Table_QSq_xsec_HighEnu.csv

data/MINERvA/CC1pi0/2017_nu/errors/Errors_Table_QSq_xsec_LowEnu.csv

data/MINERvA/CC1pi0/2017_nu/errors/Errors_Table_W_xsec.csv

data/MINERvA/CC1pi0/2017_nu/errors/Errors_Table_deltaInvMass_xsec.csv

data/MINERvA/CC1pi0/2017_nu/errors/Errors_Table_deltaInvMass_xsec_DeltaRich.csv

data/MINERvA/CC1pi0/2017_nu/errors/Errors_Table_muon_P_xsec.csv

data/MINERvA/CC1pi0/2017_nu/errors/Errors_Table_muon_theta_xsec.csv

data/MINERvA/CC1pi0/2017_nu/errors/Errors_Table_pi0_KE_xsec.csv

data/MINERvA/CC1pi0/2017_nu/errors/Errors_Table_pi0_theta_xsec.csv

data/MINERvA/CC1pi0/2017_nu/flux/Flux_Table.csv

doc/Doxyfile.in

parameters/config.xml

src/ANL/ANL_CC1ppip_Evt_1DcosthAdler_nu.cxx

src/ANL/ANL_CC1ppip_Evt_1Dphi_nu.cxx

src/BNL/BNL_CC1ppip_Evt_1DcosthAdler_nu.cxx

src/BNL/BNL_CC1ppip_Evt_1Dphi_nu.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/ParamPull.h

src/K2K/K2K_NC1pi0_Evt_1Dppi0_nu.cxx

src/MINERvA/CMakeLists.txt

src/MINERvA/MINERvA_CC0pi_XSec_2Dptpx_antinu.cxx

src/MINERvA/MINERvA_CC0pi_XSec_2Dptpx_antinu.h

src/MINERvA/MINERvA_CC0pi_XSec_2Dptpx_nu.cxx

src/MINERvA/MINERvA_CC0pi_XSec_2Dptpx_nu.h

src/MINERvA/MINERvA_CC1pi0_XSec_1DEnu_antinu.cxx

src/MINERvA/MINERvA_CC1pi0_XSec_1DQ2_antinu.cxx

src/MINERvA/MINERvA_CC1pi0_XSec_1DTpi0_antinu.cxx

src/MINERvA/MINERvA_CC1pi0_XSec_1D_nu.cxx

src/MINERvA/MINERvA_CC1pi0_XSec_1D_nu.h

src/MINERvA/MINERvA_CC1pi0_XSec_1Dpmu_antinu.cxx

src/MINERvA/MINERvA_CC1pi0_XSec_1Dth_antinu.cxx

src/MINERvA/MINERvA_CC1pi0_XSec_1Dthmu_antinu.cxx

src/MINERvA/MINERvA_CC1pip_XSec_1D_2017Update.cxx

src/MINERvA/MINERvA_CCCOHPI_XSec_joint.cxx

src/MINERvA/MINERvA_CCCOHPI_XSec_joint.h

src/MINERvA/MINERvA_SignalDef.cxx

src/MINERvA/MINERvA_SignalDef.h

src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1DEnu_nu.cxx

src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1DQ2_nu.cxx

src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1DTu_nu.cxx

src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1Dcosmu_nu.cxx

src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1Dcospi0_nu.cxx

src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1Dppi0_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/Routines/SystematicRoutines.cxx

src/T2K/T2K_CC1pip_CH_XSec_1DQ2_nu.cxx

src/T2K/T2K_CC1pip_CH_XSec_1DWrec_nu.cxx

src/T2K/T2K_CC1pip_CH_XSec_1Dpmu_nu.cxx

src/T2K/T2K_CC1pip_CH_XSec_1Dppi_nu.cxx

src/T2K/T2K_CC1pip_CH_XSec_1Dq3_nu.cxx

src/T2K/T2K_CC1pip_CH_XSec_1Dthmupi_nu.cxx

src/T2K/T2K_CC1pip_CH_XSec_1Dthpi_nu.cxx

src/T2K/T2K_CC1pip_CH_XSec_1Dthq3pi_nu.cxx

src/T2K/T2K_CC1pip_H2O_XSec_1DEnuDelta_nu.cxx

src/T2K/T2K_CC1pip_H2O_XSec_1DEnuMB_nu.cxx

src/T2K/T2K_CC1pip_H2O_XSec_1Dcosmu_nu.cxx

src/T2K/T2K_CC1pip_H2O_XSec_1Dcosmupi_nu.cxx

src/T2K/T2K_CC1pip_H2O_XSec_1Dcospi_nu.cxx

src/T2K/T2K_CC1pip_H2O_XSec_1Dpmu_nu.cxx

src/T2K/T2K_CC1pip_H2O_XSec_1Dppi_nu.cxx

src/Utils/FitUtils.cxx

src/Utils/FitUtils.h

src/Utils/StatUtils.cxx

src/Utils/StatUtils.h