Merge branch 'develop' into feature_FDVariablePlotting

DUNE · Oct 30, 2024 · 58084c3 · 58084c3
2 parents 1461c2f + fd4a473
commit 58084c3
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 3,404 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -56,15 +56,14 @@ find_package(duneanaobj)
 if(NOT duneanaobj_FOUND)
   CPMFindPackage(
     NAME duneanaobj
-    GIT_TAG "patch-1"
-    GITHUB_REPOSITORY dbarrow257/duneanaobj
-    OPTIONS
-    "STANDALONE_BUILD ON"
+    GIT_TAG feature/Clingification_rebase2024
+    GITHUB_REPOSITORY luketpickering/duneanaobj
+    VERSION 4.0.0
   )
 endif()
 
-if(NOT TARGET duneanaobj::All)
-  cmessage(FATAL_ERROR "MaCh3 DUNE Expected dependency target: duneanaobj::All")
+if(NOT TARGET duneanaobj::all)
+  cmessage(FATAL_ERROR "MaCh3 DUNE Expected dependency target: duneanaobj::all")
 endif()
 
 ##################################  MaCh3  ######################################

diff --git a/samplePDFDUNE/CMakeLists.txt b/samplePDFDUNE/CMakeLists.txt
@@ -2,15 +2,15 @@ set(HEADERS
   samplePDFDUNEAtm.h
   samplePDFDUNEBeamFD.h
   samplePDFDUNEBeamND.h
-  samplePDFDUNEBeamNDGar.h
+  # samplePDFDUNEBeamNDGar.h
   MaCh3DUNEFactory.h 
 )
 
 add_library(SamplePDFDUNE SHARED
   samplePDFDUNEAtm.cpp
   samplePDFDUNEBeamFD.cpp
   samplePDFDUNEBeamND.cpp
-  samplePDFDUNEBeamNDGar.cpp
+  # samplePDFDUNEBeamNDGar.cpp
   MaCh3DUNEFactory.cpp
 )
 
@@ -22,7 +22,7 @@ if(NOT CPU_ONLY)
   set_target_properties(SamplePDFDUNE PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
 endif()
 
-target_link_libraries(SamplePDFDUNE MaCh3::All MaCh3DUNECompilerOptions duneanaobj::All)
+target_link_libraries(SamplePDFDUNE MaCh3::All MaCh3DUNECompilerOptions duneanaobj::all)
 
 target_include_directories(SamplePDFDUNE PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/../>

diff --git a/samplePDFDUNE/MaCh3DUNEFactory.cpp b/samplePDFDUNE/MaCh3DUNEFactory.cpp
@@ -2,7 +2,7 @@
 
 #include "samplePDFDUNE/samplePDFDUNEBeamFD.h"
 #include "samplePDFDUNE/samplePDFDUNEBeamND.h"
-#include "samplePDFDUNE/samplePDFDUNEBeamNDGar.h"
+// #include "samplePDFDUNE/samplePDFDUNEBeamNDGar.h"
 #include "samplePDFDUNE/samplePDFDUNEAtm.h"
 
 samplePDFFDBase* GetMaCh3DuneInstance(std::string SampleType, std::string SampleConfig, covarianceXsec* &xsec) {
@@ -12,8 +12,8 @@ samplePDFFDBase* GetMaCh3DuneInstance(std::string SampleType, std::string Sample
     FDSample = new samplePDFDUNEBeamFD(SampleConfig, xsec);
   } else if (SampleType == "BeamND") {
     FDSample = new samplePDFDUNEBeamND(SampleConfig, xsec);
-  } else if (SampleType == "BeamNDGar") {
-    FDSample = new samplePDFDUNEBeamNDGar(SampleConfig, xsec);
+  // } else if (SampleType == "BeamNDGar") {
+  //   FDSample = new samplePDFDUNEBeamNDGar(SampleConfig, xsec);
   } else if (SampleType == "Atm") {
     FDSample = new samplePDFDUNEAtm(SampleConfig, xsec);
   } else {
@@ -87,7 +87,7 @@ void MakeMaCh3DuneInstance(manager *FitManager, std::vector<samplePDFFDBase*> &D
 
   // Fixed xsec parameters loop
   if (XsecFixParams.size() == 1 && XsecFixParams.at(0) == "All") {
-    for (int j = 0; j < xsec->getSize(); j++) {
+    for (int j = 0; j < xsec->getNpars(); j++) {
       xsec->toggleFixParameter(j);
     }
   } else {

diff --git a/samplePDFDUNE/samplePDFDUNEAtm.cpp b/samplePDFDUNE/samplePDFDUNEAtm.cpp
@@ -1,7 +1,7 @@
 #include "samplePDFDUNEAtm.h"
 
 //Standard Record includes
-#include "StandardRecord.h"
+#include "duneanaobj/StandardRecord/StandardRecord.h"
 
 //ROOT includes
 #include "TError.h"

diff --git a/samplePDFDUNE/samplePDFDUNEBeamFD.cpp b/samplePDFDUNE/samplePDFDUNEBeamFD.cpp
@@ -205,7 +205,7 @@ int samplePDFDUNEBeamFD::setupExperimentMC(int iSample) {
   MACH3LOG_INFO("-------------------------------------------------------------------");
   MACH3LOG_INFO("input file: {}", mc_files[iSample]);
 
-  _sampleFile = new TFile(mc_files[iSample].c_str(), "READ");
+  _sampleFile = TFile::Open(mc_files[iSample].c_str(), "READ");
   _data = (TTree*)_sampleFile->Get("caf");
 
   if(_data){

diff --git a/samplePDFDUNE/samplePDFDUNEBeamND.cpp b/samplePDFDUNE/samplePDFDUNEBeamND.cpp
@@ -174,7 +174,7 @@ int samplePDFDUNEBeamND::setupExperimentMC(int iSample) {
   MACH3LOG_INFO("-------------------------------------------------------------------");
   MACH3LOG_INFO("input file: {}", mc_files.at(iSample));
 
-  _sampleFile = new TFile(mc_files.at(iSample).c_str(), "READ");
+  _sampleFile = TFile::Open(mc_files.at(iSample).c_str(), "READ");
   _data = (TTree*)_sampleFile->Get("caf");
 
   if(_data){

diff --git a/samplePDFDUNE/samplePDFDUNEBeamNDGar.cpp b/samplePDFDUNE/samplePDFDUNEBeamNDGar.cpp
@@ -63,7 +63,7 @@ int samplePDFDUNEBeamNDGar::setupExperimentMC(int iSample) {
   MACH3LOG_INFO("-------------------------------------------------------------------");
   MACH3LOG_INFO("Input File: {}", mc_files.at(iSample));
 
-  _sampleFile = new TFile(mc_files.at(iSample).c_str(), "READ");
+  _sampleFile = TFile::Open(mc_files.at(iSample).c_str(), "READ");
   _data = (TTree*)_sampleFile->Get("cafTree");
 
   if(_data){