From 56f094dad06183703c36f335d344e53c6b4522c9 Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Thu, 1 Apr 2021 20:37:08 +0200 Subject: [PATCH] slightly improved the rge handler. --- src/classes/CMakeLists.txt | 2 +- src/classes/PRgeHandler.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/classes/CMakeLists.txt b/src/classes/CMakeLists.txt index 2aba211a..eb822ebf 100644 --- a/src/classes/CMakeLists.txt +++ b/src/classes/CMakeLists.txt @@ -185,7 +185,7 @@ if (OpenMP_FOUND) endif (OpenMP_FOUND) target_link_libraries(PUserFcnBase ${ROOT_LIBRARIES}) -target_link_libraries(PRgeHandler ${ROOT_LIBRARIES}) +target_link_libraries(PRgeHandler ${Boost_LIBRARIES} ${ROOT_LIBRARIES}) target_link_libraries(PMusr ${DependOnLibs}) #--- install PUserFcnBase solib ----------------------------------------------- diff --git a/src/classes/PRgeHandler.cpp b/src/classes/PRgeHandler.cpp index 8c2e44bc..224746f3 100644 --- a/src/classes/PRgeHandler.cpp +++ b/src/classes/PRgeHandler.cpp @@ -536,10 +536,10 @@ Double_t PRgeHandler::Get_n(const Double_t energy, const Double_t z) break; } } - if (idx != -1) - return Get_n(idx, z); + if (idx == -1) + return 0.0; - return -1.0; + return Get_n(idx, z); } //-------------------------------------------------------------------------- @@ -555,7 +555,7 @@ Double_t PRgeHandler::Get_n(const Double_t energy, const Double_t z) Double_t PRgeHandler::Get_n(const Int_t idx, const Double_t z) { if ((idx < 0) || (idx >= fData.size())) - return -1.0; + return 0.0; if ((z < 0.0) || (z > GetZmax(idx))) return 0.0; @@ -570,7 +570,7 @@ Double_t PRgeHandler::Get_n(const Int_t idx, const Double_t z) Double_t nn=0.0; if (pos < 0) { - nn = 0.0; + nn = fData[idx].nn[0] * z/(fData[idx].depth[1]-fData[idx].depth[0]); } else { // linear interpolation nn = fData[idx].nn[pos] + (fData[idx].nn[pos+1] - fData[idx].nn[pos]) *