Skip to content

[Common,PWGCF,PWGDQ,PWGEM,PWGHF,PWGJE,PWGLF,PWGUD,Trigger] Move Zorro into Common/Core #13761

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

Merged
mpuccio merged 1 commit into from
Nov 11, 2025
Merged

[Common,PWGCF,PWGDQ,PWGEM,PWGHF,PWGJE,PWGLF,PWGUD,Trigger] Move Zorro into Common/Core #13761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions Common/Core/AnalysisCoreLinkDef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#pragma link C++ class TrackSelection + ;

#pragma link C++ class o2::pid::Parameters + ;
#pragma link C++ class o2::pid::PidParameters < 5> + ;

Check failure on line 22 in Common/Core/AnalysisCoreLinkDef.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
#pragma link C++ class o2::pid::Parametrization + ;

#pragma link C++ class o2::pid::tpc::Response + ;
Expand All @@ -28,4 +28,8 @@

#pragma link C++ class FFitWeights + ;

#pragma link C++ class ZorroHelper + ;
#pragma link C++ class ZorroSummary + ;
#pragma link C++ class std::vector < ZorroHelper> + ;

#endif // COMMON_CORE_ANALYSISCORELINKDEF_H_
5 changes: 5 additions & 0 deletions Common/Core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ o2physics_add_library(AnalysisCore
MetadataHelper.cxx
CollisionTypeHelper.cxx
FFitWeights.cxx
Zorro.cxx
ZorroSummary.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2::DataFormatsParameters ROOT::EG O2::CCDB ROOT::Physics O2::FT0Base O2::FV0Base O2::DataFormatsParamTOF)

