From 381c76fbf90269f92b60742f0155c4bd933911ef Mon Sep 17 00:00:00 2001 From: Nathan Brei Date: Thu, 2 May 2024 00:35:20 -0400 Subject: [PATCH] TimesliceExample finally runs on Podio v0.99 --- .github/workflows/ccpp-docker.yml | 6 ++++-- src/examples/TimesliceExample/MyTimesliceSplitter.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ccpp-docker.yml b/.github/workflows/ccpp-docker.yml index 204d7a572..09d7cf131 100644 --- a/.github/workflows/ccpp-docker.yml +++ b/.github/workflows/ccpp-docker.yml @@ -7,8 +7,8 @@ on: branches: [ master ] jobs: - build: - name: Build JANA2 with all options enabled + jana2_env_everything_except_cuda: + name: Build JANA2 with all dependencies except CUDA runs-on: ubuntu-latest container: image: nbrei/jana2_env_everything_except_cuda @@ -52,11 +52,13 @@ jobs: run: | echo "--- Running TimesliceExample with simple topology ------------------------------" export JANA_PLUGIN_PATH=$GITHUB_WORKSPACE/Linux/plugins + export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/Linux/lib:/app/podio/install/lib:$LD_LIBRARY_PATH $GITHUB_WORKSPACE/Linux/bin/jana -Pplugins=TimesliceExample -Pjana:nevents=100 events.root - name: TimesliceExample with complex (timeslice) topology run: | echo "--- Running TimesliceExample with complex topology ------------------------------" export JANA_PLUGIN_PATH=$GITHUB_WORKSPACE/Linux/plugins + export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/Linux/lib:/app/podio/install/lib:$LD_LIBRARY_PATH $GITHUB_WORKSPACE/Linux/bin/jana -Pplugins=TimesliceExample -Pjana:nevents=100 timeslices.root diff --git a/src/examples/TimesliceExample/MyTimesliceSplitter.h b/src/examples/TimesliceExample/MyTimesliceSplitter.h index ac4249334..96b658a9f 100644 --- a/src/examples/TimesliceExample/MyTimesliceSplitter.h +++ b/src/examples/TimesliceExample/MyTimesliceSplitter.h @@ -36,7 +36,7 @@ struct MyTimesliceSplitter : public JEventUnfolder { event_clusters_out->push_back(m_timeslice_clusters_in()->at(child_idx)); auto event_info_out = std::make_unique(); - event_info_out->push_back(EventInfo(event_nr, timeslice_nr, 0)); + event_info_out->push_back(MutableEventInfo(event_nr, timeslice_nr, 0)); LOG_DEBUG(GetLogger()) << "MyTimesliceSplitter: Timeslice " << parent.GetEventNumber() << ", Event " << child.GetEventNumber()