Merge pull request #13 from NUISANCEMC/kduffy_t2k2018
b1e8b11add7b
Actions

Description

Merge pull request #13 from NUISANCEMC/kduffy_t2k2018

Adding T2K 2018 CC0pi data sample and plotting script

Details

Provenance

lp208	Authored on Oct 14 2020, 11:26 PM
GitHub <noreply@github.com>	Committed on Oct 14 2020, 11:26 PM
cwret	Pushed on Nov 9 2020, 4:06 PM

Parents

rNUISANCEGITc037f578dfc0: Adding plotting script. Lots of hardcoding so beware (and read the code before…
rNUISANCEGITd411788c72a5: Merge branch 'master' of github.com:NUISANCEMC/nuisance

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed rNUISANCEGITb1e8b11add7b: Merge pull request #13 from NUISANCEMC/kduffy_t2k2018 (authored by lp208).Oct 14 2020, 11:26 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

c037f578dfc0 Adding plotting script. Lots of hardcoding so beware (and read the code before…
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
bc39bac52429 Think I fixed the bug, CC0pi1p sample on its own should work now
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
49141266585a Now debugging the next problem
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
7d4ebc072720 Think I fixed it
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
e8a5098682cb more debugging
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
19f262d3f62d more debugging
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
a217fe90f698 Actually fixed the bug this time
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
a24eac4bad67 Fixed bug in slice histograms not filling properly when looking at 1p sample…
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
8faa841365a2 Debug why slice histograms don't fill properly when looking at 1p sample only
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
075caf0d54f6 Fix naming of data histogram for different subsamples
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
91749013d165 Refine logic in binnumber finding so that it doesn't return an error for events…
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
ce353ecec6b1 Make sure kCMD_Scale is used for ResultInCosTheta histograms as well as MC…
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
861cd4bab593 Debugs
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
1115d0c86e26 Undo scale factor (maybe it's covered in auto scaling?)
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
e7356d85cc29 Set scaling for MC slice histograms
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
8501371d4f83 Debugging continues
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
6a93f23cb0f5 Maybe I was right the first time?
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
59bbcd6ae9b0 That didn't work. Does removing kCMD_Reset help?
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
292ed4def4d2 Seems like I need to multiply MC prediction by bin width rather than divide, to…
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
67481c6cc0e2 More debugging
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
b001afee9ba5 More debugging
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
00d0f02a2b9b More debugging
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
91ebb5625e19 Remove cout statement from debugging
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
b96e9d806f27 fix typo
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
b99312b7baba Add bin width scaling for slice histograms and save slice histograms with chi2…
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
102cf484cd4a couts for debugging
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
84ba5287713b Covariance matrices are squared
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
913555fbee1f Multiply covariance matrix by 1e38 to make it match data uncertainties (and…
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
6a903cd681ae Fix off-by-one error in main binnumber histogram
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
affd7aa699eb Set mode correctly
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
f1f14de419e9 Fix stupid bug in setting covariance matrix
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
8c1441732a0d It runs now, but some bugs in output histograms being saved. Try to fix
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
c19a234ebc8b Maybe I fixed it
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
a26975f37b20 More debugging
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
947c72e35091 More debugging
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
b60c072b41f4 More debugging
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
f03ed940c54d Debugging segfault
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
78b3d800d2fc Remove mentions of ConvertEventRates because I'm not implementing it
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
d4dca3d6082f Don't clone things that might not exist
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
1f7f8f7ba199 Fix small bugs stopping it compiling
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
f990309582fd Remove unnecessary c_str()
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
bbacde78f384 Make slice histograms pointers too
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
49caffa78ace Define variables
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
d48d1b4fb69b Break doesn't do what I wish it did
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
a40f2a219941 Make histograms pointers like I expected them to be in the code
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
9beb56a87175 Fix typo in returning slice number
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
2abd9b2fe54f Make all versions of the class/sample name consistent
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
2adfbf102926 same as last commit but without typos this time
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
fddafd669108 Add new sample to CMakeLists, and remove old implementation
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits
102d8a893211 Use sample name to determine histogram name so everything is nice and consistent
Author
kirsty-duffy <ke.duffy1@gmail.com>
Browse Repository
No Builds
No Audits

Changes (11)

Path

Size

data/

T2K/

CC0pi/

STV/

multidif_binMap.txt

multidif_results.root

scripts/

PlotNuisComparisons.C

src/

FCN/

SampleList.cxx

T2K/

CMakeLists.txt

T2K_CC0pi1p_XSec_3DPcoscos_nu_nonuniform.cxx

T2K_CC0pi1p_XSec_3DPcoscos_nu_nonuniform.h

T2K_CC0piWithProtons_XSec_2018_multidif_0p_1p_Np.cxx

	T2K_CC0piWithProtons_XSec_2018_multidif_0p_1p_Np.h
	T2K_CC0pi1p_XSec_3DPcoscos_nu_nonuniform.h

T2K_SignalDef.cxx

T2K_SignalDef.h

rNUISANCEGITb1e8b11add7b

View Options

data/T2K/CC0pi/STV/multidif_binMap.txt

View Options

data/T2K/CC0pi/STV/multidif_results.root

View Options

scripts/PlotNuisComparisons.C

View Options

src/FCN/SampleList.cxx

View Options

src/T2K/CMakeLists.txt

View Options

src/T2K/T2K_CC0pi1p_XSec_3DPcoscos_nu_nonuniform.cxx

View Options

src/T2K/T2K_CC0pi1p_XSec_3DPcoscos_nu_nonuniform.h

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_SignalDef.cxx

View Options

Merge pull request #13 from NUISANCEMC/kduffy_t2k2018b1e8b11add7bActions

Description

Details

Event Timeline

Merged Changes

Changes (11)

rNUISANCEGITb1e8b11add7b

data/T2K/CC0pi/STV/multidif_binMap.txt

data/T2K/CC0pi/STV/multidif_results.root

scripts/PlotNuisComparisons.C

src/FCN/SampleList.cxx

src/T2K/CMakeLists.txt

src/T2K/T2K_CC0pi1p_XSec_3DPcoscos_nu_nonuniform.cxx

src/T2K/T2K_CC0pi1p_XSec_3DPcoscos_nu_nonuniform.h

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_SignalDef.cxx

src/T2K/T2K_SignalDef.h

Merge pull request #13 from NUISANCEMC/kduffy_t2k2018
b1e8b11add7b
Actions