From 5ac9c8ba57d0f8a2cb3e7ef8d94c8dc872157e6b Mon Sep 17 00:00:00 2001 From: "Joachim Wuttke (l)" <j.wuttke@fz-juelich.de> Date: Fri, 27 Jan 2017 19:41:20 +0100 Subject: [PATCH] corr --- pub/lib/olf.cpp | 6 +++--- pub/lib/olf.hpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pub/lib/olf.cpp b/pub/lib/olf.cpp index 3197b88b..5400aa67 100644 --- a/pub/lib/olf.cpp +++ b/pub/lib/olf.cpp @@ -733,14 +733,14 @@ string COlc::weight_str() const //* namespace NOlo - service functions //************************************************************************************************** -int NOlo::j2j(const POlo fin, int jin, const POlo fout ) +int NOlo::j2j(const COlo* fin, int jin, const COlo* fout ) { - if (j >= fin->nJ()) + if (jin >= fin->nJ()) throw S("BUG: NOlo::j2j called with invalid j"); if (fout->nJ() == 1) // nJ:1 correspondence return 0; else if (fout->nJ() == fin->nJ()) // nJ:nJ correspondence - return j; + return jin; else throw S("Wrong file correspondence: number of spectra does not match"); } diff --git a/pub/lib/olf.hpp b/pub/lib/olf.hpp index ed2b24d9..e343cb38 100644 --- a/pub/lib/olf.hpp +++ b/pub/lib/olf.hpp @@ -168,7 +168,7 @@ public: //! Service functions for online objects. namespace NOlo { - int j2j(const POlo fin, int jin, const POlo fout ); + int j2j(const COlo* fin, int jin, const COlo* fout ); } // namespace NOlo -- GitLab