Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update to newer podio versions #2606

Merged
merged 10 commits into from
Nov 22, 2023
Merged

chore: update to newer podio versions #2606

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
94f1dc5
core examples tests
asalzburger Jul 21, 2023
12b2824
python formatting
asalzburger Jul 21, 2023
9eeeb33
acessing index of podio::ObjectID directly
asalzburger Nov 1, 2023
708346f
not is !
asalzburger Nov 1, 2023
5b99d3b
Merge branch 'main' into chore-update-to-newer-podio
asalzburger Nov 1, 2023
4ad806c
Merge remote-tracking branch 'origin/main' into chore-update-to-newer…
paulgessinger Nov 21, 2023
7e6f3ce
bump minimum podio version
paulgessinger Nov 21, 2023
69865b1
Revert "bump minimum podio version"
paulgessinger Nov 21, 2023
309560d
add helper to unpack ID itself or index
paulgessinger Nov 21, 2023
2b0f0eb
Merge branch 'main' into chore-update-to-newer-podio
kodiakhq[bot] Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Examples/Io/EDM4hep/src/EDM4hepParticleReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ ProcessCode EDM4hepParticleReader::read(const AlgorithmContext& ctx) {
EDM4hepUtil::readParticle(mcParticle, [](const edm4hep::MCParticle& p) {
ActsFatras::Barcode result;
// TODO dont use podio internal id
result.setParticle(p.id());
result.setParticle(p.id().index);
return result;
});
unordered.push_back(particle);
Expand Down
4 changes: 2 additions & 2 deletions Examples/Io/EDM4hep/src/EDM4hepSimHitReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ ProcessCode EDM4hepSimHitReader::read(const AlgorithmContext& ctx) {
mcParticle, [](const edm4hep::MCParticle& p) {
ActsFatras::Barcode result;
// TODO dont use podio internal id
result.setParticle(p.id());
result.setParticle(p.id().index);
return result;
});
unordered.push_back(particle);
Expand All @@ -78,7 +78,7 @@ ProcessCode EDM4hepSimHitReader::read(const AlgorithmContext& ctx) {
[](const edm4hep::MCParticle& particle) {
ActsFatras::Barcode result;
// TODO dont use podio internal id
result.setParticle(particle.id());
result.setParticle(particle.id().index);
return result;
},
[&](std::uint64_t cellId) {
Expand Down
2 changes: 1 addition & 1 deletion Examples/Io/EDM4hep/src/EDM4hepUtil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ Measurement EDM4hepUtil::readMeasurement(
// no need for digitization as we only want to identify the sensor
Acts::GeometryIdentifier geometryId = geometryMapper(from.getCellID());

IndexSourceLink sourceLink{geometryId, from.id()};
IndexSourceLink sourceLink{geometryId, static_cast<Index>(from.id().index)};

auto pos = from.getPosition();
auto cov = from.getCovMatrix();
Expand Down
Loading