feat: Move main to develop (v1.0.0)

.github/workflows/CDImage.yml

@@ -22,10 +22,10 @@ jobs:
       matrix:
         include:
           - os: alma9
-            file: doc/MaCh3DockerFiles/Alma9/Dockerfile
+            file: Docs/MaCh3DockerFiles/Alma9/Dockerfile
             tag_latest: alma9latest
           - os: Ubuntu22.04
-            file: doc/MaCh3DockerFiles/Ubuntu22.04/Dockerfile
+            file: Docs/MaCh3DockerFiles/Ubuntu22.04/Dockerfile
             tag_latest: ubuntulatest
 
     name: Image CD ${{ matrix.os }}

.github/workflows/CIBuild.yml

@@ -1,7 +1,6 @@
 ---
 # Check if MaCh3 compiles correctly
-
-name: Build CI
+name: Build CD
 
 # The events that trigger the workflow
 on:
@@ -20,10 +19,10 @@ jobs:
       matrix:
         include:
           - os: Alma9
-            file: doc/MaCh3DockerFiles/Alma9/Dockerfile
+            file: Docs/MaCh3DockerFiles/Alma9/Dockerfile
             tag: alma9latest
           - os: Ubuntu22.04
-            file: doc/MaCh3DockerFiles/Ubuntu22.04/Dockerfile
+            file: Docs/MaCh3DockerFiles/Ubuntu22.04/Dockerfile
             tag: ubuntulatest
 
     name: Build CI ${{ matrix.os }}

.github/workflows/CIValidations.yml

@@ -0,0 +1,71 @@
+---
+name: Event Rates Beam
+
+# To add additional run-time tests add (to matrix)
+# - name: <your test>
+#   test_exe: /test/<your exe>
+#   test_config: path/to/tconfiguration
+#   repo_linking_command: ln -sf /path/to/files/ (usually CAFs + splines)
+
+on:
+  pull_request:
+    branches: [develop, main]
+
+permissions:
+  contents: read
+  packages: write
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        include:
+          - name: Beam Event Rate Validation
+            test_exe: EventRates
+            build_arg: -DCUDAProb3Linear_ENABLED=ON
+            test_config: CIValidations/CIInputs/CIFitConfig.yaml
+            old_output: CIValidations/CIOutputs/BeamEventRates.txt
+            new_output: CIValidations/CIOutputs/BeamEventRates_New.txt
+
+
+    name: Run Test ${{matrix.name}}
+    steps:
+      # Checkout the repository code
+      - uses: actions/checkout@v4
+      - name: Log in to GitHub Container Registry
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+
+      - name: Start docker container
+        env:
+          MACH3_DUNE_VERSION: ${{ github.event.pull_request.head.ref || github.ref_name }}
+        run: |
+          docker build . \
+          --file Docs/MaCh3DockerFiles/Alma9/Dockerfile \
+          --tag ghcr.io/dune/mach3:alma9_ci \
+          --build-arg MACH3_DUNE_VERSION="${MACH3_DUNE_VERSION}" \
+          --build-arg CMAKE_OPTIONS=${{matrix.build_arg}}
+
+      # Run event rates
+      - name: Run Event Rates
+        uses: addnab/docker-run-action@v3
+        with:
+          image: ghcr.io/dune/mach3:alma9_ci
+          shell: bash
+          run: |
+            dnf install -y diffutils
+            cd ..
+            source ./build/bin/setup.MaCh3.sh
+            source ./build/bin/setup.MaCh3DUNE.sh
+            echo Running ./build/bin/${{matrix.test_exe}} ${{matrix.test_config}} 2>&1 | grep '^\['"${{matrix.test_exe}}"'\.cpp\]' | tee ${{matrix.new_output}}
+            ./build/bin/${{matrix.test_exe}} ${{matrix.test_config}} | grep '^\['"${{matrix.test_exe}}"'\.cpp\]' | tee ${{matrix.new_output}}
+            diff ${{matrix.old_output}} ${{matrix.new_output}} > diff_output.txt
+            DIFF_EXIT=$?
+            cat diff_output.txt
+            if [ $DIFF_EXIT -gt 0 ]; then
+              echo "Differences found:"
+              exit 1
+            else
+              echo "Workflow run successfully, no differences found!"
+            fi

