From 1ac9fa489a788c5ef635b7491a0e3b0fb53a0fcc Mon Sep 17 00:00:00 2001 From: Kamil Skwarczynski Date: Wed, 12 Aug 2026 15:38:33 +0000 Subject: [PATCH] remove unused option wihtin step scale --- CMakeLists.txt | 2 +- TutorialConfigs/CovObjs/OscillationModel.yaml | 30 +++++++------------ TutorialConfigs/CovObjs/PCATest.yaml | 30 +++++++------------ TutorialConfigs/CovObjs/SystematicModel.yaml | 30 +++++++------------ 4 files changed, 31 insertions(+), 61 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0224323a..8347d6ec 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/TutorialConfigs/CovObjs/OscillationModel.yaml b/TutorialConfigs/CovObjs/OscillationModel.yaml index 132c175b..23db3731 100755 --- a/TutorialConfigs/CovObjs/OscillationModel.yaml +++ b/TutorialConfigs/CovObjs/OscillationModel.yaml @@ -16,8 +16,7 @@ Systematics: Generated: 0.307 PreFitValue: 0.307 PostND: 0.307 - StepScale: - MCMC: 0.9 + StepScale: 0.9 Type: Oscillation - Systematic: @@ -38,8 +37,7 @@ Systematics: Generated: 0.546 PreFitValue: 0.546 PostND: 0.546 - StepScale: - MCMC: 0.9 + StepScale: 0.9 Type: Oscillation - Systematic: @@ -56,8 +54,7 @@ Systematics: Generated: 0.0220 PreFitValue: 0.0220 PostND: 0.0220 - StepScale: - MCMC: 5.0 + StepScale: 5.0 Type: Oscillation - Systematic: @@ -74,8 +71,7 @@ Systematics: Generated: 0.0000753 PreFitValue: 0.0000753 PostND: 0.0000753 - StepScale: - MCMC: 0.9 + StepScale: 0.9 Type: Oscillation - Systematic: @@ -94,8 +90,7 @@ Systematics: Generated: 0.002536 PreFitValue: 0.002536 PostND: 0.002536 - StepScale: - MCMC: 0.9 + StepScale: 0.9 Type: Oscillation - Systematic: @@ -115,8 +110,7 @@ Systematics: Generated: -1.601 PreFitValue: -1.601 PostND: -1.601 - StepScale: - MCMC: 0.9 + StepScale: 0.9 Type: Oscillation - Systematic: @@ -133,8 +127,7 @@ Systematics: Generated: 295 PreFitValue: 295 PostND: 295 - StepScale: - MCMC: 0.9 + StepScale: 0.9 Type: Oscillation - Systematic: @@ -151,8 +144,7 @@ Systematics: Generated: 2.6 PreFitValue: 2.6 PostND: 2.6 - StepScale: - MCMC: 0.9 + StepScale: 0.9 Type: Oscillation - Systematic: @@ -169,8 +161,7 @@ Systematics: Generated: 0.5 PreFitValue: 0.5 PostND: 0.5 - StepScale: - MCMC: 0.9 + StepScale: 0.9 Type: Oscillation - Systematic: @@ -187,6 +178,5 @@ Systematics: Generated: 15 PreFitValue: 15 PostND: 15 - StepScale: - MCMC: 0.9 + StepScale: 0.9 Type: Oscillation diff --git a/TutorialConfigs/CovObjs/PCATest.yaml b/TutorialConfigs/CovObjs/PCATest.yaml index 64eb6411..518f1257 100755 --- a/TutorialConfigs/CovObjs/PCATest.yaml +++ b/TutorialConfigs/CovObjs/PCATest.yaml @@ -29,8 +29,7 @@ Systematics: Generated: 1 PreFitValue: 1 PostND: 1.05 - StepScale: - MCMC: 7.5 + StepScale: 7.5 Type: Norm - Systematic: @@ -60,8 +59,7 @@ Systematics: Generated: 1 PreFitValue: 1 PostND: 1.05 - StepScale: - MCMC: 7.5 + StepScale: 7.5 Type: Norm - Systematic: @@ -91,8 +89,7 @@ Systematics: Generated: 1 PreFitValue: 1 PostND: 1.05 - StepScale: - MCMC: 7.5 + StepScale: 7.5 Type: Norm - Systematic: @@ -122,8 +119,7 @@ Systematics: Generated: 1 PreFitValue: 1 PostND: 1.05 - StepScale: - MCMC: 7.5 + StepScale: 7.5 Type: Norm - Systematic: @@ -153,8 +149,7 @@ Systematics: Generated: 1 PreFitValue: 1 PostND: 1.05 - StepScale: - MCMC: 7.5 + StepScale: 7.5 Type: Norm - Systematic: @@ -184,8 +179,7 @@ Systematics: Generated: 1 PreFitValue: 1 PostND: 1.05 - StepScale: - MCMC: 7.5 + StepScale: 7.5 Type: Norm - Systematic: @@ -215,8 +209,7 @@ Systematics: Generated: 1 PreFitValue: 1 PostND: 1.05 - StepScale: - MCMC: 7.5 + StepScale: 7.5 Type: Norm - Systematic: @@ -245,8 +238,7 @@ Systematics: Generated: 1 PreFitValue: 1 PostND: 1.05 - StepScale: - MCMC: 7.5 + StepScale: 7.5 Type: Norm - Systematic: @@ -275,8 +267,7 @@ Systematics: Generated: 1 PreFitValue: 1 PostND: 1.05 - StepScale: - MCMC: 7.5 + StepScale: 7.5 Type: Norm - Systematic: @@ -306,6 +297,5 @@ Systematics: Generated: 1 PreFitValue: 1 PostND: 1.05 - StepScale: - MCMC: 7.5 + StepScale: 7.5 Type: Norm diff --git a/TutorialConfigs/CovObjs/SystematicModel.yaml b/TutorialConfigs/CovObjs/SystematicModel.yaml index 43c51406..75dbdd74 100755 --- a/TutorialConfigs/CovObjs/SystematicModel.yaml +++ b/TutorialConfigs/CovObjs/SystematicModel.yaml @@ -17,8 +17,7 @@ Systematics: PreFitValue: 1. PostND: 1.5 SampleNames: ["Tutorial_*", "ND2137"] - StepScale: - MCMC: 0.2 + StepScale: 0.2 Type: Norm - Systematic: @@ -38,8 +37,7 @@ Systematics: PreFitValue: 1. PostND: 1.2 SampleNames: ["Tutorial_*", "ND2137"] - StepScale: - MCMC: 0.2 + StepScale: 0.2 Type: Norm - Systematic: @@ -60,8 +58,7 @@ Systematics: PreFitValue: 1. PostND: 0.9 SampleNames: ["Tutorial_*", "ND2137"] - StepScale: - MCMC: 0.2 + StepScale: 0.2 Type: Norm - Systematic: @@ -84,8 +81,7 @@ Systematics: SplineKnotUpBound: 2 SplineKnotLowBound: 0.5 SampleNames: ["Tutorial_*", "ND2137"] - StepScale: - MCMC: 0.2 + StepScale: 0.2 Type: Spline - Systematic: @@ -106,8 +102,7 @@ Systematics: InterpolationType: Linear SplineName: mysyst2 SampleNames: ["Tutorial_*", "ND2137"] - StepScale: - MCMC: 0.2 + StepScale: 0.2 Type: Spline - Systematic: @@ -128,8 +123,7 @@ Systematics: InterpolationType: Monotonic SplineName: mysyst3 SampleNames: ["Tutorial_*", "ND2137"] - StepScale: - MCMC: 0.2 + StepScale: 0.2 Type: Spline - Systematic: @@ -150,8 +144,7 @@ Systematics: InterpolationType: Akima SplineName: mysyst4 SampleNames: ["Tutorial_*", "ND2137"] - StepScale: - MCMC: 0.2 + StepScale: 0.2 Type: Spline - Systematic: @@ -172,8 +165,7 @@ Systematics: InterpolationType: Linear SplineName: mysyst5 SampleNames: ["Tutorial_*", "ND2137"] - StepScale: - MCMC: 0.2 + StepScale: 0.2 Type: Spline - Systematic: @@ -188,8 +180,7 @@ Systematics: Generated: 0 PreFitValue: 0 PostND: 0.2 - StepScale: - MCMC: 0.2 + StepScale: 0.2 SampleNames: ["Tutorial_*"] Type: Functional Correlations: @@ -207,8 +198,7 @@ Systematics: Generated: 0 PreFitValue: 0 PostND: -0.1 - StepScale: - MCMC: 0.2 + StepScale: 0.2 SampleNames: ["Tutorial_*"] Type: Functional Correlations: