Feature tidy up

python/samplePDF.cpp

@@ -2,9 +2,7 @@
 #include <pybind11/stl.h>
 #include <pybind11/numpy.h>
 
-#include "samplePDF/samplePDFBase.h"
 #include "samplePDF/samplePDFFDBase.h"
-#include "samplePDF/FDMCStruct.h"
 
 namespace py = pybind11;
 

samplePDF/CMakeLists.txt

@@ -2,7 +2,7 @@ set(HEADERS
     samplePDFBase.h
     samplePDFFDBase.h
     Structs.h
-    FDMCStruct.h
+	FarDetectorCoreInfoStruct.h
 )
 
 add_library(SamplePDF SHARED

samplePDF/FarDetectorCoreInfoStruct.h

@@ -0,0 +1,68 @@
+#pragma once
+
+/// @brief constructors are same for all three so put in here
+struct FarDetectorCoreInfo {
+  FarDetectorCoreInfo() : isNC{nullptr} {}
+  FarDetectorCoreInfo(FarDetectorCoreInfo const &other) = delete;
+  FarDetectorCoreInfo(FarDetectorCoreInfo &&other) = default;
+  FarDetectorCoreInfo& operator=(FarDetectorCoreInfo const &other) = delete;
+  FarDetectorCoreInfo& operator=(FarDetectorCoreInfo &&other) = delete;
+
+  ~FarDetectorCoreInfo(){ delete [] isNC; }
+
+  int nutype; // 2 = numu/signue | -2 = numub | 1 = nue | -1 = nueb           
+  int oscnutype;    
+  int nupdg;
+  int nupdgUnosc;
+  bool signal; // true if signue                                              
+  int nEvents; // how many MC events are there
+  double ChannelIndex;
+  std::string flavourName;
+
+  std::vector<int*> Target; // target the interaction was on
+
+  int SampleDetID;
+
+  //THe x_var and y_vars that you're binning in
+  std::vector<const double*> x_var;
+  std::vector<const double*> y_var;
+  std::vector<const double*> rw_etru;
+  std::vector<const double*> rw_truecz;
+
+  /// xsec bins
+  std::vector< std::vector< int > > xsec_norms_bins;
+
+  /// DB Speedup bits
+  double Unity;
+  float Unity_F;
+  int Unity_Int;
+  double dummy_value = -999;
+
+  std::vector<int> nxsec_norm_pointers;
+  std::vector<std::vector<const double*>> xsec_norm_pointers;
+
+  std::vector<int> nxsec_spline_pointers;
+  std::vector<std::vector<const double*>> xsec_spline_pointers;
+
+  std::vector<int> ntotal_weight_pointers;
+  std::vector<std::vector<const double*>> total_weight_pointers;
+  std::vector<double> total_w;
+
+  std::vector<int> XBin;
+  std::vector<int> YBin;
+  std::vector<int> NomXBin;
+  std::vector<int> NomYBin;
+
+  bool *isNC;
+
+  // histo pdf bins
+  std::vector<double> rw_lower_xbinedge; // lower to check if Eb has moved the erec bin
+  std::vector<double> rw_lower_lower_xbinedge; // lower to check if Eb has moved the erec bin
+  std::vector<double> rw_upper_xbinedge; // upper to check if Eb has moved the erec bin
+  std::vector<double> rw_upper_upper_xbinedge; // upper to check if Eb has moved the erec bin
+
+  std::vector<double*> mode;
+
+  std::vector<const M3::float_t*> osc_w_pointer;
+  std::vector<double> xsec_w;
+};