Skip to content

Commit

Permalink
Don't use radiusOfInnermostHit from EDM4hep tracks (key4hep#202)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmcarcell
jmcarcell authored Jun 24, 2024
1 parent a6a1fd0 commit f56bdd9
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 23 deletions.
2 changes: 1 addition & 1 deletion test/k4FWCoreTest/src/components/ExampleFunctionalConsumer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ struct ExampleFunctionalConsumer final : k4FWCore::Consumer<void(const edm4hep::
<< ", " << 3 + i + m_offset << ", " << 4 + i + m_offset << ", " << 5 + i + m_offset << ", "
<< 6 + i + m_offset << " got " << particle.getPDG() << ", " << particle.getGeneratorStatus() << ", "
<< particle.getSimulatorStatus() << ", " << particle.getCharge() << ", " << particle.getTime() << ", "
<< particle.getMass() << "";
<< particle.getMass();
throw std::runtime_error(error.str());
}
i++;
Expand Down
13 changes: 6 additions & 7 deletions test/k4FWCoreTest/src/components/ExampleFunctionalConsumerMultiple.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ struct ExampleFunctionalConsumerMultiple final
if ((floatVector[0] != 125) || (floatVector[1] != 25) || (floatVector[2] != 0)) {
std::stringstream error;
error << "Wrong data in floatVector collection, expected 125, 25, " << 0 << " got " << floatVector[0] << ", "
<< floatVector[1] << ", " << floatVector[2] << "";
<< floatVector[1] << ", " << floatVector[2];
throw std::runtime_error(error.str());
}

Expand All @@ -79,7 +79,7 @@ struct ExampleFunctionalConsumerMultiple final
<< ", " << 3 + i + m_offset << ", " << 4 + i + m_offset << ", " << 5 + i + m_offset << ", "
<< 6 + i + m_offset << " got " << particle.getPDG() << ", " << particle.getGeneratorStatus() << ", "
<< particle.getSimulatorStatus() << ", " << particle.getCharge() << ", " << particle.getTime() << ", "
<< particle.getMass() << "";
<< particle.getMass();
throw std::runtime_error(error.str());
}
i++;
Expand All @@ -89,23 +89,22 @@ struct ExampleFunctionalConsumerMultiple final
(simTrackerHits[0].getPosition()[2] != 5)) {
std::stringstream error;
error << "Wrong data in simTrackerHits collection, expected 3, 4, 5 got " << simTrackerHits[0].getPosition()[0]
<< ", " << simTrackerHits[0].getPosition()[1] << ", " << simTrackerHits[0].getPosition()[2] << "";
<< ", " << simTrackerHits[0].getPosition()[1] << ", " << simTrackerHits[0].getPosition()[2];
throw std::runtime_error(error.str());
}

if ((trackerHits[0].getPosition()[0] != 3) || (trackerHits[0].getPosition()[1] != 4) ||
(trackerHits[0].getPosition()[2] != 5)) {
std::stringstream error;
error << "Wrong data in trackerHits collection, expected 3, 4, 5 got " << trackerHits[0].getPosition()[0] << ", "
<< trackerHits[0].getPosition()[1] << ", " << trackerHits[0].getPosition()[2] << "";
<< trackerHits[0].getPosition()[1] << ", " << trackerHits[0].getPosition()[2];
throw std::runtime_error(error.str());
}

