Merge pull request #30 from dbarrow257/feature_GPUtest

Minor GPU fixes
dbarrow257 · Sep 25, 2024 · afc5422 · afc5422
2 parents bf0dde2 + 1c2278a
commit afc5422
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Configs/Binned_CUDAProb3.yaml b/Configs/Binned_CUDAProb3.yaml
@@ -4,7 +4,7 @@ General:
   CalculationType: "Binned"
 
 OscProbCalcer:
-  - Config: "CUDAProb3:/exp/uboone/app/users/barrow/NuOscillator/build/Linux/Configs/OscProbCalcerConfigs/CUDAProb3.yaml"
+  - Config: "CUDAProb3:./build/Linux/Configs/OscProbCalcerConfigs/CUDAProb3.yaml"
 
 Binned:
   FileName: "./Inputs/ExampleAtmosphericBinning.root"

diff --git a/Configs/OscProbCalcerConfigs/CUDAProb3.yaml b/Configs/OscProbCalcerConfigs/CUDAProb3.yaml
@@ -3,7 +3,7 @@ General:
 
 OscProbCalcerSetup:
   - CUDAProb3:
-    EarthModelFileName: "/exp/uboone/app/users/barrow/NuOscillator/build/_deps/cudaprob3-src/models/PREM_4layer.dat"
+    EarthModelFileName: "build/_deps/cudaprob3-src/models/PREM_4layer.dat"
     OscChannelMapping:
       - Entry: "Electron:Electron"
       - Entry: "Electron:Muon"

diff --git a/OscProbCalcer/OscProbCalcer_CUDAProb3.cpp b/OscProbCalcer/OscProbCalcer_CUDAProb3.cpp
@@ -82,7 +82,7 @@ void OscProbCalcerCUDAProb3::SetupPropagator() {
   if (fVerbose >= INFO) {std::cout << "Setup CUDAProb3 oscillation probability calculater" << std::endl;}
 }
 
-void OscProbCalcerCUDAProb3::CalculateProbabilities(std::vector<FLOAT_T> OscParams) {
+void OscProbCalcerCUDAProb3::CalculateProbabilities(const std::vector<FLOAT_T>& OscParams) {
   // Oscpars, as given from MaCh3, expresses the mixing angles in sin^2(theta). This propagator expects them in theta
   for (int iOscPar=0;iOscPar<=kTH13;iOscPar++) {
     if (OscParams[iOscPar] < 0) {

diff --git a/OscProbCalcer/OscProbCalcer_CUDAProb3.h b/OscProbCalcer/OscProbCalcer_CUDAProb3.h
@@ -53,7 +53,7 @@ class OscProbCalcerCUDAProb3 : public OscProbCalcerBase {
    *
    * @param OscParams The parameter set to calculate oscillation probabilities at
    */
-  void CalculateProbabilities(std::vector<FLOAT_T> OscParams) override;
+  void CalculateProbabilities(const std::vector<FLOAT_T>& OscParams) override;
 
   /**
    * @brief Return implementation specific index in the weight array for a specific combination of neutrino oscillation channel, energy and cosine zenith