Project Juggler merge requestshttps://eicweb.phy.anl.gov/EIC/juggler/-/merge_requests2024-03-03T19:26:40Zhttps://eicweb.phy.anl.gov/EIC/juggler/-/merge_requests/540fix: IGeoSvc::lcdd() pure virtual removed upstream2024-03-03T19:26:40ZWouter Deconinckfix: IGeoSvc::lcdd() pure virtual removed upstreamThis PR removes the explicit override since nothing to override. May need a diagnostic push pop to avoid error=suggest-inconsistent-override but we'll see.This PR removes the explicit override since nothing to override. May need a diagnostic push pop to avoid error=suggest-inconsistent-override but we'll see.Wouter DeconinckWouter Deconinckhttps://eicweb.phy.anl.gov/EIC/juggler/-/merge_requests/539fix: remove external algorithms; use only system algorithms install2024-02-03T22:33:51ZWouter Deconinckfix: remove external algorithms; use only system algorithms installTODO:
- [x] https://eicweb.phy.anl.gov/containers/eic_container/-/merge_requests/830TODO:
- [x] https://eicweb.phy.anl.gov/containers/eic_container/-/merge_requests/830Wouter DeconinckWouter Deconinckhttps://eicweb.phy.anl.gov/EIC/juggler/-/merge_requests/536fix: forward support edm4eic v52024-01-22T02:54:53ZWouter Deconinckfix: forward support edm4eic v5This applies the changes in https://github.com/eic/EICrecon/pull/1241 to juggler too...This applies the changes in https://github.com/eic/EICrecon/pull/1241 to juggler too...Wouter DeconinckWouter Deconinckhttps://eicweb.phy.anl.gov/EIC/juggler/-/merge_requests/535CalorimeterHitReco: fix for latest podio2023-12-25T19:32:43ZDmitry KalinkinCalorimeterHitReco: fix for latest podioIn file included from
JugReco/src/components/CalorimeterHitReco.cpp:29:
```
include/edm4eic/CalorimeterHitCollection.h:164:8:
note: candidate: 'void
edm4eic::CalorimeterHitCollection::push_back(edm4eic::MutableCalorimeterHit)'
164 | ...In file included from
JugReco/src/components/CalorimeterHitReco.cpp:29:
```
include/edm4eic/CalorimeterHitCollection.h:164:8:
note: candidate: 'void
edm4eic::CalorimeterHitCollection::push_back(edm4eic::MutableCalorimeterHit)'
164 | void push_back(MutableCalorimeterHit object);
| ^~~~~~~~~
include/edm4eic/CalorimeterHitCollection.h:166:8:
note: candidate: 'void
edm4eic::CalorimeterHitCollection::push_back(edm4eic::CalorimeterHit)'
166 | void push_back(CalorimeterHit object);
| ^~~~~~~~~
```https://eicweb.phy.anl.gov/EIC/juggler/-/merge_requests/534rm EICLegacyDataSvc: not available in latest k4FWCore2023-12-25T19:31:21ZDmitry Kalinkinrm EICLegacyDataSvc: not available in latest k4FWCorehttps://github.com/key4hep/k4FWCore/commit/2fba18c46c9ac2d6f76365c27c61d770a7ac90bbhttps://github.com/key4hep/k4FWCore/commit/2fba18c46c9ac2d6f76365c27c61d770a7ac90bbhttps://eicweb.phy.anl.gov/EIC/juggler/-/merge_requests/533fix: c++20 in GitHub action clang-tidy2023-12-24T19:47:16ZWouter Deconinckfix: c++20 in GitHub action clang-tidyWouter DeconinckWouter Deconinckhttps://eicweb.phy.anl.gov/EIC/juggler/-/merge_requests/532fix: add converter to CalorimeterHitReco.cpp2023-12-23T13:15:05ZWouter Deconinckfix: add converter to CalorimeterHitReco.cppWouter DeconinckWouter Deconinckhttps://eicweb.phy.anl.gov/EIC/juggler/-/merge_requests/531fix: restore GeoSvc since k4FWCore doesn't provide2023-12-22T18:35:26ZWouter Deconinckfix: restore GeoSvc since k4FWCore doesn't provideWouter DeconinckWouter Deconinckhttps://eicweb.phy.anl.gov/EIC/juggler/-/merge_requests/529feat: depend on k4FWCore2023-12-21T01:09:12ZWouter Deconinckfeat: depend on k4FWCoreUse the k4FWCore as upstream dependency. Remove stuff we have that they have.Use the k4FWCore as upstream dependency. Remove stuff we have that they have.Wouter DeconinckWouter Deconinckhttps://eicweb.phy.anl.gov/EIC/juggler/-/merge_requests/530fix: remove unused Acts headers2023-12-20T08:12:47ZWouter Deconinckfix: remove unused Acts headersThese headers were used once upon a time, maybe, but aren't anymore.These headers were used once upon a time, maybe, but aren't anymore.Wouter DeconinckWouter Deconinckhttps://eicweb.phy.anl.gov/EIC/juggler/-/merge_requests/528CachedBitGenerator: value_type -> result_type to fix for libcxx2023-12-19T20:40:40ZDmitry KalinkinCachedBitGenerator: value_type -> result_type to fix for libcxxhttps://reviews.llvm.org/D120630 introduced a __libcpp_random_is_valid_urng
check which requires return value to be in ::result_type (sidenote: that check
goes beyond enforcing
https://en.cppreference.com/w/cpp/numeric/random/uniform_ran...https://reviews.llvm.org/D120630 introduced a __libcpp_random_is_valid_urng
check which requires return value to be in ::result_type (sidenote: that check
goes beyond enforcing
https://en.cppreference.com/w/cpp/numeric/random/uniform_random_bit_generator).
Looking at an arbitrary generator in the standard library
https://en.cppreference.com/w/cpp/numeric/random/independent_bits_engine , it
also provides result_type, not value_type.
Same as https://github.com/eic/algorithms/pull/10Wouter DeconinckWouter Deconinckhttps://eicweb.phy.anl.gov/EIC/juggler/-/merge_requests/527fix: use C++20 in build and clang-tidy2023-11-29T21:08:36ZWouter Deconinckfix: use C++20 in build and clang-tidyWouter DeconinckWouter Deconinckhttps://eicweb.phy.anl.gov/EIC/juggler/-/merge_requests/526fix: avoid copy in structured binding in dummy.cpp testLogger2023-11-26T00:18:35ZWouter Deconinckfix: avoid copy in structured binding in dummy.cpp testLoggerAddresses C++20 warning/error.
```
make[2]: Entering directory '/home/wdconinc/git/algorithms/build'
[ 11%] Building CXX object core/CMakeFiles/algocore.dir/src/dummy.cpp.o
[ 22%] Building CXX object core/CMakeFiles/algocore.dir/src/geo....Addresses C++20 warning/error.
```
make[2]: Entering directory '/home/wdconinc/git/algorithms/build'
[ 11%] Building CXX object core/CMakeFiles/algocore.dir/src/dummy.cpp.o
[ 22%] Building CXX object core/CMakeFiles/algocore.dir/src/geo.cpp.o
[ 33%] Building CXX object core/CMakeFiles/algocore.dir/src/random.cpp.o
/home/wdconinc/git/algorithms/core/src/dummy.cpp: In constructor ‘testLogger::testLogger()’:
/home/wdconinc/git/algorithms/core/src/dummy.cpp:31:21: error: loop variable ‘<structured bindings>’ creates a copy from type ‘const std::pair<const std::basic_string_view<char>, algorithms::ServiceBase*>’ [-Werror=range-loop-construct]
31 | for (const auto [key, value] : ServiceSvc::instance().services()) {
| ^~~~~~~~~~~~
/home/wdconinc/git/algorithms/core/src/dummy.cpp:31:21: note: use reference type to prevent copying
31 | for (const auto [key, value] : ServiceSvc::instance().services()) {
| ^~~~~~~~~~~~
| &
cc1plus: all warnings being treated as errors
make[2]: *** [core/CMakeFiles/algocore.dir/build.make:76: core/CMakeFiles/algocore.dir/src/dummy.cpp.o] Error 1
make[2]: Leaving directory '/home/wdconinc/git/algorithms/build'
make[1]: *** [CMakeFiles/Makefile2:134: core/CMakeFiles/algocore.dir/all] Error 2
```Wouter DeconinckWouter Deconinckhttps://eicweb.phy.anl.gov/EIC/juggler/-/merge_requests/525JugTrack/CMakeLists.txt: respect CMAKE_SHARED_LIBRARY_{PREFIX,SUFFIX}2023-11-21T14:37:29ZDmitry KalinkinJugTrack/CMakeLists.txt: respect CMAKE_SHARED_LIBRARY_{PREFIX,SUFFIX}Fixes build on macOS
This is similar to https://github.com/eic/EICrecon/pull/1131Fixes build on macOS
This is similar to https://github.com/eic/EICrecon/pull/1131Dmitry KalinkinDmitry Kalinkinhttps://eicweb.phy.anl.gov/EIC/juggler/-/merge_requests/524fix: migration to Acts 30.3.22023-11-17T21:10:14ZWouter Deconinckfix: migration to Acts 30.3.2This adds support for Acts 30.3.2. Some attempt at making the commits logically separate.This adds support for Acts 30.3.2. Some attempt at making the commits logically separate.Wouter DeconinckWouter Deconinckhttps://eicweb.phy.anl.gov/EIC/juggler/-/merge_requests/523fix: remove deprecated algorithms2023-11-12T02:51:17ZWouter Deconinckfix: remove deprecated algorithmsThis removes long-deprecated algorithms which are verified not in use anymore in any
of the EIC/benchmarks repositories (last removed with [reconstruction_benchmarks!316][1]).
This also expose TrackingHitsCollector2 as TrackingHitsColle...This removes long-deprecated algorithms which are verified not in use anymore in any
of the EIC/benchmarks repositories (last removed with [reconstruction_benchmarks!316][1]).
This also expose TrackingHitsCollector2 as TrackingHitsCollector for name migration.
[1]: https://eicweb.phy.anl.gov/EIC/benchmarks/reconstruction_benchmarks/-/merge_requests/316).Wouter DeconinckWouter Deconinckhttps://eicweb.phy.anl.gov/EIC/juggler/-/merge_requests/522fix: mv id() to getObjectID().index because id() now returns ObjectID, not ui...2023-11-11T18:56:57ZWouter Deconinckfix: mv id() to getObjectID().index because id() now returns ObjectID, not uint_tSee https://github.com/AIDASoft/podio/pull/493See https://github.com/AIDASoft/podio/pull/493Wouter DeconinckWouter Deconinckhttps://eicweb.phy.anl.gov/EIC/juggler/-/merge_requests/521fix: move from edm4eic to edm4hep::utils vector_utils2023-11-11T02:18:00ZWouter Deconinckfix: move from edm4eic to edm4hep::utils vector_utilsWouter DeconinckWouter Deconinckhttps://eicweb.phy.anl.gov/EIC/juggler/-/merge_requests/519fix: remove (UN)LIKELY (gaudi!1227, gaudi!1307, v37.0 API change)2023-11-10T21:40:56ZWouter Deconinckfix: remove (UN)LIKELY (gaudi!1227, gaudi!1307, v37.0 API change)Needed for Gaudi v37r1 support.
Ref:
https://gitlab.cern.ch/gaudi/Gaudi/-/merge_requests/1227
https://gitlab.cern.ch/gaudi/Gaudi/-/merge_requests/1307Needed for Gaudi v37r1 support.
Ref:
https://gitlab.cern.ch/gaudi/Gaudi/-/merge_requests/1227
https://gitlab.cern.ch/gaudi/Gaudi/-/merge_requests/1307Wouter DeconinckWouter Deconinckhttps://eicweb.phy.anl.gov/EIC/juggler/-/merge_requests/520feat: include GaudiAlg/GaudiAlgorithm.h for GaudiAlgorithm2023-11-10T21:40:19ZWouter Deconinckfeat: include GaudiAlg/GaudiAlgorithm.h for GaudiAlgorithmPer https://gitlab.cern.ch/gaudi/Gaudi/-/merge_requests/1444 we now have optional GaudiAlg (which we use), but we need to include the correct header since we don't *accidentally* pick it up anymore.Per https://gitlab.cern.ch/gaudi/Gaudi/-/merge_requests/1444 we now have optional GaudiAlg (which we use), but we need to include the correct header since we don't *accidentally* pick it up anymore.Wouter DeconinckWouter Deconinck