o2physics_target_root_dictionary(AnalysisCore
Expand All @@ -38,6 +40,9 @@ o2physics_target_root_dictionary(AnalysisCore
PID/PIDTOFParamService.h
CollisionTypeHelper.h
FFitWeights.h
Zorro.h
ZorroHelper.h
ZorroSummary.h
LINKDEF AnalysisCoreLinkDef.h)

o2physics_add_header_only_library(TPCDriftManager
Expand Down
2 changes: 1 addition & 1 deletion EventFiltering/Zorro.cxx → Common/Core/Zorro.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#include "Zorro.h"

#include "EventFiltering/ZorroHelper.h"
#include "Common/Core/ZorroHelper.h"

#include <CCDB/BasicCCDBManager.h>
#include <CommonConstants/LHCConstants.h>
Expand Down Expand Up @@ -232,8 +232,8 @@
mLastBCglobalId = bcGlobalId;
for (size_t i = mLastSelectedIdx; i < mBCranges.size(); i++) {
if (!mBCranges[i].isOutside(bcFrame)) {
for (int iMask{0}; iMask < 2; ++iMask) {

Check failure on line 235 in Common/Core/Zorro.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
for (int iTOI{0}; iTOI < 64; ++iTOI) {

Check failure on line 236 in Common/Core/Zorro.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
if (mZorroHelpers->at(i).selMask[iMask] & (1ull << iTOI)) {
mLastResult.set(iMask * 64 + iTOI, 1);
if (!mAccountedBCranges[i]) {
Expand Down
0 EventFiltering/Zorro.h → Common/Core/Zorro.h
View file
Open in desktop
File renamed without changes.
0 EventFiltering/ZorroHelper.h → Common/Core/ZorroHelper.h
View file
Open in desktop
File renamed without changes.
0 EventFiltering/ZorroSummary.cxx → Common/Core/ZorroSummary.cxx
View file
Open in desktop
File renamed without changes.
0 EventFiltering/ZorroSummary.h → Common/Core/ZorroSummary.h
View file
Open in desktop
File renamed without changes.
9 changes: 0 additions & 9 deletions EventFiltering/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
# granted to it by virtue of its status as an Intergovernmental Organization
# or submit itself to any jurisdiction.

o2physics_add_dpl_workflow(central-event-filter-task

Check failure on line 12 in EventFiltering/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name central-event-filter-task does not match its file name cefpTask.cxx. (Matches centralEventFilterTask.cxx.)
SOURCES cefpTask.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DataFormatsCTP
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(selected-bc-range-task

Check failure on line 17 in EventFiltering/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name selected-bc-range-task does not match its file name selectBCRange.cxx. (Matches selectedBcRangeTask.cxx.)
SOURCES selectBCRange.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
COMPONENT_NAME Analysis)
Expand All @@ -29,7 +29,7 @@
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::DGCutparHolder
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(diffraction-bcfilter

Check failure on line 32 in EventFiltering/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name diffraction-bcfilter does not match its file name diffractionBCFilter.cxx. (Matches diffractionBcfilter.cxx.)
SOURCES PWGUD/diffractionBCFilter.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::DGCutparHolder
COMPONENT_NAME Analysis)
Expand All @@ -37,17 +37,17 @@
o2physics_add_header_only_library(HFFilterHelpers
HEADERS PWGHF/HFFilterHelpers.h)

o2physics_add_dpl_workflow(hf-filter

Check failure on line 40 in EventFiltering/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name hf-filter does not match its file name HFFilter.cxx. (Matches hfFilter.cxx.)
SOURCES PWGHF/HFFilter.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::HFFilterHelpers O2::DetectorsBase
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(hf-filter-charm-hadron-signals

Check failure on line 45 in EventFiltering/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name hf-filter-charm-hadron-signals does not match its file name HFFilterCharmHadronSignals.cxx. (Matches hfFilterCharmHadronSignals.cxx.)
SOURCES PWGHF/HFFilterCharmHadronSignals.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::HFFilterHelpers
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(hf-filter-prepare-ml-samples

Check failure on line 50 in EventFiltering/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name hf-filter-prepare-ml-samples does not match its file name HFFilterPrepareMLSamples.cxx. (Matches hfFilterPrepareMlSamples.cxx.)
SOURCES PWGHF/HFFilterPrepareMLSamples.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::HFFilterHelpers O2::DetectorsBase
COMPONENT_NAME Analysis)
Expand Down Expand Up @@ -106,12 +106,3 @@
SOURCES PWGLF/filterdoublephi.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DetectorsBase
COMPONENT_NAME Analysis)

o2physics_add_library(EventFilteringUtils
SOURCES Zorro.cxx ZorroSummary.cxx
INSTALL_HEADERS ZorroHelper.h ZorroSummary.h
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore Arrow::arrow_shared)

o2physics_target_root_dictionary(EventFilteringUtils
HEADERS ZorroHelper.h ZorroSummary.h
LINKDEF EventFilteringUtilsLinkDef.h)
18 changes: 0 additions & 18 deletions EventFiltering/EventFilteringUtilsLinkDef.h
View file
Open in desktop

This file was deleted.

21 changes: 11 additions & 10 deletions EventFiltering/macros/uploadOTSobjects.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,10 @@
// or submit itself to any jurisdiction.
//

#include <fstream>
#include <iostream>
#include <vector>
#include <string>
#include <map>
#include <array>
#include <cmath>
#include "Common/Core/ZorroHelper.h"

#include "CCDB/BasicCCDBManager.h"
#include "CommonConstants/LHCConstants.h"

#include "TFile.h"
#include "TGrid.h"
Expand All @@ -25,9 +22,13 @@
#include "TSystem.h"
#include "TTree.h"

#include "CCDB/BasicCCDBManager.h"
#include "EventFiltering/ZorroHelper.h"
#include "CommonConstants/LHCConstants.h"
#include <array>
#include <cmath>
#include <fstream>
#include <iostream>
#include <map>
#include <string>
#include <vector>

constexpr uint32_t chunkSize = 1000000;

Expand Down
2 changes: 1 addition & 1 deletion PWGCF/Femto/Core/collisionBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

#include "Common/CCDB/EventSelectionParams.h"
#include "Common/CCDB/RCTSelectionFlags.h"
#include "EventFiltering/Zorro.h"
#include "Common/Core/Zorro.h"

#include "DataFormatsParameters/GRPMagField.h"
#include "Framework/AnalysisHelpers.h"
Expand Down
2 changes: 1 addition & 1 deletion PWGCF/Femto/FemtoNuclei/TableProducer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@

o2physics_add_dpl_workflow(pinucleifemto
SOURCES PiNucleiFemto.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::EventFilteringUtils
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
COMPONENT_NAME Analysis)
4 changes: 2 additions & 2 deletions PWGCF/Femto/FemtoNuclei/TableProducer/PiNucleiFemto.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
#include "Common/Core/PID/TPCPIDResponse.h"
#include "Common/Core/RecoDecay.h"
#include "Common/Core/TrackSelection.h"
#include "Common/Core/Zorro.h"
#include "Common/Core/ZorroSummary.h"
#include "Common/Core/trackUtilities.h"
#include "Common/DataModel/Centrality.h"
#include "Common/DataModel/EventSelection.h"
Expand All @@ -34,8 +36,6 @@
#include "Common/DataModel/PIDResponseTPC.h"
#include "Common/DataModel/TrackSelectionTables.h"
#include "Common/TableProducer/PID/pidTOFBase.h"
#include "EventFiltering/Zorro.h"
#include "EventFiltering/ZorroSummary.h"

#include "CCDB/BasicCCDBManager.h"
#include "DataFormatsParameters/GRPMagField.h"
Expand Down
2 changes: 1 addition & 1 deletion PWGCF/Femto/TableProducer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

o2physics_add_dpl_workflow(femto-producer
SOURCES femtoProducer.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::EventFilteringUtils
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(femto-producer-derived-to-derived
Expand Down
4 changes: 2 additions & 2 deletions PWGCF/Femto3D/TableProducer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

o2physics_add_dpl_workflow(single-track-selector
SOURCES singleTrackSelector.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::AnalysisCCDB O2Physics::EventFilteringUtils
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::AnalysisCCDB
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(single-track-selector-extra
Expand All @@ -24,4 +24,4 @@ o2physics_add_dpl_workflow(single-track-selector-extra
o2physics_add_dpl_workflow(single-track-selector-pid-dummy
SOURCES singleTrackSelectorPIDMaker.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
COMPONENT_NAME Analysis)
COMPONENT_NAME Analysis)
4 changes: 2 additions & 2 deletions PWGCF/Femto3D/TableProducer/singleTrackSelector.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
#include "PWGCF/Femto3D/DataModel/singletrackselector.h"

#include "Common/CCDB/ctpRateFetcher.h"
#include "Common/Core/Zorro.h"
#include "Common/Core/ZorroSummary.h"
#include "Common/DataModel/Centrality.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/Multiplicity.h"
#include "Common/DataModel/PIDResponseITS.h"
#include "Common/DataModel/PIDResponseTOF.h"
#include "Common/DataModel/PIDResponseTPC.h"
#include "Common/DataModel/TrackSelectionTables.h"
#include "EventFiltering/Zorro.h"
#include "EventFiltering/ZorroSummary.h"

#include "CCDB/BasicCCDBManager.h"
#include "DataFormatsParameters/GRPMagField.h"
Expand Down
4 changes: 2 additions & 2 deletions PWGCF/Femto3D/Tasks/PIDoptimization.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@

#include "Common/CCDB/ctpRateFetcher.h"
#include "Common/Core/TrackSelection.h"
#include "Common/Core/Zorro.h"
#include "Common/Core/ZorroSummary.h"
#include "Common/DataModel/Centrality.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/Multiplicity.h"
#include "Common/DataModel/PIDResponseITS.h"
#include "Common/DataModel/PIDResponseTOF.h"
#include "Common/DataModel/PIDResponseTPC.h"
#include "Common/DataModel/TrackSelectionTables.h"
#include "EventFiltering/Zorro.h"
#include "EventFiltering/ZorroSummary.h"

#include "CCDB/BasicCCDBManager.h"
#include "CommonConstants/MathConstants.h"
Expand Down
4 changes: 2 additions & 2 deletions PWGCF/FemtoDream/TableProducer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@

o2physics_add_dpl_workflow(femtodream-producer
SOURCES femtoDreamProducerTask.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::EventFilteringUtils
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(femto-dream-producer-task-reso
SOURCES femtoDreamProducerTaskReso.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::EventFilteringUtils
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(femtodream-producer-reduced
Expand Down
2 changes: 1 addition & 1 deletion PWGCF/FemtoDream/TableProducer/femtoDreamProducerTask.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include "PWGCF/FemtoDream/Core/femtoDreamV0Selection.h"
#include "PWGLF/DataModel/LFStrangenessTables.h"

#include "Common/Core/Zorro.h"
#include "Common/Core/trackUtilities.h"
#include "Common/DataModel/Centrality.h"
#include "Common/DataModel/EventSelection.h"
Expand All @@ -29,7 +30,6 @@
#include "Common/DataModel/PIDResponseTOF.h"
#include "Common/DataModel/PIDResponseTPC.h"
#include "Common/DataModel/TrackSelectionTables.h"
#include "EventFiltering/Zorro.h"

#include "DataFormatsParameters/GRPMagField.h"
#include "DataFormatsParameters/GRPObject.h"
Expand Down
2 changes: 1 addition & 1 deletion PWGCF/FemtoDream/TableProducer/femtoDreamProducerTaskReso.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "PWGCF/FemtoDream/Core/femtoDreamV0SelectionK0Short.h"
#include "PWGLF/DataModel/LFStrangenessTables.h"

#include "Common/Core/Zorro.h"
#include "Common/Core/trackUtilities.h"
#include "Common/DataModel/Centrality.h"
#include "Common/DataModel/EventSelection.h"
Expand All @@ -30,7 +31,6 @@
#include "Common/DataModel/PIDResponseTOF.h"
#include "Common/DataModel/PIDResponseTPC.h"
#include "Common/DataModel/TrackSelectionTables.h"
#include "EventFiltering/Zorro.h"

#include "DataFormatsParameters/GRPMagField.h"
#include "DataFormatsParameters/GRPObject.h"
Expand Down
2 changes: 1 addition & 1 deletion PWGCF/FemtoUniverse/TableProducer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

o2physics_add_dpl_workflow(femtouniverse-producer
SOURCES femtoUniverseProducerTask.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::AnalysisCCDB O2Physics::EventFilteringUtils
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::AnalysisCCDB
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(femtouniverse-mctruth-producer
Expand Down
4 changes: 2 additions & 2 deletions PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTask.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@

#include "Common/CCDB/ctpRateFetcher.h"
#include "Common/Core/RecoDecay.h"
#include "Common/Core/Zorro.h"
#include "Common/Core/ZorroSummary.h"
#include "Common/Core/trackUtilities.h"
#include "Common/DataModel/Centrality.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/Multiplicity.h"
#include "Common/DataModel/PIDResponseTOF.h"
#include "Common/DataModel/PIDResponseTPC.h"
#include "Common/DataModel/TrackSelectionTables.h"
#include "EventFiltering/Zorro.h"
#include "EventFiltering/ZorroSummary.h"

#include "CommonConstants/PhysicsConstants.h"
#include "DataFormatsParameters/GRPMagField.h"
Expand Down
4 changes: 2 additions & 2 deletions PWGDQ/TableProducer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@

o2physics_add_dpl_workflow(table-maker
SOURCES tableMaker.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::DetectorsBase O2Physics::AnalysisCCDB O2Physics::PWGDQCore O2Physics::EventFilteringUtils
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::DetectorsBase O2Physics::AnalysisCCDB O2Physics::PWGDQCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(table-maker-with-assoc
SOURCES tableMaker_withAssoc.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::DetectorsBase O2Physics::AnalysisCCDB O2Physics::PWGDQCore O2Physics::EventFilteringUtils
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::DetectorsBase O2Physics::AnalysisCCDB O2Physics::PWGDQCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(table-maker-mc
Expand Down
2 changes: 1 addition & 1 deletion PWGDQ/TableProducer/tableMaker.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include "PWGDQ/DataModel/ReducedInfoTables.h"

#include "Common/CCDB/TriggerAliases.h"
#include "Common/Core/Zorro.h"
#include "Common/DataModel/Centrality.h"
#include "Common/DataModel/CollisionAssociationTables.h"
#include "Common/DataModel/EventSelection.h"
Expand All @@ -42,7 +43,6 @@
#include "Common/DataModel/PIDResponseTOF.h"
#include "Common/DataModel/PIDResponseTPC.h"
#include "Common/DataModel/TrackSelectionTables.h"
#include "EventFiltering/Zorro.h"

#include "CCDB/BasicCCDBManager.h"
#include "CommonDataFormat/InteractionRecord.h"
Expand Down
2 changes: 1 addition & 1 deletion PWGDQ/TableProducer/tableMaker_withAssoc.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@

#include "Common/CCDB/TriggerAliases.h"
#include "Common/Core/TableHelper.h"
#include "Common/Core/Zorro.h"
#include "Common/DataModel/Centrality.h"
#include "Common/DataModel/CollisionAssociationTables.h"
#include "Common/DataModel/EventSelection.h"
Expand All @@ -45,7 +46,6 @@
#include "Common/DataModel/PIDResponseTOF.h"
#include "Common/DataModel/PIDResponseTPC.h"
#include "Common/DataModel/TrackSelectionTables.h"
#include "EventFiltering/Zorro.h"

#include "CCDB/BasicCCDBManager.h"
#include "CommonDataFormat/InteractionRecord.h"
Expand Down
2 changes: 1 addition & 1 deletion PWGDQ/Tasks/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ o2physics_add_dpl_workflow(task-fwd-track-pid

o2physics_add_dpl_workflow(quarkonia-to-hyperons
SOURCES quarkoniaToHyperons.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::MLCore O2Physics::EventFilteringUtils
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::MLCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(model-converter-mult-pv
Expand Down
4 changes: 2 additions & 2 deletions PWGDQ/Tasks/quarkoniaToHyperons.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@
#include "PWGUD/Core/SGSelector.h"

#include "Common/Core/TrackSelection.h"
#include "Common/Core/Zorro.h"
#include "Common/Core/ZorroSummary.h"
#include "Common/Core/trackUtilities.h"
#include "Common/DataModel/Centrality.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/Multiplicity.h"
#include "Common/DataModel/TrackSelectionTables.h"
#include "EventFiltering/Zorro.h"
#include "EventFiltering/ZorroSummary.h"
#include "Tools/ML/MlResponse.h"
#include "Tools/ML/model.h"

Expand Down
5 changes: 2 additions & 3 deletions PWGEM/Dilepton/TableProducer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ o2physics_add_dpl_workflow(tree-creator-electron-ml

o2physics_add_dpl_workflow(tree-creator-electron-ml-dda
SOURCES treeCreatorElectronMLDDA.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::EventFilteringUtils O2Physics::AnalysisCCDB
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::AnalysisCCDB
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(skimmer-primary-electron
Expand Down Expand Up @@ -47,7 +47,7 @@ o2physics_add_dpl_workflow(create-emevent-dilepton

o2physics_add_dpl_workflow(skimmer-ots
SOURCES skimmerOTS.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::EventFilteringUtils
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(associate-mc-info-dilepton
Expand All @@ -64,4 +64,3 @@ o2physics_add_dpl_workflow(filter-eoi
SOURCES filterEoI.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

2 changes: 1 addition & 1 deletion PWGEM/Dilepton/TableProducer/skimmerOTS.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "PWGEM/Dilepton/DataModel/dileptonTables.h"

#include "Common/Core/TableHelper.h"
#include "EventFiltering/Zorro.h"
#include "Common/Core/Zorro.h"

#include "CCDB/BasicCCDBManager.h"
#include "Framework/ASoAHelpers.h"
Expand Down
2 changes: 1 addition & 1 deletion PWGEM/Dilepton/TableProducer/treeCreatorElectronMLDDA.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
#include "Common/CCDB/ctpRateFetcher.h"
#include "Common/Core/RecoDecay.h"
#include "Common/Core/TrackSelection.h"
#include "Common/Core/Zorro.h"
#include "Common/Core/trackUtilities.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/Multiplicity.h"
#include "Common/DataModel/PIDResponseTOF.h"
#include "Common/DataModel/PIDResponseTPC.h"
#include "Common/DataModel/TrackSelectionTables.h"
#include "EventFiltering/Zorro.h"

#include "CCDB/BasicCCDBManager.h"
#include "CommonConstants/PhysicsConstants.h"
Expand Down
Loading
Loading