Skip to content

Please consider the following formatting changes to #13761 #13763

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

Closed
alibuild wants to merge 2 commits into from
Closed

Please consider the following formatting changes to #13761 #13763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b35770
Move Zorro into Common/Core
mpuccio Nov 10, 2025
e0b26cd
Please consider the following formatting changes
alibuild Nov 10, 2025
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 @@ -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
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 @@ -106,12 +106,3 @@ o2physics_add_dpl_workflow(lf-f1proton-filter
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 Expand Up @@ -76,7 +77,7 @@
std::vector<ZorroHelper> zorroHelpers;
std::unique_ptr<TFile> bcRangesFile{TFile::Open((path + "/bcRanges_fullrun.root").data(), "READ")};
int Nmax = 0;
for (auto key : *(bcRangesFile->GetListOfKeys())) {

Check failure on line 80 in EventFiltering/macros/uploadOTSobjects.C

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
TTree* cefpTree = static_cast<TTree*>(bcRangesFile->Get(Form("%s/selectedBC", key->GetName())));
if (!cefpTree)
continue;
Expand Down Expand Up @@ -121,7 +122,7 @@
auto bcEnd{zorroHelpers[endIndex].bcAOD > zorroHelpers[endIndex].bcEvSel ? zorroHelpers[endIndex].bcAOD : zorroHelpers[endIndex].bcEvSel};
const auto& nextHelper = zorroHelpers[endIndex + 1];
auto bcNext{nextHelper.bcAOD < nextHelper.bcEvSel ? nextHelper.bcAOD : nextHelper.bcEvSel};
if (bcNext - bcEnd > 2001 / o2::constants::lhc::LHCBunchSpacingMUS) { /// ensure a gap of 2ms between chunks

Check failure on line 125 in EventFiltering/macros/uploadOTSobjects.C

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.
chunk.insert(chunk.begin(), zorroHelpers.begin() + helperIndex, zorroHelpers.begin() + endIndex + 1);
endTS = (orbitResetTimestamp + int64_t(bcEnd * o2::constants::lhc::LHCBunchSpacingNS * 1e-3)) / 1000 + 1;
break;
Expand Down
4 changes: 2 additions & 2 deletions 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 Expand Up @@ -87,7 +87,7 @@ struct ConfCcdb : o2::framework::ConfigurableGroup {
std::string prefix = std::string("ConfCcdb");
o2::framework::Configurable<std::string> ccdbUrl{"ccdbUrl", "http://alice-ccdb.cern.ch", "URL to ccdb"};
o2::framework::Configurable<std::string> grpPath{"grpPath", "GLO/Config/GRPMagField", "Path to GRP object (Run3 -> GLO/Config/GRPMagField/Run2 -> GLO/GRP/GRP"};
o2::framework::Configurable<std::string> triggerPath{"triggerPath", "EventFiltering/Zorro/", "CCDB path for trigger information"};
o2::framework::Configurable<std::string> triggerPath{"triggerPath", "Common/Core/Zorro/", "CCDB path for trigger information"};
};

struct ConfCollisionRctFlags : o2::framework::ConfigurableGroup {
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 Expand Up @@ -489,7 +489,7 @@
{
if (candidate.tpcChi2NCl() > settingCutChi2tpcHighPion || candidate.tpcChi2NCl() < settingCutChi2tpcLowPion || candidate.itsChi2NCl() > settingCutChi2NClITSPion)
return false;
if (abs(candidate.dcaXY()) > settingCutPiDCAxyMin || abs(candidate.dcaZ()) > settingCutPiDCAzMin)

Check failure on line 492 in PWGCF/Femto/FemtoNuclei/TableProducer/PiNucleiFemto.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
return false;

auto tpcNSigmaPi = candidate.tpcNSigmaPi();
Expand Down Expand Up @@ -541,7 +541,7 @@
mQaRegistry.fill(HIST("h2dEdx"), candidate.sign() * tpcInnerParam, candidate.tpcSignal());

float DeDCAxyMin = 0.015 + 0.0305 / TMath::Power(candidate.pt(), 1.1);
if (abs(candidate.dcaXY()) > DeDCAxyMin || abs(candidate.dcaXY()) > settingCutDeDCAzMin)

Check failure on line 544 in PWGCF/Femto/FemtoNuclei/TableProducer/PiNucleiFemto.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
return false;

if (std::abs(tpcInnerParam) < settingCutPinMinDe) {
Expand Down Expand Up @@ -1014,7 +1014,7 @@
mQaRegistry.fill(HIST("hNuPitInvMass"), piNucand.invMass);
mQaRegistry.fill(HIST("hdcaxyNu"), piNucand.dcaxyNu);
mQaRegistry.fill(HIST("hdcazNu"), piNucand.dcazNu);
mQaRegistry.fill(HIST("hdcazNu_min"), (abs(piNucand.dcazNu) - settingCutDeDCAzMin));

Check failure on line 1017 in PWGCF/Femto/FemtoNuclei/TableProducer/PiNucleiFemto.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
mQaRegistry.fill(HIST("hNClsNuITS"), piNucand.nClsItsNu);
mQaRegistry.fill(HIST("hNClsPiITS"), piNucand.nClsItsPi);
mQaRegistry.fill(HIST("hisBkgEM"), piNucand.isBkgEM);
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 Expand Up @@ -546,19 +546,19 @@
continue;
}

if (mcParticle.pdgCode() == 1000010020) {

Check failure on line 549 in PWGCF/Femto3D/TableProducer/singleTrackSelector.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code] 

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.
registry.fill(HIST("hReco_EtaPhiPt_Deuteron"), mcParticle.eta(), mcParticle.phi(), mcParticle.pt());
} else if (mcParticle.pdgCode() == -1000010020) {

Check failure on line 551 in PWGCF/Femto3D/TableProducer/singleTrackSelector.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code] 

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.
registry.fill(HIST("hReco_EtaPhiPt_Deuteron"), mcParticle.eta(), mcParticle.phi(), mcParticle.pt() * -1);
}

if (mcParticle.pdgCode() == 2212) {

Check failure on line 555 in PWGCF/Femto3D/TableProducer/singleTrackSelector.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code] 

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.
registry.fill(HIST("hReco_EtaPhiPt_Proton"), mcParticle.eta(), mcParticle.phi(), mcParticle.pt());
} else if (mcParticle.pdgCode() == -2212) {

Check failure on line 557 in PWGCF/Femto3D/TableProducer/singleTrackSelector.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code] 

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.
registry.fill(HIST("hReco_EtaPhiPt_Proton"), mcParticle.eta(), mcParticle.phi(), mcParticle.pt() * -1);
}

if (mcParticle.pdgCode() == 1000020030) {

Check failure on line 561 in PWGCF/Femto3D/TableProducer/singleTrackSelector.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code] 

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.
registry.fill(HIST("hReco_EtaPhiPt_Helium3"), mcParticle.eta(), mcParticle.phi(), mcParticle.pt());
} else if (mcParticle.pdgCode() == -1000020030) {
registry.fill(HIST("hReco_EtaPhiPt_Helium3"), mcParticle.eta(), mcParticle.phi(), mcParticle.pt() * -1);
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
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)

4 changes: 2 additions & 2 deletions 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 All @@ -42,7 +42,7 @@ struct skimmerOTS {
// CCDB options
Configurable<std::string> ccdburl{"ccdb-url", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
Configurable<std::string> cfg_swt_names{"cfg_swt_names", "fLMeeIMR,fLMeeHMR", "comma-separated software trigger names"}; // !trigger names have to be pre-registered in dileptonTable.h for bit operation!
o2::framework::Configurable<std::string> ccdbPathSoftwareTrigger{"ccdbPathSoftwareTrigger", "EventFiltering/Zorro/", "ccdb path for ZORRO objects"};
o2::framework::Configurable<std::string> ccdbPathSoftwareTrigger{"ccdbPathSoftwareTrigger", "Common/Core/Zorro/", "ccdb path for ZORRO objects"};
Configurable<uint64_t> bcMarginForSoftwareTrigger{"bcMarginForSoftwareTrigger", 100, "Number of BCs of margin for software triggers"};

std::vector<std::string> swt_names;
Expand Down
Loading
Loading