Skip to content

[ALICE3] Fix O2Linter issues in ALICE 3 DQ Framework #17269

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

Draft
axti98 wants to merge 2 commits into
base: master
Choose a base branch
from
+360 −361
Draft

[ALICE3] Fix O2Linter issues in ALICE 3 DQ Framework #17269

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
b070ab6
Cleanup O2Linter errors for dqTableMaker
axti98 Jul 30, 2026
4ea8c3f
Fix O2linter issues in ALICE 3 DQ framework
axti98 Jul 30, 2026
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
2 changes: 1 addition & 1 deletion ALICE3/TableProducer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2019-2020 CERN and copyright holders of ALICE O2.

Check failure on line 1 in ALICE3/TableProducer/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Use kebab-case for names of workflows and match the name of the workflow file.
# See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
# All rights not expressly granted are reserved.
#
Expand All @@ -11,27 +11,27 @@

add_subdirectory(OTF)

o2physics_add_dpl_workflow(alice3-trackselection

Check failure on line 14 in ALICE3/TableProducer/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name alice3-trackselection does not match its file name alice3-trackselection.cxx. (Matches alice3Trackselection.cxx.)
SOURCES alice3-trackselection.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(alice3-trackextension

Check failure on line 19 in ALICE3/TableProducer/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name alice3-trackextension does not match its file name alice3-trackextension.cxx. (Matches alice3Trackextension.cxx.)
SOURCES alice3-trackextension.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::ReconstructionDataFormats
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(alice3-centrality

Check failure on line 24 in ALICE3/TableProducer/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name alice3-centrality does not match its file name alice3-centrality.cxx. (Matches alice3Centrality.cxx.)
SOURCES alice3-centrality.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(alice3-decaypreselector

Check failure on line 29 in ALICE3/TableProducer/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name alice3-decaypreselector does not match its file name alice3-decaypreselector.cxx. (Matches alice3Decaypreselector.cxx.)
SOURCES alice3-decaypreselector.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(alice3-decayfinder

Check failure on line 34 in ALICE3/TableProducer/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name alice3-decayfinder does not match its file name alice3-decayfinder.cxx. (Matches alice3Decayfinder.cxx.)
SOURCES alice3-decayfinder.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter
COMPONENT_NAME Analysis)
Expand All @@ -41,7 +41,7 @@
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(alice3-correlatorddbar

Check failure on line 44 in ALICE3/TableProducer/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name alice3-correlatorddbar does not match its file name alice3-correlatorDDbar.cxx. (Matches alice3Correlatorddbar.cxx.)
SOURCES alice3-correlatorDDbar.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter
COMPONENT_NAME Analysis)
Expand All @@ -62,16 +62,16 @@
COMPONENT_NAME Analysis)

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

o2physics_add_dpl_workflow(alice3-dileptonsmearing

Check failure on line 69 in ALICE3/TableProducer/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name alice3-dileptonsmearing does not match its file name alice3-dileptonsmearing.cxx. (Matches alice3Dileptonsmearing.cxx.)
SOURCES alice3-dileptonsmearing.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::DetectorsBase O2Physics::AnalysisCCDB O2Physics::PWGEMDileptonCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(alice3strangenessfinder

Check failure on line 74 in ALICE3/TableProducer/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name alice3strangenessfinder does not match its file name alice3strangenessFinder.cxx. (Matches alice3strangenessfinder.cxx.)
SOURCES alice3strangenessFinder.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::ALICE3Core
COMPONENT_NAME Analysis)
Expand Down
125 changes: 62 additions & 63 deletions ...3/TableProducer/alice3-dq-table-maker.cxx → ALICE3/TableProducer/alice3DqTableMaker.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@
// In applying this license CERN does not waive the privileges and immunities
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.
//
// Contact: Ionut Cristian Arsene iarsene@cern.ch, i.c.arsene@fys.uio.no
// Alexander Tiekoetter (alexander.tiekoetter@cern.ch)
/// \file alice3-dq-table-maker.cxx
/// \brief DQ table maker for ALICE 3
/// \author Ionut Cristian Arsene <iarsene@cern.ch>, Oslo
/// \author Alexander Tiekoetter <alexander.tiekoetter@cern.ch>, Muenster
/// \brief Skimming Task for DQ Table Maker
/// \file alice3DqTableMaker.cxx

#include "PWGDQ/Core/AnalysisCompositeCut.h"
#include "PWGDQ/Core/AnalysisCut.h"
Expand Down Expand Up @@ -67,12 +66,12 @@ using MyBarrelTracks = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA,
using MyEvents = soa::Join<aod::Collisions, aod::CollisionsAlice3, aod::McCollisionLabels>;
using MyEventsMC = aod::McCollisions;

constexpr static uint32_t gkEventFillMap = VarManager::ObjTypes::Collision;
constexpr static uint32_t gkEventMcFillMap = VarManager::ObjTypes::CollisionMC;
constexpr static uint32_t GkEventFillMap = VarManager::ObjTypes::Collision;
constexpr static uint32_t GkEventMcFillMap = VarManager::ObjTypes::CollisionMC;

constexpr static uint32_t gkTrackFillMapWithCov = VarManager::ObjTypes::Track | VarManager::ObjTypes::TrackExtra | VarManager::ObjTypes::TrackDCA | VarManager::ObjTypes::TrackSelection | VarManager::ObjTypes::TrackCov | VarManager::ObjTypes::TrackPID;
constexpr static uint32_t GkTrackFillMapWithCov = VarManager::ObjTypes::Track | VarManager::ObjTypes::TrackExtra | VarManager::ObjTypes::TrackDCA | VarManager::ObjTypes::TrackSelection | VarManager::ObjTypes::TrackCov | VarManager::ObjTypes::TrackPID;

struct Alice3DQTableMaker {
struct Alice3DqTableMaker {

Produces<ReA3MCEvents> eventMC;
Produces<ReA3MCTracks> trackMC;
Expand All @@ -98,24 +97,24 @@ struct Alice3DQTableMaker {

// Event and track AnalysisCut configurables
struct : ConfigurableGroup {
Configurable<std::string> fConfigEventCuts{"cfgEventCuts", "", "Event selection"};
Configurable<std::string> fConfigTrackCuts{"cfgBarrelTrackCuts", "", "barrel track cut"};
Configurable<std::string> fConfigEventCutsJSON{"cfgEventCutsJSON", "", "Additional event selection in JSON format"};
Configurable<std::string> fConfigTrackCutsJSON{"cfgBarrelTrackCutsJSON", "", "Additional list of barrel track cuts in JSON format"};
Configurable<std::string> cfgEventCuts{"cfgEventCuts", "", "Event selection"};
Configurable<std::string> cfgBarrelTrackCuts{"cfgBarrelTrackCuts", "", "barrel track cut"};
Configurable<std::string> cfgEventCutsJSON{"cfgEventCutsJSON", "", "Additional event selection in JSON format"};
Configurable<std::string> cfgBarrelTrackCutsJSON{"cfgBarrelTrackCutsJSON", "", "Additional list of barrel track cuts in JSON format"};
} fConfigCuts;

// MC signals to be skimmed
Configurable<std::string> fConfigMCSignals{"cfgMCsignals", "", "Comma separated list of MC signals"};
Configurable<std::string> fConfigMCSignalsJSON{"cfgMCsignalsJSON", "", "Additional list of MC signals via JSON"};
Configurable<std::string> cfgMCsignals{"cfgMCsignals", "", "Comma separated list of MC signals"};
Configurable<std::string> cfgMCsignalsJSON{"cfgMCsignalsJSON", "", "Additional list of MC signals via JSON"};

// Steer QA output
struct : ConfigurableGroup {
Configurable<bool> fConfigQA{"cfgQA", false, "If true, fill QA histograms"};
Configurable<bool> fConfigDetailedQA{"cfgDetailedQA", false, "If true, include more QA histograms (BeforeCuts classes)"};
Configurable<std::string> fConfigAddEventHistogram{"cfgAddEventHistogram", "", "Comma separated list of histograms"};
Configurable<std::string> fConfigAddTrackHistogram{"cfgAddTrackHistogram", "", "Comma separated list of histograms"};
Configurable<std::string> fConfigAddMCTruthHistogram{"cfgAddMCTruthHistogram", "", "Comma separated list of histograms"};
Configurable<std::string> fConfigAddJSONHistograms{"cfgAddJSONHistograms", "", "Histograms in JSON format"};
Configurable<bool> cfgQA{"cfgQA", false, "If true, fill QA histograms"};
Configurable<bool> cfgDetailedQA{"cfgDetailedQA", false, "If true, include more QA histograms (BeforeCuts classes)"};
Configurable<std::string> cfgAddEventHistogram{"cfgAddEventHistogram", "", "Comma separated list of histograms"};
Configurable<std::string> cfgAddTrackHistogram{"cfgAddTrackHistogram", "", "Comma separated list of histograms"};
Configurable<std::string> cfgAddMCTruthHistogram{"cfgAddMCTruthHistogram", "", "Comma separated list of histograms"};
Configurable<std::string> cfgAddJSONHistograms{"cfgAddJSONHistograms", "", "Histograms in JSON format"};
} fConfigHistOutput;

AnalysisCompositeCut* fEventCut = nullptr; //! Event selection cut
Expand All @@ -137,15 +136,15 @@ struct Alice3DQTableMaker {
if (!isProcessSkimmingEnabled)
LOG(fatal) << "No process function was enabled ALICE 3 TableMaker";

VarManager::SetDefaultVarNames(); // Important that this is called before DefineCuts() !!!
VarManager::SetDefaultVarNames(); // Important that this is called before defineCuts() !!!

DefineCuts();
defineCuts();

fHistMan = new HistogramManager("analysisHistos", "aa", VarManager::kNVars);
fHistMan->SetUseDefaultVariableNames(true);
fHistMan->SetDefaultVarNames(VarManager::fgVariableNames, VarManager::fgVariableUnits);

if (fConfigHistOutput.fConfigQA && fConfigHistOutput.fConfigDetailedQA) {
if (fConfigHistOutput.cfgQA && fConfigHistOutput.cfgDetailedQA) {
fDoDetailedQA = true;
}

Expand All @@ -155,7 +154,7 @@ struct Alice3DQTableMaker {
histClasses += "Event_BeforeCuts;";
}

if (fConfigHistOutput.fConfigQA) {
if (fConfigHistOutput.cfgQA) {
histClasses += "Event_AfterCuts;";
histClasses += "Event_MCTruth;";
}
Expand All @@ -165,14 +164,14 @@ struct Alice3DQTableMaker {
histClasses += "TrackBarrel_BeforeCuts;";
}

if (fConfigHistOutput.fConfigQA) {
if (fConfigHistOutput.cfgQA) {
for (const auto& cut : fTrackCuts) {
histClasses += Form("TrackBarrel_%s;", cut->GetName());
}
}
}

TString configNamesStr = fConfigMCSignals.value;
TString configNamesStr = cfgMCsignals.value;
std::unique_ptr<TObjArray> objArray(configNamesStr.Tokenize(","));

if (objArray->GetEntries() > 0) {
Expand All @@ -184,7 +183,7 @@ struct Alice3DQTableMaker {
}
}

TString addMCSignalsStr = fConfigMCSignalsJSON.value;
TString addMCSignalsStr = cfgMCsignalsJSON.value;

if (addMCSignalsStr != "") {
std::vector<MCSignal*> addMCSignals = dqmcsignals::GetMCSignalsFromJSON(addMCSignalsStr.Data());
Expand All @@ -197,7 +196,7 @@ struct Alice3DQTableMaker {
}

for (const auto& mcIt : fMCSignals) {
if (fConfigHistOutput.fConfigQA) {
if (fConfigHistOutput.cfgQA) {
histClasses += Form("MCTruth_%s;", mcIt->GetName());
}
if (fDoDetailedQA) {
Expand All @@ -209,24 +208,24 @@ struct Alice3DQTableMaker {
}
}

DefineHistograms(histClasses);
defineHistograms(histClasses);

TString addHistsStr = fConfigHistOutput.fConfigAddJSONHistograms.value;
if (fConfigHistOutput.fConfigQA && addHistsStr != "") {
TString addHistsStr = fConfigHistOutput.cfgAddJSONHistograms.value;
if (fConfigHistOutput.cfgQA && addHistsStr != "") {
dqhistograms::AddHistogramsFromJSON(fHistMan, addHistsStr.Data());
}

VarManager::SetUseVars(fHistMan->GetUsedVars()); // provide the list of required variables so that VarManager knows what to fill
fOutputList.setObject(fHistMan->GetMainHistogramList());
}

void DefineCuts()
void defineCuts()
{
fEventCut = new AnalysisCompositeCut(true);
TString eventCutStr = fConfigCuts.fConfigEventCuts.value;
TString eventCutStr = fConfigCuts.cfgEventCuts.value;
fEventCut->AddCut(dqcuts::GetAnalysisCut(eventCutStr.Data()));

TString addEvCutsStr = fConfigCuts.fConfigEventCutsJSON.value;
TString addEvCutsStr = fConfigCuts.cfgEventCutsJSON.value;
if (addEvCutsStr != "") {
std::vector<AnalysisCut*> addEvCuts = dqcuts::GetCutsFromJSON(addEvCutsStr.Data());
for (const auto& cutIt : addEvCuts) {
Expand All @@ -235,15 +234,15 @@ struct Alice3DQTableMaker {
}

// Barrel track cuts
TString cutNamesStr = fConfigCuts.fConfigTrackCuts.value;
TString cutNamesStr = fConfigCuts.cfgBarrelTrackCuts.value;
if (!cutNamesStr.IsNull()) {
std::unique_ptr<TObjArray> objArray(cutNamesStr.Tokenize(","));
for (int icut = 0; icut < objArray->GetEntries(); ++icut) {
fTrackCuts.push_back(dqcuts::GetCompositeCut(objArray->At(icut)->GetName()));
}
}
// Additional Barrel track cuts via JSON
TString addTrackCutsStr = fConfigCuts.fConfigTrackCutsJSON.value;
TString addTrackCutsStr = fConfigCuts.cfgBarrelTrackCutsJSON.value;
if (addTrackCutsStr != "") {
std::vector<AnalysisCut*> addTrackCuts = dqcuts::GetCutsFromJSON(addTrackCutsStr.Data());
for (const auto& t : addTrackCuts) {
Expand All @@ -254,34 +253,34 @@ struct Alice3DQTableMaker {
VarManager::SetUseVars(AnalysisCut::fgUsedVars); // provide the list of required variables so that VarManager knows what to fill
}

void DefineHistograms(TString histClasses)
void defineHistograms(TString histClasses)
{
std::unique_ptr<TObjArray> objArray(histClasses.Tokenize(";"));
for (int iclass = 0; iclass < objArray->GetEntries(); ++iclass) {
TString classStr = objArray->At(iclass)->GetName();
if (fConfigHistOutput.fConfigQA) {
if (fConfigHistOutput.cfgQA) {
fHistMan->AddHistClass(classStr.Data());
}

TString histEventName = fConfigHistOutput.fConfigAddEventHistogram.value;
TString histEventName = fConfigHistOutput.cfgAddEventHistogram.value;
if (classStr.Contains("Event")) {
if (fConfigHistOutput.fConfigQA && !classStr.Contains("MCTruth")) {
if (fConfigHistOutput.cfgQA && !classStr.Contains("MCTruth")) {
dqhistograms::DefineHistograms(fHistMan, objArray->At(iclass)->GetName(), "event", histEventName);
} else {
dqhistograms::DefineHistograms(fHistMan, objArray->At(iclass)->GetName(), "event", "generator");
}
}

TString histTrackName = fConfigHistOutput.fConfigAddTrackHistogram.value;
TString histTrackName = fConfigHistOutput.cfgAddTrackHistogram.value;
if (classStr.Contains("Track")) {
if (fConfigHistOutput.fConfigQA) {
if (fConfigHistOutput.cfgQA) {
dqhistograms::DefineHistograms(fHistMan, objArray->At(iclass)->GetName(), "track", histTrackName);
}
}

TString histMCTruthName = fConfigHistOutput.fConfigAddMCTruthHistogram.value;
TString histMCTruthName = fConfigHistOutput.cfgAddMCTruthHistogram.value;
if (classStr.Contains("MCTruth") && !classStr.Contains("Event")) {
if (fConfigHistOutput.fConfigQA) {
if (fConfigHistOutput.cfgQA) {
dqhistograms::DefineHistograms(fHistMan, objArray->At(iclass)->GetName(), "mctruth_track", histMCTruthName);
}
}
Expand All @@ -308,9 +307,9 @@ struct Alice3DQTableMaker {
for (auto cut = fTrackCuts.begin(); cut != fTrackCuts.end(); cut++, ibX++) {
histTracks->GetXaxis()->SetBinLabel(ibX, (*cut)->GetName());
}
constexpr int nV0Tags = 5;
const char* v0TagNames[nV0Tags] = {"Photon conversion", "K^{0}_{s}", "#Lambda", "#bar{#Lambda}", "#Omega"};
for (int ibY = 0; ibY < nV0Tags; ibY++) {
constexpr int NV0Tags = 5;
const char* v0TagNames[NV0Tags] = {"Photon conversion", "K^{0}_{s}", "#Lambda", "#bar{#Lambda}", "#Omega"};
for (int ibY = 0; ibY < NV0Tags; ibY++) {
histTracks->GetXaxis()->SetBinLabel(fTrackCuts.size() + 1 + ibY, v0TagNames[ibY]);
}
fStatsList->Add(histTracks);
Expand All @@ -334,7 +333,7 @@ struct Alice3DQTableMaker {
VarManager::ResetValues(0, VarManager::kNVars);

for (const auto& mcCollision : mcCollisions) {
VarManager::FillEventAlice3<gkEventMcFillMap>(mcCollision);
VarManager::FillEventAlice3<GkEventMcFillMap>(mcCollision);

fHistMan->FillHistClass("Event_MCTruth", VarManager::fgValues);

Expand Down Expand Up @@ -364,8 +363,8 @@ struct Alice3DQTableMaker {
for (const auto& sig : fMCSignals) {
bool checked = false;
if constexpr (soa::is_soa_filtered_v<aod::McParticles>) {
auto mctrack_raw = mcTracks.rawIteratorAt(mctrack.globalIndex());
checked = sig->CheckSignal(true, mctrack_raw);
auto mcTrackRaw = mcTracks.rawIteratorAt(mctrack.globalIndex());
checked = sig->CheckSignal(true, mcTrackRaw);
} else {
checked = sig->CheckSignal(true, mctrack);
}
Expand All @@ -390,10 +389,10 @@ struct Alice3DQTableMaker {
++trackCounter;

// fill histograms for each of the signals, if found
if (fConfigHistOutput.fConfigQA) {
if (fConfigHistOutput.cfgQA) {
VarManager::FillTrackMC(mcTracks, mctrack);
auto mcCollision = mctrack.template mcCollision_as<MyEventsMC>();
VarManager::FillEvent<gkEventMcFillMap>(mcCollision);
VarManager::FillEvent<GkEventMcFillMap>(mcCollision);

int j = 0;
for (auto signal = fMCSignals.begin(); signal != fMCSignals.end(); ++signal, ++j) {
Expand All @@ -418,11 +417,11 @@ struct Alice3DQTableMaker {
(reinterpret_cast<TH2I*>(fStatsList->At(0)))->Fill(1.0, static_cast<float>(o2::aod::evsel::kNsel));

VarManager::ResetValues(0, VarManager::kNEventWiseVariables);
VarManager::FillEventAlice3<gkEventFillMap>(collision); // extract event information and place it in the fValues array
VarManager::FillEventAlice3<GkEventFillMap>(collision); // extract event information and place it in the fValues array

if (collision.has_mcCollision()) {
auto mcCollision = collision.template mcCollision_as<MyEventsMC>();
VarManager::FillEventAlice3<gkEventMcFillMap>(mcCollision);
VarManager::FillEventAlice3<GkEventMcFillMap>(mcCollision);
}

if (fDoDetailedQA) {
Expand Down Expand Up @@ -477,7 +476,7 @@ struct Alice3DQTableMaker {
trackTempFilterMap = static_cast<uint32_t>(0);

// Compute track quantities and fill histograms
VarManager::FillTrackAlice3<gkTrackFillMapWithCov>(track);
VarManager::FillTrackAlice3<GkTrackFillMapWithCov>(track);

if (fDoDetailedQA) {
fHistMan->FillHistClass("TrackBarrel_BeforeCuts", VarManager::fgValues);
Expand All @@ -487,7 +486,7 @@ struct Alice3DQTableMaker {
for (auto cut = fTrackCuts.begin(); cut != fTrackCuts.end(); cut++, n++) {
if ((*cut)->IsSelected(VarManager::fgValues)) {
trackTempFilterMap |= (static_cast<uint32_t>(1) << n);
if (fConfigHistOutput.fConfigQA) {
if (fConfigHistOutput.cfgQA) {
fHistMan->FillHistClass(Form("TrackBarrel_%s", (*cut)->GetName()), VarManager::fgValues);
}
(reinterpret_cast<TH1I*>(fStatsList->At(1)))->Fill(static_cast<float>(n));
Expand Down Expand Up @@ -518,13 +517,13 @@ struct Alice3DQTableMaker {
track.isReconstructed(), track.nSiliconHits(), track.nTPCHits(), track.length(), track.dcaXY(),
track.dcaZ());

if constexpr (static_cast<bool>(gkTrackFillMapWithCov & VarManager::ObjTypes::TrackCov)) {
if constexpr (static_cast<bool>(GkTrackFillMapWithCov & VarManager::ObjTypes::TrackCov)) {
trackBarrelCov(track.cYY(), track.cZY(), track.cZZ(), track.cSnpY(), track.cSnpZ(),
track.cSnpSnp(), track.cTglY(), track.cTglZ(), track.cTglSnp(), track.cTglTgl(),
track.c1PtY(), track.c1PtZ(), track.c1PtSnp(), track.c1PtTgl(), track.c1Pt21Pt2());
}

if constexpr (static_cast<bool>(gkTrackFillMapWithCov & VarManager::ObjTypes::TrackPID)) {
if constexpr (static_cast<bool>(GkTrackFillMapWithCov & VarManager::ObjTypes::TrackPID)) {

trackPIDTOF(track.tofEventTime(), track.tofEventTimeErr(),
track.nSigmaElectronInnerTOF(), track.nSigmaMuonInnerTOF(), track.nSigmaPionInnerTOF(),
Expand Down Expand Up @@ -616,7 +615,7 @@ struct Alice3DQTableMaker {

skimMCParticles(mcParticles, mcCollisions);

if constexpr (static_cast<bool>(gkTrackFillMapWithCov)) {
if constexpr (static_cast<bool>(GkTrackFillMapWithCov)) {
fTrackIndexMap.clear();
trackBasic.reserve(tracksBarrel.size());
trackBarrel.reserve(tracksBarrel.size());
Expand All @@ -633,7 +632,7 @@ struct Alice3DQTableMaker {
for (auto const& [origIdx, skimIdx] : fCollIndexMap) {
auto collision = collisions.rawIteratorAt(origIdx);

if constexpr (static_cast<bool>(gkTrackFillMapWithCov)) {
if constexpr (static_cast<bool>(GkTrackFillMapWithCov)) {
auto groupedTrackIndices = trackAssocs.sliceBy(trackIndicesPerCollision, origIdx);

skimTracks(collision, tracksBarrel, groupedTrackIndices, mcParticles);
Expand Down Expand Up @@ -707,11 +706,11 @@ struct Alice3DQTableMaker {
fullSkimming(collisions, tracksBarrel, trackAssocs, mcCollisions, mcParticles);
}

PROCESS_SWITCH(Alice3DQTableMaker, processSkimming, "Build DQ skimmed data model for ALICE3", true);
PROCESS_SWITCH(Alice3DqTableMaker, processSkimming, "Build DQ skimmed data model for ALICE3", true);
};

WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
{
return WorkflowSpec{
adaptAnalysisTask<Alice3DQTableMaker>(cfgc)};
adaptAnalysisTask<Alice3DqTableMaker>(cfgc)};
}
2 changes: 1 addition & 1 deletion ALICE3/Tasks/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# granted to it by virtue of its status as an Intergovernmental Organization
# or submit itself to any jurisdiction.

o2physics_add_dpl_workflow(alice3-qa-multiplicity

Check failure on line 12 in ALICE3/Tasks/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name alice3-qa-multiplicity does not match its file name alice3-qa-multiplicity.cxx. (Matches alice3QaMultiplicity.cxx.)
SOURCES alice3-qa-multiplicity.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)
Expand Down Expand Up @@ -80,7 +80,7 @@
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(alice3-dq-efficiency
SOURCES alice3-dq-efficiency.cxx
SOURCES alice3DqEfficiency.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGDQCore
COMPONENT_NAME Analysis)

Expand Down
Loading
Loading