Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set(CMAKE_VERBOSE_MAKEFILE ON)
cmake_minimum_required(VERSION 3.14 FATAL_ERROR)

# Create project
project(MaCh3Tutorial VERSION 2.6.1 LANGUAGES CXX)
project(MaCh3Tutorial VERSION 2.7.0 LANGUAGES CXX)
set(MaCh3Tutorial_VERSION ${PROJECT_VERSION})

set(CMAKE_CXX_STANDARD_REQUIRED True)
Expand Down
30 changes: 10 additions & 20 deletions TutorialConfigs/CovObjs/OscillationModel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ Systematics:
Generated: 0.307
PreFitValue: 0.307
PostND: 0.307
StepScale:
MCMC: 0.9
StepScale: 0.9
Type: Oscillation

- Systematic:
Expand All @@ -38,8 +37,7 @@ Systematics:
Generated: 0.546
PreFitValue: 0.546
PostND: 0.546
StepScale:
MCMC: 0.9
StepScale: 0.9
Type: Oscillation

- Systematic:
Expand All @@ -56,8 +54,7 @@ Systematics:
Generated: 0.0220
PreFitValue: 0.0220
PostND: 0.0220
StepScale:
MCMC: 5.0
StepScale: 5.0
Type: Oscillation

- Systematic:
Expand All @@ -74,8 +71,7 @@ Systematics:
Generated: 0.0000753
PreFitValue: 0.0000753
PostND: 0.0000753
StepScale:
MCMC: 0.9
StepScale: 0.9
Type: Oscillation

- Systematic:
Expand All @@ -94,8 +90,7 @@ Systematics:
Generated: 0.002536
PreFitValue: 0.002536
PostND: 0.002536
StepScale:
MCMC: 0.9
StepScale: 0.9
Type: Oscillation

- Systematic:
Expand All @@ -115,8 +110,7 @@ Systematics:
Generated: -1.601
PreFitValue: -1.601
PostND: -1.601
StepScale:
MCMC: 0.9
StepScale: 0.9
Type: Oscillation

- Systematic:
Expand All @@ -133,8 +127,7 @@ Systematics:
Generated: 295
PreFitValue: 295
PostND: 295
StepScale:
MCMC: 0.9
StepScale: 0.9
Type: Oscillation

- Systematic:
Expand All @@ -151,8 +144,7 @@ Systematics:
Generated: 2.6
PreFitValue: 2.6
PostND: 2.6
StepScale:
MCMC: 0.9
StepScale: 0.9
Type: Oscillation

- Systematic:
Expand All @@ -169,8 +161,7 @@ Systematics:
Generated: 0.5
PreFitValue: 0.5
PostND: 0.5
StepScale:
MCMC: 0.9
StepScale: 0.9
Type: Oscillation

- Systematic:
Expand All @@ -187,6 +178,5 @@ Systematics:
Generated: 15
PreFitValue: 15
PostND: 15
StepScale:
MCMC: 0.9
StepScale: 0.9
Type: Oscillation
30 changes: 10 additions & 20 deletions TutorialConfigs/CovObjs/PCATest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ Systematics:
Generated: 1
PreFitValue: 1
PostND: 1.05
StepScale:
MCMC: 7.5
StepScale: 7.5
Type: Norm

- Systematic:
Expand Down Expand Up @@ -60,8 +59,7 @@ Systematics:
Generated: 1
PreFitValue: 1
PostND: 1.05
StepScale:
MCMC: 7.5
StepScale: 7.5
Type: Norm

- Systematic:
Expand Down Expand Up @@ -91,8 +89,7 @@ Systematics:
Generated: 1
PreFitValue: 1
PostND: 1.05
StepScale:
MCMC: 7.5
StepScale: 7.5
Type: Norm

- Systematic:
Expand Down Expand Up @@ -122,8 +119,7 @@ Systematics:
Generated: 1
PreFitValue: 1
PostND: 1.05
StepScale:
MCMC: 7.5
StepScale: 7.5
Type: Norm

- Systematic:
Expand Down Expand Up @@ -153,8 +149,7 @@ Systematics:
Generated: 1
PreFitValue: 1
PostND: 1.05
StepScale:
MCMC: 7.5
StepScale: 7.5
Type: Norm

