Skip to content

Commit

Permalink
Remove old TODO: NWB comments
Browse files Browse the repository at this point in the history
These reflect past issues with JANA2, not EICrecon. They have been addressed there.
  • Loading branch information
nathanwbrei committed Sep 21, 2024
1 parent 0367bba commit 93f054b
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 9 deletions.
5 changes: 1 addition & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion src/extensions/jana/JOmniFactory.h
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,6 @@ class JOmniFactory : public JMultifactory {
std::vector<std::string> default_input_collection_names,
std::vector<std::string> 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.
Expand Down
3 changes: 0 additions & 3 deletions src/extensions/jana/JOmniFactoryGeneratorT.h
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,6 @@ class JOmniFactoryGeneratorT : public JFactoryGenerator {
factory->SetApplication(m_app);
factory->SetPluginName(this->GetPluginName());
factory->SetFactoryName(JTypeInfo::demangle<FactoryT>());
// 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
Expand Down
1 change: 0 additions & 1 deletion src/tests/omnifactory_test/JOmniFactoryTests.cc
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ struct BasicTestAlg : public JOmniFactory<BasicTestAlg, BasicTestAlgConfig> {
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<edm4hep::SimCalorimeterHitCollection>();
output_hits_right() = std::make_unique<edm4hep::SimCalorimeterHitCollection>();
output_vechits().push_back(new edm4hep::SimCalorimeterHit());
Expand Down

0 comments on commit 93f054b

Please sign in to comment.