From 08b125e20a889785cbb77acf8ce03f0c73759d25 Mon Sep 17 00:00:00 2001 From: Javier Galan Date: Mon, 18 Mar 2024 12:16:53 +0100 Subject: [PATCH 1/2] TRestDetectorHitsEvent::Sort disabled for MacOs --- src/TRestDetectorHitsEvent.cxx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/TRestDetectorHitsEvent.cxx b/src/TRestDetectorHitsEvent.cxx index b9ed70bb..5e800739 100644 --- a/src/TRestDetectorHitsEvent.cxx +++ b/src/TRestDetectorHitsEvent.cxx @@ -137,6 +137,7 @@ void TRestDetectorHitsEvent::Initialize() { void TRestDetectorHitsEvent::Sort(bool(compareCondition)(const TRestHits::iterator& hit1, const TRestHits::iterator& hit2)) { +#ifndef __APPLE__ if (compareCondition == 0) { // default sort logic: z from smaller to greater std::sort(fHits->begin(), fHits->end(), @@ -146,6 +147,10 @@ void TRestDetectorHitsEvent::Sort(bool(compareCondition)(const TRestHits::iterat } else { std::sort(fHits->begin(), fHits->end(), compareCondition); } +#else + std::cout << "TRestDetectorHitsEvent::Sort is not implemented on MacOs!!" << std::endl; + std::cout << "This method implementation should be reviewed for proper operation in Mac" << std::endl; +#endif } void TRestDetectorHitsEvent::Shuffle(int NLoop) { From 2a39606a85fae60dde5b891374062c6548461cdf Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 11:19:54 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/TRestDetectorHitsEvent.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/TRestDetectorHitsEvent.cxx b/src/TRestDetectorHitsEvent.cxx index 5e800739..c2ddfa98 100644 --- a/src/TRestDetectorHitsEvent.cxx +++ b/src/TRestDetectorHitsEvent.cxx @@ -148,8 +148,8 @@ void TRestDetectorHitsEvent::Sort(bool(compareCondition)(const TRestHits::iterat std::sort(fHits->begin(), fHits->end(), compareCondition); } #else - std::cout << "TRestDetectorHitsEvent::Sort is not implemented on MacOs!!" << std::endl; - std::cout << "This method implementation should be reviewed for proper operation in Mac" << std::endl; + std::cout << "TRestDetectorHitsEvent::Sort is not implemented on MacOs!!" << std::endl; + std::cout << "This method implementation should be reviewed for proper operation in Mac" << std::endl; #endif }