diff --git a/src/kbmod/search/stack_search.cpp b/src/kbmod/search/stack_search.cpp index 71163726..0123b9dc 100644 --- a/src/kbmod/search/stack_search.cpp +++ b/src/kbmod/search/stack_search.cpp @@ -237,7 +237,7 @@ uint64_t StackSearch::compute_max_results() { return num_search_pixels * params.results_per_pixel; } -std::vector StackSearch::extract_psi_or_phi_curve(Trajectory& trj, bool extract_psi) { +std::vector StackSearch::extract_psi_or_phi_curve(const Trajectory& trj, bool extract_psi) { prepare_psi_phi(); const unsigned int num_times = stack.img_count(); @@ -256,27 +256,27 @@ std::vector StackSearch::extract_psi_or_phi_curve(Trajectory& trj, bool e return result; } -std::vector > StackSearch::get_psi_curves(std::vector& trajectories) { +std::vector > StackSearch::get_psi_curves(const std::vector& trajectories) { std::vector > all_results; - for (auto& trj : trajectories) { + for (const auto& trj : trajectories) { all_results.push_back(extract_psi_or_phi_curve(trj, true)); } return all_results; } -std::vector StackSearch::get_psi_curves(Trajectory& trj) { +std::vector StackSearch::get_psi_curves(const Trajectory& trj) { return extract_psi_or_phi_curve(trj, true); } -std::vector > StackSearch::get_phi_curves(std::vector& trajectories) { +std::vector > StackSearch::get_phi_curves(const std::vector& trajectories) { std::vector > all_results; - for (auto& trj : trajectories) { + for (const auto& trj : trajectories) { all_results.push_back(extract_psi_or_phi_curve(trj, false)); } return all_results; } -std::vector StackSearch::get_phi_curves(Trajectory& trj) { +std::vector StackSearch::get_phi_curves(const Trajectory& trj) { return extract_psi_or_phi_curve(trj, false); } @@ -322,14 +322,14 @@ static void stack_search_bindings(py::module& m) { .def("get_imagestack", &ks::get_imagestack, py::return_value_policy::reference_internal, pydocs::DOC_StackSearch_get_imagestack) // For testings - .def("get_psi_curves", (std::vector(ks::*)(tj&)) & ks::get_psi_curves, + .def("get_psi_curves", (std::vector(ks::*)(const tj&)) & ks::get_psi_curves, pydocs::DOC_StackSearch_get_psi_curves) - .def("get_phi_curves", (std::vector(ks::*)(tj&)) & ks::get_phi_curves, + .def("get_phi_curves", (std::vector(ks::*)(const tj&)) & ks::get_phi_curves, pydocs::DOC_StackSearch_get_phi_curves) .def("get_psi_curves", - (std::vector >(ks::*)(std::vector&)) & ks::get_psi_curves) + (std::vector >(ks::*)(const std::vector&)) & ks::get_psi_curves) .def("get_phi_curves", - (std::vector >(ks::*)(std::vector&)) & ks::get_phi_curves) + (std::vector >(ks::*)(const std::vector&)) & ks::get_phi_curves) .def("prepare_psi_phi", &ks::prepare_psi_phi, pydocs::DOC_StackSearch_prepare_psi_phi) .def("clear_psi_phi", &ks::clear_psi_phi, pydocs::DOC_StackSearch_clear_psi_phi) .def("get_number_total_results", &ks::get_number_total_results, diff --git a/src/kbmod/search/stack_search.h b/src/kbmod/search/stack_search.h index 6e00b8c2..7a629bea 100644 --- a/src/kbmod/search/stack_search.h +++ b/src/kbmod/search/stack_search.h @@ -60,10 +60,10 @@ class StackSearch { std::vector get_results(uint64_t start, uint64_t count); // Getters for the Psi and Phi data. - std::vector get_psi_curves(Trajectory& t); - std::vector get_phi_curves(Trajectory& t); - std::vector > get_psi_curves(std::vector& trajectories); - std::vector > get_phi_curves(std::vector& trajectories); + std::vector get_psi_curves(const Trajectory& t); + std::vector get_phi_curves(const Trajectory& t); + std::vector > get_psi_curves(const std::vector& trajectories); + std::vector > get_phi_curves(const std::vector& trajectories); // Helper functions for computing Psi and Phi void prepare_psi_phi(); @@ -75,7 +75,7 @@ class StackSearch { virtual ~StackSearch(){}; protected: - std::vector extract_psi_or_phi_curve(Trajectory& trj, bool extract_psi); + std::vector extract_psi_or_phi_curve(const Trajectory& trj, bool extract_psi); // Core data and search parameters. Note the StackSearch does not own // the ImageStack and it must exist for the duration of the object's life.