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

refactor: Modified from_json in AmbiguityConfigJson for easier implementation in Athena #3628

Merged
merged 9 commits into from
Sep 19, 2024
Merged

refactor: Modified from_json in AmbiguityConfigJson for easier implementation in Athena #3628

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a02cf08
changes for messages
Ragansu Aug 19, 2024
1b347d5
Merge remote-tracking branch 'upstream/main'
Ragansu Sep 6, 2024
46398c9
Merge remote-tracking branch 'upstream/main' into main
Ragansu Sep 18, 2024
81c390a
update ERROR to DEBUG
Ragansu Sep 18, 2024
8946da1
fixing formating issue
Ragansu Sep 19, 2024
95417de
Update Plugins/Json/src/AmbiguityConfigJsonConverter.cpp
Ragansu Sep 19, 2024
186aadd
change copy to const reference
Ragansu Sep 19, 2024
f1fe868
INFO to VERBOSE
Ragansu Sep 19, 2024
cf04825
Merge branch 'main' into refactor-from-json
kodiakhq[bot] Sep 19, 2024
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 Core/include/Acts/AmbiguityResolution/ScoreBasedAmbiguityResolution.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ ScoreBasedAmbiguityResolution::computeInitialState(

for (const auto& ts : track.trackStatesReversed()) {
if (!ts.hasReferenceSurface()) {
ACTS_ERROR("Track state has no reference surface");
ACTS_DEBUG("Track state has no reference surface");
continue;
}
auto iVolume = ts.referenceSurface().geometryId().volume();
Expand Down
2 changes: 1 addition & 1 deletion Core/src/AmbiguityResolution/ScoreBasedAmbiguityResolution.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ std::vector<bool> Acts::ScoreBasedAmbiguityResolution::getCleanedOutTracks(
const {
std::vector<bool> cleanTracks(measurementsPerTrack.size(), false);

ACTS_VERBOSE("Cleaning tracks");
ACTS_INFO("Cleaning tracks");
Ragansu marked this conversation as resolved.
Show resolved Hide resolved

if (trackScore.size() != measurementsPerTrack.size()) {
throw std::invalid_argument(
Expand Down
23 changes: 17 additions & 6 deletions Plugins/Json/src/AmbiguityConfigJsonConverter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,26 @@ void from_json(const nlohmann::json& j, ConfigPair& p) {

detectorConfig.sharedHitsFlag = value["sharedHitsFlag"];

std::vector<double> factorHits = value["factorHits"];
std::vector<double> factorHoles = value["factorHoles"];
std::vector<double> goodHits = value["goodHits"];
std::vector<double> goodHoles = value["goodHoles"];
Ragansu marked this conversation as resolved.
Show resolved Hide resolved

for (auto factor : factorHits) {
detectorConfig.factorHits.push_back(factor);
std::vector<double> fakeHits = value["fakeHits"];
std::vector<double> fakeHoles = value["fakeHoles"];
CarloVarni marked this conversation as resolved.
Show resolved Hide resolved
Ragansu marked this conversation as resolved.
Show resolved Hide resolved

if (goodHits.size() != fakeHits.size()) {
throw std::invalid_argument("goodHits and FakeHits size mismatch");
}

for (std::size_t i = 0; i < goodHits.size(); i++) {
detectorConfig.factorHits.push_back(goodHits[i] / fakeHits[i]);
}

if (goodHoles.size() != fakeHoles.size()) {
throw std::invalid_argument("goodHoles and FakeHoles size mismatch");
}

for (auto factor : factorHoles) {
detectorConfig.factorHoles.push_back(factor);
for (std::size_t i = 0; i < goodHoles.size(); i++) {
detectorConfig.factorHoles.push_back(goodHoles[i] / fakeHoles[i]);
}

detectorConfigs.push_back(detectorConfig);
Expand Down
Loading