Merge pull request #375 from mach3-software/dbarrow257/bugfix/GetEventSplineFix

bugfix: Correctly handle duplicate modes in GetEventSplines

Author: KSkwarczynski

CMakeLists.txt

@@ -3,7 +3,7 @@ set(CMAKE_VERBOSE_MAKEFILE ON)
 # CMake version check
 cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
-project(MaCh3 VERSION 1.4.5 LANGUAGES CXX)
+project(MaCh3 VERSION 1.4.7 LANGUAGES CXX)
 set(MaCh3_VERSION ${PROJECT_VERSION})
 
 option(MaCh3_PYTHON_ENABLED "Whether to build MaCh3 python bindings" OFF)

splines/splineFDBase.cpp

@@ -769,8 +769,19 @@ std::vector< std::vector<int> > splineFDBase::GetEventSplines(std::string Sample
   }
 
   int nSplineSysts = static_cast<int>(indexvec[SampleIndex][iOscChan].size());
-  //ETA- this is already a MaCh3 mode
-  int Mode = EventMode;
+
+
+  int Mode = -1;
+  std::string SuffixForEventMode = Modes->GetSplineSuffixFromMaCh3Mode(EventMode);
+  for (int iMode=0;iMode<Modes->GetNModes();iMode++) {
+    if (SuffixForEventMode == Modes->GetSplineSuffixFromMaCh3Mode(iMode)) {
+      Mode = iMode;
+      break;
+    }
+  }
+  if (Mode == -1) {
+    return ReturnVec;
+  }
 
   int Var1Bin = SplineBinning[SampleIndex][iOscChan][0]->FindBin(Var1Val)-1;
   if (Var1Bin < 0 || Var1Bin >= SplineBinning[SampleIndex][iOscChan][0]->GetNbins()) {