From 93f054b23585092543c3f5c6f64f89dbd4e83de2 Mon Sep 17 00:00:00 2001 From: Nathan Brei Date: Fri, 20 Sep 2024 22:17:28 -0400 Subject: [PATCH] Remove old `TODO: NWB` comments These reflect past issues with JANA2, not EICrecon. They have been addressed there. --- CMakeLists.txt | 5 +---- src/extensions/jana/JOmniFactory.h | 1 - src/extensions/jana/JOmniFactoryGeneratorT.h | 3 --- src/tests/omnifactory_test/JOmniFactoryTests.cc | 1 - 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d67602baf..bbfa5d22b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -150,13 +150,10 @@ set(CMAKE_INSTALL_RPATH set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) # Check and print what JANA2 is used -find_package(JANA 2.0.8 REQUIRED) +find_package(JANA REQUIRED) message(STATUS "${CMAKE_PROJECT_NAME}: JANA2 CMake : ${JANA_DIR}") message(STATUS "${CMAKE_PROJECT_NAME}: JANA2 includes: ${JANA_INCLUDE_DIR}") message(STATUS "${CMAKE_PROJECT_NAME}: JANA2 library : ${JANA_LIBRARY}") -add_compile_definitions(HAVE_PODIO) -# TODO: NWB: Do this correctly in JANA via target_compile_definitions for v2.1.1 -# TODO: NWB: Maybe we want these to be prefixed, e.g. JANA2_HAVE_PODIO # Algorithms find_package(algorithms 1.0.0 REQUIRED Core) diff --git a/src/extensions/jana/JOmniFactory.h b/src/extensions/jana/JOmniFactory.h index ca018494da..873070d21b 100644 --- a/src/extensions/jana/JOmniFactory.h +++ b/src/extensions/jana/JOmniFactory.h @@ -473,7 +473,6 @@ class JOmniFactory : public JMultifactory { std::vector default_input_collection_names, std::vector default_output_collection_names ) { - // TODO: NWB: JMultiFactory::GetTag,SetTag are not currently usable m_prefix = (this->GetPluginName().empty()) ? tag : this->GetPluginName() + ":" + tag; // Obtain collection name overrides if provided. diff --git a/src/extensions/jana/JOmniFactoryGeneratorT.h b/src/extensions/jana/JOmniFactoryGeneratorT.h index 14ed7080b9..ff0ad25fe7 100644 --- a/src/extensions/jana/JOmniFactoryGeneratorT.h +++ b/src/extensions/jana/JOmniFactoryGeneratorT.h @@ -98,9 +98,6 @@ class JOmniFactoryGeneratorT : public JFactoryGenerator { factory->SetApplication(m_app); factory->SetPluginName(this->GetPluginName()); factory->SetFactoryName(JTypeInfo::demangle()); - // factory->SetTag(wiring.m_tag); - // We do NOT want to do this because JMF will use the tag to suffix the collection names - // TODO: NWB: Change this in JANA factory->config() = wiring.m_default_cfg; // Set up all of the wiring prereqs so that Init() can do its thing diff --git a/src/tests/omnifactory_test/JOmniFactoryTests.cc b/src/tests/omnifactory_test/JOmniFactoryTests.cc index 16a20d1c69..b9ca6b6b4e 100644 --- a/src/tests/omnifactory_test/JOmniFactoryTests.cc +++ b/src/tests/omnifactory_test/JOmniFactoryTests.cc @@ -56,7 +56,6 @@ struct BasicTestAlg : public JOmniFactory { m_process_call_count++; logger()->info("Calling BasicTestAlg::Process with bucket_count={}, threshold={}", config().bucket_count, config().threshold); // Provide empty collections (as opposed to nulls) so that PODIO doesn't crash - // TODO: NWB: I though multifactories already took care of this under the hood somewhere output_hits_left() = std::make_unique(); output_hits_right() = std::make_unique(); output_vechits().push_back(new edm4hep::SimCalorimeterHit());