.github/workflows/Doxygen.yml

@@ -45,12 +45,12 @@ jobs:
       - name: Doxygen Action
         uses: mattnotmitt/doxygen-action@v1.12.0
         with:
-          doxyfile-path: './doc/Doxyfile'
+          doxyfile-path: './Docs/Doxyfile'
           working-directory: .
 
       # Deploys the generated documentation to GitHub Pages
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./doc/html
+          publish_dir: ./Docs/html

.gitignore

@@ -9,6 +9,6 @@ logs/
 jupyter_env
 .history
 Doc
-inputs/Atmospherics/CAFs
+Inputs/Atmospherics/CAFs
 nohup.out
 output*.txt

Apps/CMakeLists.txt

@@ -10,7 +10,7 @@ foreach(app
       )
 
     add_executable(${app} ${app}.cpp)
-    target_link_libraries(${app} MaCh3DUNE::All Minuit)
+    target_link_libraries(${app} SamplesDUNE MaCh3DUNE::All Minuit)
 
     add_dependencies(MaCh3DUNEApps ${app})
 

Apps/EventRates.cpp

@@ -12,8 +12,8 @@
 #include <TColor.h>
 #include <TMath.h>
 
-#include "samplePDFDUNE/MaCh3DUNEFactory.h"
-#include "samplePDFDUNE/StructsDUNE.h"
+#include "Samples/MaCh3DUNEFactory.h"
+#include "Samples/StructsDUNE.h"
 
 void Write1DHistogramsToFile(std::string OutFileName, std::vector<TH1*> Histograms) {
   auto OutputFile = std::unique_ptr<TFile>(TFile::Open(OutFileName.c_str(), "RECREATE"));
@@ -44,27 +44,27 @@ int main(int argc, char * argv[]) {
   auto fitMan = std::unique_ptr<manager>(new manager(argv[1]));
 
   //###############################################################################################################################
-  //Create samplePDFFD objects
+  //Create SampleHandlerFD objects
 
-  covarianceXsec* xsec = nullptr;
-  covarianceOsc* osc = nullptr;
+  ParameterHandlerGeneric* xsec = nullptr;
+  ParameterHandlerOsc* osc = nullptr;
 
-  std::vector<samplePDFFDBase*> DUNEPdfs;
+  std::vector<SampleHandlerFD*> DUNEPdfs;
   MakeMaCh3DuneInstance(fitMan.get(), DUNEPdfs, xsec, osc);
 
   //###############################################################################################################################
   //Perform reweight and print total integral
 
   std::vector<TH1*> DUNEHists;
   for(auto Sample : DUNEPdfs){
-    Sample->reweight();
+    Sample->Reweight();
     if (Sample->GetNDim() == 1)
-      DUNEHists.push_back(Sample->get1DHist());
+      DUNEHists.push_back(Sample->Get1DHist());
     else if (Sample->GetNDim() == 2)
-      DUNEHists.push_back(Sample->get2DHist());
+      DUNEHists.push_back(Sample->Get2DHist());
 
-    std::string EventRateString = fmt::format("{:.2f}", Sample->get1DHist()->Integral());
-    MACH3LOG_INFO("Event rate for {} : {:<5}", Sample->GetName(), EventRateString);
+    std::string EventRateString = fmt::format("{:.2f}", Sample->Get1DHist()->Integral());
+    MACH3LOG_INFO("Event rate for {} : {:<5}", Sample->GetTitle(), EventRateString);
 
     Sample->PrintIntegral();
   }
@@ -82,22 +82,22 @@ int main(int argc, char * argv[]) {
 
   for(auto Sample : DUNEPdfs) {
     MACH3LOG_INFO("======================");
-    int nOscChannels = Sample->getNMCSamples();
+    int nOscChannels = Sample->GetNMCSamples();
     for (int iOscChan=0;iOscChan<nOscChannels;iOscChan++) {
-      std::vector< std::vector<double> > SelectionVec;
+      std::vector< KinematicCut > SelectionVec;
 
-      std::vector<double> SelecChannel(3);
-      SelecChannel[0] = Sample->ReturnKinematicParameterFromString("OscillationChannel");
-      SelecChannel[1] = iOscChan;
-      SelecChannel[2] = iOscChan+1;
+      KinematicCut SelecChannel;
+      SelecChannel.ParamToCutOnIt = Sample->ReturnKinematicParameterFromString("OscillationChannel");
+      SelecChannel.LowerBound = iOscChan;
+      SelecChannel.UpperBound = iOscChan+1;
       SelectionVec.push_back(SelecChannel);
 
-      TH1* Hist = Sample->get1DVarHist(Sample->GetXBinVarName(),SelectionVec);
-      MACH3LOG_INFO("{:<20} : {:<20} : {:<20.2f}",Sample->GetName(),Sample->getFlavourName(iOscChan),Hist->Integral());
+      TH1* Hist = Sample->Get1DVarHist(Sample->GetXBinVarName(),SelectionVec);
+      MACH3LOG_INFO("{:<20} : {:<20} : {:<20.2f}",Sample->GetTitle(),Sample->GetFlavourName(iOscChan),Hist->Integral());
     }
 
-    TH1* Hist = Sample->get1DVarHist(Sample->GetXBinVarName());
-    MACH3LOG_INFO("{:<20} : {:<20.2f}",Sample->GetName(),Hist->Integral());
+    TH1* Hist = Sample->Get1DVarHist(Sample->GetXBinVarName());
+    MACH3LOG_INFO("{:<20} : {:<20.2f}",Sample->GetTitle(),Hist->Integral());
   }
 
   //###############################################################################################################################
@@ -113,20 +113,20 @@ int main(int argc, char * argv[]) {
     MaCh3Modes* Modes = Sample->GetMaCh3Modes();
     int nModeChannels = Modes->GetNModes();
     for (int iModeChan=0;iModeChan<nModeChannels;iModeChan++) {
-      std::vector< std::vector<double> > SelectionVec;
+      std::vector< KinematicCut > SelectionVec;
 
-      std::vector<double> SelecChannel(3);
-      SelecChannel[0] = Sample->ReturnKinematicParameterFromString("Mode");
-      SelecChannel[1] = iModeChan;
-      SelecChannel[2] = iModeChan+1;
+      KinematicCut SelecChannel;
+      SelecChannel.ParamToCutOnIt = Sample->ReturnKinematicParameterFromString("Mode");
+      SelecChannel.LowerBound = iModeChan;
+      SelecChannel.UpperBound = iModeChan+1;
       SelectionVec.push_back(SelecChannel);
 
-      TH1* Hist = Sample->get1DVarHist(Sample->GetXBinVarName(),SelectionVec);
-      MACH3LOG_INFO("{:<20} : {:<20} : {:<20.2f}",Sample->GetName(),Modes->GetMaCh3ModeName(iModeChan),Hist->Integral());
+      TH1* Hist = Sample->Get1DVarHist(Sample->GetXBinVarName(),SelectionVec);
+      MACH3LOG_INFO("{:<20} : {:<20} : {:<20.2f}",Sample->GetTitle(),Modes->GetMaCh3ModeName(iModeChan),Hist->Integral());
     }
 
-    TH1* Hist = Sample->get1DVarHist(Sample->GetXBinVarName());
-    MACH3LOG_INFO("{:<20} : {:<20.2f}",Sample->GetName(),Hist->Integral());
+    TH1* Hist = Sample->Get1DVarHist(Sample->GetXBinVarName());
+    MACH3LOG_INFO("{:<20} : {:<20.2f}",Sample->GetTitle(),Hist->Integral());
   }
 
   //###############################################################################################################################