Skip to content

breaking: Better param handling to NuOsc, NuOsc v1.5.0->v2.1.0 #289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KSkwarczynski wants to merge 1 commit into
base: main
Choose a base branch
from
Open

breaking: Better param handling to NuOsc, NuOsc v1.5.0->v2.1.0 #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 11 additions & 1 deletion CIValidations/SamplePDFValidations.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,18 @@ void SharedNuOscTest(const std::string& config, ParameterHandlerGeneric* xsec) {
throw MaCh3Exception(__FILE__ , __LINE__ );
}
std::string OscillatorConfig = std::string(std::getenv("MaCh3Tutorial_ROOT")) + "/TutorialConfigs/NuOscillator/CUDAProb3.yaml";

// get osc params for sample 0, later we check all have same number
auto OscParams = xsec->GetOscParsFromSampleName("Tutorial_ATM");
auto OscillatorObj = std::make_shared<OscillationHandler>(OscillatorConfig, true, OscParams, 6);

std::vector<const M3::float_t*> OscParamsValues(OscParams.size());
std::vector<std::string> NuOscName(OscParams.size());
for(size_t ij = 0; ij < OscParams.size(); ij++){
OscParamsValues[ij] = xsec->RetPointer(OscParams[ij].index);
NuOscName[ij] = OscParams[ij].NuOscName;
}

auto OscillatorObj = std::make_shared<OscillationHandler>(OscillatorConfig, true, OscParamsValues, NuOscName, 6);

auto Sample1 = std::make_unique<SampleHandlerTutorial>(config, xsec, OscillatorObj);
auto Sample2 = std::make_unique<SampleHandlerTutorial>(config, xsec, OscillatorObj);
Expand Down
13 changes: 10 additions & 3 deletions TutorialConfigs/CovObjs/OscillationModel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
Systematics:

#WARNING !!!
#osc covariance require particular order of osc parameters, do not change order of dials here
- Systematic:
Names:
FancyName: sin2th_12
Expand All @@ -19,6 +16,7 @@ Systematics:
StepScale:
MCMC: 0.9
Type: Oscillation
NuOscName: "sin2_th12"

- Systematic:
Names:
Expand All @@ -41,6 +39,7 @@ Systematics:
StepScale:
MCMC: 0.9
Type: Oscillation
NuOscName: "sin2_th23"

- Systematic:
Names:
Expand All @@ -59,6 +58,7 @@ Systematics:
StepScale:
MCMC: 5.0
Type: Oscillation
NuOscName: "sin2_th13"

- Systematic:
Names:
Expand All @@ -77,6 +77,7 @@ Systematics:
StepScale:
MCMC: 0.9
Type: Oscillation
NuOscName: "dm2_12"

- Systematic:
Names:
Expand All @@ -97,6 +98,7 @@ Systematics:
StepScale:
MCMC: 0.9
Type: Oscillation
NuOscName: "dm2_23"

- Systematic:
Names:
Expand All @@ -118,6 +120,7 @@ Systematics:
StepScale:
MCMC: 0.9
Type: Oscillation
NuOscName: "delta_cp"

- Systematic:
Names:
Expand All @@ -136,6 +139,7 @@ Systematics:
StepScale:
MCMC: 0.9
Type: Oscillation
NuOscName: "path_length"

- Systematic:
Names:
Expand All @@ -154,6 +158,7 @@ Systematics:
StepScale:
MCMC: 0.9
Type: Oscillation
NuOscName: "matter_density"

- Systematic:
Names:
Expand All @@ -172,6 +177,7 @@ Systematics:
StepScale:
MCMC: 0.9
Type: Oscillation
NuOscName: "electron_density"

- Systematic:
Names:
Expand All @@ -190,3 +196,4 @@ Systematics:
StepScale:
MCMC: 0.9
Type: Oscillation
NuOscName: "production_height"
Loading