Skip to content
Merged
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
8 changes: 7 additions & 1 deletion CIValidations/SamplePDFValidations.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ _MaCh3_Safe_Include_Start_ //{
#include "Oscillator/OscillatorFactory.h"
_MaCh3_Safe_Include_End_ //}

void SharedNuOscTest(const std::string& config, ParameterHandlerGeneric* xsec){
void SharedNuOscTest(const std::string& config, ParameterHandlerGeneric* xsec) {
MACH3LOG_INFO("Utilising a shared NuOscillator object between all atmospheric samples");

std::string OscillatorConfig = std::string(std::getenv("MaCh3Tutorial_ROOT")) + "/TutorialConfigs/NuOscillator/CUDAProb3.yaml";
Expand All @@ -25,6 +25,11 @@ void NoSplinesNoOscTest(const std::string& config){
auto Sample = std::make_unique<SampleHandlerTutorial>(config, xsec.get());
}

void NoParamHandlerTest(const std::string& config) {
MACH3LOG_INFO("Starting {}", __func__);
auto Sample = std::make_unique<SampleHandlerTutorial>(config, nullptr);
}

void SampleLLHValidation(std::ostream& outFile, const std::string& OriginalSample, ParameterHandlerGeneric* xsec, const bool W2) {
std::string NameTString = OriginalSample;
xsec->SetParameters();
Expand Down Expand Up @@ -298,6 +303,7 @@ int main(int argc, char *argv[])

SharedNuOscTest(SampleConfig.back(), xsec);
NoSplinesNoOscTest(SampleConfig.back());
NoParamHandlerTest(SampleConfig.back());

delete xsec;

Expand Down
3 changes: 2 additions & 1 deletion SamplesTutorial/SampleHandlerTutorial.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,9 @@ void SampleHandlerTutorial::ResetShifts(const int iEvent) {
// ************************************************
void SampleHandlerTutorial::SetupSplines() {
// ************************************************
SplineHandler = nullptr;
if(ParHandler == nullptr) return;

SplineHandler = nullptr;
if(ParHandler->GetNumParamsFromSampleName(GetName(), SystType::kSpline) > 0){
SplineHandler = std::make_unique<BinnedSplineTutorial>(ParHandler, Modes.get());
InitialiseSplineObject();
Expand Down