Merge pull request #117 from mach3-software/feature/SharedNuOsc

feat: Shared NuOsc CI

Author: KSkwarczynski

CIValidations/SamplePDFValidations.cpp

@@ -2,6 +2,29 @@
 #include "Utils/Comparison.h"
 #include "samplePDF/samplePDFTutorial.h"
 
+_MaCh3_Safe_Include_Start_ //{
+#include "Oscillator/OscillatorFactory.h"
+_MaCh3_Safe_Include_End_ //}
+
+void SharedNuOscTest(const std::string& config, covarianceXsec* xsec, covarianceOsc* osc){
+  OscillatorBase* OscillatorObj = nullptr;
+  MACH3LOG_INFO("Utilising a shared NuOscillator object between all atmospheric samples");
+
+  OscillatorFactory* OscillFactory = new OscillatorFactory();
+
+  std::string OscillatorConfig = std::string(std::getenv("MaCh3Tutorial_ROOT")) + "/TutorialConfigs/NuOscillator/CUDAProb3.yaml";
+  OscillatorObj = OscillFactory->CreateOscillator(OscillatorConfig);
+  OscillatorObj->Setup();
+  delete OscillFactory;
+
+  samplePDFTutorial *Sample1 = new samplePDFTutorial(config, xsec, osc, OscillatorObj);
+  samplePDFTutorial *Sample2 = new samplePDFTutorial(config, xsec, osc, OscillatorObj);
+
+  delete Sample1;
+  delete Sample2;
+  delete OscillatorObj;
+}
+
 int main(int argc, char *argv[])
 {
   SetMaCh3LoggerFormat();
@@ -73,6 +96,8 @@ int main(int argc, char *argv[])
     MACH3LOG_INFO("Everything is correct");
   }
 
+  SharedNuOscTest(SampleConfig.back(), xsec, osc);
+
   delete xsec;
   delete osc;
 

samplePDF/samplePDFTutorial.cpp

@@ -5,7 +5,8 @@
 #include "splines/splineFDBase.h"
 
 // ************************************************
-samplePDFTutorial::samplePDFTutorial(std::string mc_version_, covarianceXsec* xsec_cov_, covarianceOsc* osc_cov_) : samplePDFFDBase(mc_version_, xsec_cov_, osc_cov_) {
+samplePDFTutorial::samplePDFTutorial(std::string mc_version_, covarianceXsec* xsec_cov_, covarianceOsc* osc_cov_, OscillatorBase* Oscillator_)
+: samplePDFFDBase(mc_version_, xsec_cov_, osc_cov_, Oscillator_) {
 // ************************************************
   KinematicParameters = &KinematicParametersTutorial;
   ReversedKinematicParameters = &ReversedKinematicParametersTutorial;

samplePDF/samplePDFTutorial.h

@@ -4,10 +4,11 @@
 #include "samplePDF/samplePDFFDBase.h"
 #include "samplePDF/StructsTutorial.h"
 
+/// @brief Class responsible for handling implementation of samples used in analysis, reweighting and returning LLH
 class samplePDFTutorial : public samplePDFFDBase
 {
  public:
-  samplePDFTutorial(std::string mc_version, covarianceXsec* xsec_cov, covarianceOsc* osc_cov = nullptr);
+  samplePDFTutorial(std::string mc_version, covarianceXsec* xsec_cov, covarianceOsc* osc_cov = nullptr, OscillatorBase* Oscillator_ = nullptr);
   virtual ~samplePDFTutorial();
   enum KinematicTypes {kTrueNeutrinoEnergy, kTrueQ2, kM3Mode, kRecoNeutrinoEnergy};