- Systematic:
Expand Down Expand Up @@ -184,8 +179,7 @@ Systematics:
Generated: 1
PreFitValue: 1
PostND: 1.05
StepScale:
MCMC: 7.5
StepScale: 7.5
Type: Norm

- Systematic:
Expand Down Expand Up @@ -215,8 +209,7 @@ Systematics:
Generated: 1
PreFitValue: 1
PostND: 1.05
StepScale:
MCMC: 7.5
StepScale: 7.5
Type: Norm

- Systematic:
Expand Down Expand Up @@ -245,8 +238,7 @@ Systematics:
Generated: 1
PreFitValue: 1
PostND: 1.05
StepScale:
MCMC: 7.5
StepScale: 7.5
Type: Norm

- Systematic:
Expand Down Expand Up @@ -275,8 +267,7 @@ Systematics:
Generated: 1
PreFitValue: 1
PostND: 1.05
StepScale:
MCMC: 7.5
StepScale: 7.5
Type: Norm

- Systematic:
Expand Down Expand Up @@ -306,6 +297,5 @@ Systematics:
Generated: 1
PreFitValue: 1
PostND: 1.05
StepScale:
MCMC: 7.5
StepScale: 7.5
Type: Norm
30 changes: 10 additions & 20 deletions TutorialConfigs/CovObjs/SystematicModel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ Systematics:
PreFitValue: 1.
PostND: 1.5
SampleNames: ["Tutorial_*", "ND2137"]
StepScale:
MCMC: 0.2
StepScale: 0.2
Type: Norm

- Systematic:
Expand All @@ -38,8 +37,7 @@ Systematics:
PreFitValue: 1.
PostND: 1.2
SampleNames: ["Tutorial_*", "ND2137"]
StepScale:
MCMC: 0.2
StepScale: 0.2
Type: Norm

- Systematic:
Expand All @@ -60,8 +58,7 @@ Systematics:
PreFitValue: 1.
PostND: 0.9
SampleNames: ["Tutorial_*", "ND2137"]
StepScale:
MCMC: 0.2
StepScale: 0.2
Type: Norm

- Systematic:
Expand All @@ -84,8 +81,7 @@ Systematics:
SplineKnotUpBound: 2
SplineKnotLowBound: 0.5
SampleNames: ["Tutorial_*", "ND2137"]
StepScale:
MCMC: 0.2
StepScale: 0.2
Type: Spline

- Systematic:
Expand All @@ -106,8 +102,7 @@ Systematics:
InterpolationType: Linear
SplineName: mysyst2
SampleNames: ["Tutorial_*", "ND2137"]
StepScale:
MCMC: 0.2
StepScale: 0.2
Type: Spline

- Systematic:
Expand All @@ -128,8 +123,7 @@ Systematics:
InterpolationType: Monotonic
SplineName: mysyst3
SampleNames: ["Tutorial_*", "ND2137"]
StepScale:
MCMC: 0.2
StepScale: 0.2
Type: Spline

- Systematic:
Expand All @@ -150,8 +144,7 @@ Systematics:
InterpolationType: Akima
SplineName: mysyst4
SampleNames: ["Tutorial_*", "ND2137"]
StepScale:
MCMC: 0.2
StepScale: 0.2
Type: Spline

- Systematic:
Expand All @@ -172,8 +165,7 @@ Systematics:
InterpolationType: Linear
SplineName: mysyst5
SampleNames: ["Tutorial_*", "ND2137"]
StepScale:
MCMC: 0.2
StepScale: 0.2
Type: Spline

- Systematic:
Expand All @@ -188,8 +180,7 @@ Systematics:
Generated: 0
PreFitValue: 0
PostND: 0.2
StepScale:
MCMC: 0.2
StepScale: 0.2
SampleNames: ["Tutorial_*"]
Type: Functional
Correlations:
Expand All @@ -207,8 +198,7 @@ Systematics:
Generated: 0
PreFitValue: 0
PostND: -0.1
StepScale:
MCMC: 0.2
StepScale: 0.2
SampleNames: ["Tutorial_*"]
Type: Functional
Correlations:
Expand Down
Loading