diff --git a/test/k4FWCoreTest/src/components/ExampleFunctionalConsumer.cpp b/test/k4FWCoreTest/src/components/ExampleFunctionalConsumer.cpp index a81fb702..511fabe0 100644 --- a/test/k4FWCoreTest/src/components/ExampleFunctionalConsumer.cpp +++ b/test/k4FWCoreTest/src/components/ExampleFunctionalConsumer.cpp @@ -51,7 +51,7 @@ struct ExampleFunctionalConsumer final : k4FWCore::Consumer 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()); } } diff --git a/test/k4FWCoreTest/src/components/ExampleFunctionalConsumerRuntimeCollections.cpp b/test/k4FWCoreTest/src/components/ExampleFunctionalConsumerRuntimeCollections.cpp index dd016eab..ea441f2d 100644 --- a/test/k4FWCoreTest/src/components/ExampleFunctionalConsumerRuntimeCollections.cpp +++ b/test/k4FWCoreTest/src/components/ExampleFunctionalConsumerRuntimeCollections.cpp @@ -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++; diff --git a/test/k4FWCoreTest/src/components/ExampleFunctionalConsumerRuntimeCollectionsMultiple.cpp b/test/k4FWCoreTest/src/components/ExampleFunctionalConsumerRuntimeCollectionsMultiple.cpp index 4695bd55..789135a8 100644 --- a/test/k4FWCoreTest/src/components/ExampleFunctionalConsumerRuntimeCollectionsMultiple.cpp +++ b/test/k4FWCoreTest/src/components/ExampleFunctionalConsumerRuntimeCollectionsMultiple.cpp @@ -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++; @@ -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()); } } diff --git a/test/k4FWCoreTest/src/components/ExampleFunctionalProducerMultiple.cpp b/test/k4FWCoreTest/src/components/ExampleFunctionalProducerMultiple.cpp index 62f56421..4c473f02 100644 --- a/test/k4FWCoreTest/src/components/ExampleFunctionalProducerMultiple.cpp +++ b/test/k4FWCoreTest/src/components/ExampleFunctionalProducerMultiple.cpp @@ -84,7 +84,6 @@ struct ExampleFunctionalProducerMultiple final : k4FWCore::Producer { track.setType(1); track.setChi2(2.1); track.setNdf(3); - track.setRadiusOfInnermostHit(6.1); track.addToSubdetectorHitNumbers(1); track.addToSubdetectorHitNumbers(4); track.addToTrackStates(edm4hep::TrackState()); diff --git a/test/k4FWCoreTest/src/components/ExampleFunctionalTransformerRuntimeCollectionsMultiple.cpp b/test/k4FWCoreTest/src/components/ExampleFunctionalTransformerRuntimeCollectionsMultiple.cpp index 3988bb5b..6afb8b42 100644 --- a/test/k4FWCoreTest/src/components/ExampleFunctionalTransformerRuntimeCollectionsMultiple.cpp +++ b/test/k4FWCoreTest/src/components/ExampleFunctionalTransformerRuntimeCollectionsMultiple.cpp @@ -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(); @@ -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()); } @@ -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()); @@ -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()); @@ -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()); diff --git a/test/k4FWCoreTest/src/components/k4FWCoreTest_CreateExampleEventData.cpp b/test/k4FWCoreTest/src/components/k4FWCoreTest_CreateExampleEventData.cpp index cb5757ab..54950bac 100644 --- a/test/k4FWCoreTest/src/components/k4FWCoreTest_CreateExampleEventData.cpp +++ b/test/k4FWCoreTest/src/components/k4FWCoreTest_CreateExampleEventData.cpp @@ -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);