if ((tracks[0].getType() != 1) || (std::abs(tracks[0].getChi2() - 2.1) > 1e-6) || (tracks[0].getNdf() != 3) ||
(std::abs(tracks[0].getRadiusOfInnermostHit() - 6.1) > 1e-6)) {
if ((tracks[0].getType() != 1) || (std::abs(tracks[0].getChi2() - 2.1) > 1e-6) || (tracks[0].getNdf() != 3)) {
std::stringstream error;
error << "Wrong data in tracks collection, expected 1, 2.1, 3, 4.1, 5.1, 6.1 got " << tracks[0].getType() << ", "
<< tracks[0].getChi2() << ", " << tracks[0].getNdf() << ", " << tracks[0].getRadiusOfInnermostHit() << "";
<< tracks[0].getChi2() << ", " << tracks[0].getNdf();
throw std::runtime_error(error.str());
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/k4FWCoreTest/src/components/ExampleFunctionalConsumerRuntimeCollections.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ struct ExampleFunctionalConsumerRuntimeCollections final
<< ", " << 3 + i + m_offset << ", " << 4 + i + m_offset << ", " << 5 + i + m_offset << ", "
<< 6 + i + m_offset << " got " << particle.getPDG() << ", " << particle.getGeneratorStatus() << ", "
<< particle.getSimulatorStatus() << ", " << particle.getCharge() << ", " << particle.getTime() << ", "
<< particle.getMass() << "";
<< particle.getMass();
throw std::runtime_error(error.str());
}
i++;
Expand Down
8 changes: 3 additions & 5 deletions test/k4FWCoreTest/src/components/ExampleFunctionalConsumerRuntimeCollectionsMultiple.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ struct ExampleFunctionalConsumerRuntimeCollectionsMultiple final
<< ", " << 3 + i + m_offset << ", " << 4 + i + m_offset << ", " << 5 + i + m_offset << ", "
<< 6 + i + m_offset << " got " << particle.getPDG() << ", " << particle.getGeneratorStatus() << ", "
<< particle.getSimulatorStatus() << ", " << particle.getCharge() << ", " << particle.getTime() << ", "
<< particle.getMass() << "";
<< particle.getMass();
throw std::runtime_error(error.str());
}
i++;
Expand All @@ -70,12 +70,10 @@ struct ExampleFunctionalConsumerRuntimeCollectionsMultiple final
fatal() << "Wrong size of the tracks map, expected 3, got " << trackMap.size() << endmsg;
}
for (auto& [key, tracks] : trackMap) {
if ((tracks[0].getType() != 1) || (std::abs(tracks[0].getChi2() - 2.1) > 1e-6) || (tracks[0].getNdf() != 3) ||
(std::abs(tracks[0].getRadiusOfInnermostHit() - 6.1) > 1e-6)) {
if ((tracks[0].getType() != 1) || (std::abs(tracks[0].getChi2() - 2.1) > 1e-6) || (tracks[0].getNdf() != 3)) {
std::stringstream error;
error << "Wrong data in tracks collection, expected 1, 2.1, 3, 4.1, 5.1, 6.1 got " << tracks[0].getType()
<< ", " << tracks[0].getChi2() << ", " << tracks[0].getNdf() << ", "
<< tracks[0].getRadiusOfInnermostHit() << "";
<< ", " << tracks[0].getChi2() << ", " << tracks[0].getNdf();
throw std::runtime_error(error.str());
}
}
Expand Down
1 change: 0 additions & 1 deletion test/k4FWCoreTest/src/components/ExampleFunctionalProducerMultiple.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ struct ExampleFunctionalProducerMultiple final : k4FWCore::Producer<retType()> {
track.setType(1);
track.setChi2(2.1);
track.setNdf(3);
track.setRadiusOfInnermostHit(6.1);
track.addToSubdetectorHitNumbers(1);
track.addToSubdetectorHitNumbers(4);
track.addToTrackStates(edm4hep::TrackState());
Expand Down
13 changes: 6 additions & 7 deletions test/k4FWCoreTest/src/components/ExampleFunctionalTransformerRuntimeCollectionsMultiple.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ struct ExampleFunctionalTransformerRuntimeCollectionsMultiple final
if ((floatVector.vec()[0] != 125) || (floatVector.vec()[1] != 25) || (floatVector.vec()[2] != 0)) {
std::stringstream error;
error << "Wrong data in floatVector collection, expected 125, 25, " << 0 << " got " << floatVector.vec()[0]
<< ", " << floatVector.vec()[1] << ", " << floatVector.vec()[2] << "";
<< ", " << floatVector.vec()[1] << ", " << floatVector.vec()[2];
throw std::runtime_error(error.str());
}
auto coll = podio::UserDataCollection<float>();
Expand All @@ -117,7 +117,7 @@ struct ExampleFunctionalTransformerRuntimeCollectionsMultiple final
<< ", " << 3 + i + m_offset << ", " << 4 + i + m_offset << ", " << 5 + i + m_offset << ", "
<< 6 + i + m_offset << " got " << particle.getPDG() << ", " << particle.getGeneratorStatus() << ", "
<< particle.getSimulatorStatus() << ", " << particle.getCharge() << ", " << particle.getTime() << ", "
<< particle.getMass() << "";
<< particle.getMass();
throw std::runtime_error(error.str());
coll.push_back(particle.clone());
}
Expand All @@ -138,7 +138,7 @@ struct ExampleFunctionalTransformerRuntimeCollectionsMultiple final
std::stringstream error;
error << "Wrong data in simTrackerHits collection, expected 3, 4, 5 got "
<< simTrackerHits.at(0).getPosition()[0] << ", " << simTrackerHits.at(0).getPosition()[1] << ", "
<< simTrackerHits.at(0).getPosition()[2] << "";
<< simTrackerHits.at(0).getPosition()[2];
throw std::runtime_error(error.str());
}
coll.push_back(simTrackerHits.at(0).clone());
Expand All @@ -156,7 +156,7 @@ struct ExampleFunctionalTransformerRuntimeCollectionsMultiple final
(trackerHits.at(0).getPosition()[2] != 5)) {
std::stringstream error;
error << "Wrong data in trackerHits collection, expected 3, 4, 5 got " << trackerHits.at(0).getPosition()[0]
<< ", " << trackerHits.at(0).getPosition()[1] << ", " << trackerHits.at(0).getPosition()[2] << "";
<< ", " << trackerHits.at(0).getPosition()[1] << ", " << trackerHits.at(0).getPosition()[2];
throw std::runtime_error(error.str());
}
coll.push_back(trackerHits.at(0).clone());
Expand All @@ -171,11 +171,10 @@ struct ExampleFunctionalTransformerRuntimeCollectionsMultiple final
for (auto& [key, tracks] : trackMap) {
auto coll = edm4hep::TrackCollection();
if ((tracks.at(0).getType() != 1) || (std::abs(tracks.at(0).getChi2() - 2.1) > 1e-6) ||
(tracks.at(0).getNdf() != 3) || (std::abs(tracks.at(0).getRadiusOfInnermostHit() - 6.1) > 1e-6)) {
(tracks.at(0).getNdf() != 3)) {
std::stringstream error;
error << "Wrong data in tracks collection, expected 1, 2.1, 3, 4.1, 5.1, 6.1 got " << tracks.at(0).getType()
<< ", " << tracks.at(0).getChi2() << ", " << tracks.at(0).getNdf() << ", "
<< tracks.at(0).getRadiusOfInnermostHit() << "";
<< ", " << tracks.at(0).getChi2() << ", " << tracks.at(0).getNdf();
throw std::runtime_error(error.str());
}
coll->push_back(tracks.at(0).clone());
Expand Down
1 change: 0 additions & 1 deletion test/k4FWCoreTest/src/components/k4FWCoreTest_CreateExampleEventData.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ StatusCode k4FWCoreTest_CreateExampleEventData::execute(const EventContext&) con
track.setType(1);
track.setChi2(2.1);
track.setNdf(3);
track.setRadiusOfInnermostHit(6.1);
// set vectormembers
#if EDM4HEP_BUILD_VERSION > EDM4HEP_VERSION(0, 9, 0)
track.addToSubdetectorHitNumbers(1);
Expand Down

0 comments on commit f56bdd9

Please sign in to comment.