Skip to content

[PWGEM/Dilepton] reduce dependencies of skimmerPrimaryElectronSV.cxx #16636

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
dsekihat merged 3 commits into from
Jun 12, 2026
+897 −916
Merged

[PWGEM/Dilepton] reduce dependencies of skimmerPrimaryElectronSV.cxx #16636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
147770e
[PWGEM/Dilepton] reduce dependencies of skimmerPrimaryElectronSV.cxx
dsekihat Jun 12, 2026
0c847f3
Please consider the following formatting changes
alibuild Jun 12, 2026
f4da43a
Merge pull request #105 from alibuild/alibot-cleanup-16636
dsekihat Jun 12, 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
75 changes: 34 additions & 41 deletions PWGEM/Dilepton/TableProducer/skimmerPrimaryElectronSV.cxx
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 PWGEM/Dilepton/TableProducer/skimmerPrimaryElectronSV.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/workflow-file] 

Name of a workflow file must match the name of the main struct in it (without the PWG prefix). (Class implementation files should be in "Core" directories.)

Check failure on line 1 in PWGEM/Dilepton/TableProducer/skimmerPrimaryElectronSV.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-task] 

Specify task name only when it cannot be derived from the struct name. Only append to the default name.
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
Expand All @@ -14,7 +14,7 @@

#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
#include "PWGEM/Dilepton/Utils/ElectronModule.h"
#include "PWGLF/DataModel/LFStrangenessTables.h"
// #include "PWGLF/DataModel/LFStrangenessTables.h"

@vkucera vkucera Jun 16, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't do this.


#include "Common/DataModel/CollisionAssociationTables.h"
#include "Common/DataModel/EventSelection.h"
Expand All @@ -39,7 +39,7 @@
#include <Framework/runDataProcessing.h>
#include <PID/PIDTOFParamService.h>

#include <Math/Vector4D.h> // IWYU pragma: keep (do not replace with Math/Vector4Dfwd.h)
// #include <Math/Vector4D.h> // IWYU pragma: keep (do not replace with Math/Vector4Dfwd.h)

@vkucera vkucera Jun 16, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't do this.


#include <cmath>
#include <cstdint>
Expand All @@ -49,9 +49,7 @@
#include <math.h>

struct skimmerPrimaryElectronSV {

// using MyBCs = o2::soa::Join<o2::aod::BCsWithTimestamps, o2::aod::BcSels>;
using MyBCs = o2::soa::Join<o2::aod::BCs, o2::aod::Timestamps>;
using MyBCs = o2::soa::Join<o2::aod::BCsWithTimestamps, o2::aod::BcSels>;
using MyCollisions = o2::soa::Join<o2::aod::Collisions, o2::aod::EvSels, o2::aod::EMEvSels>;
using MyCollisionsWithSWT = o2::soa::Join<MyCollisions, o2::aod::EMSWTriggerBitsTMP>;

Expand All @@ -62,30 +60,29 @@
using MyTracksMC = o2::soa::Join<MyTracks, o2::aod::McTrackLabels, o2::aod::mcTPCTuneOnData>;
using MyTrackMC = MyTracksMC::iterator;

using MyV0s = o2::soa::Join<o2::aod::V0Datas, o2::aod::V0Covs>;
using MyCascades = o2::soa::Join<o2::aod::CascDatas, o2::aod::CascCovs>;
// using MyV0s = o2::soa::Join<o2::aod::V0Datas, o2::aod::V0Covs>;
// using MyCascades = o2::soa::Join<o2::aod::CascDatas, o2::aod::CascCovs>;

struct : o2::framework::ConfigurableGroup {
o2::framework::Configurable<std::string> ccdburl{"ccdb-url", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};

Check failure on line 67 in PWGEM/Dilepton/TableProducer/skimmerPrimaryElectronSV.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable] 

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
o2::framework::Configurable<std::string> grpPath{"grpPath", "GLO/GRP/GRP", "Path of the grp file"};
o2::framework::Configurable<std::string> grpmagPath{"grpmagPath", "GLO/Config/GRPMagField", "CCDB path of the GRPMagField object"};
o2::framework::Configurable<std::string> lutPath{"lutPath", "GLO/Param/MatLUT", "Path of the Lut parametrization"};
o2::framework::Configurable<std::string> mVtxPath{"mVtxPath", "GLO/Calib/MeanVertex", "Path of the mean vertex file"};
} ccdbConfig;

o2::framework::Configurable<bool> doSCTwithTracks{"doSCTwithTracks", true, "flag to tag electrons with tracks"};
o2::framework::Configurable<bool> doSCTwithV0s{"doSCTwithV0s", false, "flag to tag electrons with v0s"};
o2::framework::Configurable<bool> doSCTwithCascades{"doSCTwithCascades", false, "flag to tag electrons with cascades"};
o2::framework::Configurable<bool> doSCTwithTracks{"doSCTwithTracks", false, "flag to tag electrons with tracks"};
// o2::framework::Configurable<bool> doSCTwithV0s{"doSCTwithV0s", false, "flag to tag electrons with v0s"};
// o2::framework::Configurable<bool> doSCTwithCascades{"doSCTwithCascades", false, "flag to tag electrons with cascades"};

o2::framework::Service<o2::ccdb::BasicCCDBManager> ccdb;
o2::ccdb::CcdbApi ccdbApi;
o2::framework::Service<o2::pid::tof::TOFResponse> mTOFResponse;

o2::framework::SliceCache cache;
o2::framework::Preslice<o2::aod::TracksIU> perCol_track = o2::aod::track::collisionId;
o2::framework::Preslice<o2::aod::TrackAssoc> trackIndicesPerCollision = o2::aod::track_association::collisionId;
o2::framework::Preslice<o2::aod::V0Datas> perCol_v0 = o2::aod::v0data::collisionId;
o2::framework::Preslice<o2::aod::CascDatas> perCol_casc = o2::aod::cascdata::collisionId;
// o2::framework::Preslice<o2::aod::V0Datas> perCol_v0 = o2::aod::v0data::collisionId;
// o2::framework::Preslice<o2::aod::CascDatas> perCol_casc = o2::aod::cascdata::collisionId;

void init(o2::framework::InitContext& initContext)
{
Expand All @@ -97,30 +94,26 @@
ccdb->setCaching(true);
ccdb->setLocalObjectValidityChecking();
ccdb->setFatalWhenNull(false);
// ccdbApi.init(ccdbConfig.ccdburl);
// mTOFResponse->initSetup(ccdb, initContext);

LOGF(info, "initializing electronModule");
electronModule.init(cfgEelectronCut, cfgEelectronPFCut, cfgHadronCut, cfgV0Cut, cfgCascadeCut, cfgDFeT, cfgDFeV0, cfgDFeC, initContext, ccdb, mTOFResponse, ccdbConfig.ccdburl.value);
// electronModule.setTOFResponse(mTOFResponse);
electronModule.init(cfgEelectronCut, cfgEelectronPFCut, cfgHadronCut, /*cfgV0Cut, cfgCascadeCut,*/ cfgDFeT, /*cfgDFeV0, cfgDFeC,*/ initContext, ccdb, mTOFResponse, ccdbConfig.ccdburl.value);
electronModule.addHistograms(mRegistry);
// electronModule.doPFB(doPF.value);

electronModule.doSCTwithTracks(doSCTwithTracks.value);
electronModule.doSCTwithV0s(doSCTwithV0s.value);
electronModule.doSCTwithCascades(doSCTwithCascades.value);
// electronModule.doSCTwithV0s(doSCTwithV0s.value);
// electronModule.doSCTwithCascades(doSCTwithCascades.value);
}

o2::pwgem::dilepton::utils::ElectronModule electronModule;
o2::pwgem::dilepton::utils::ElectronProducts products;
o2::pwgem::dilepton::utils::electronCut cfgEelectronCut;
o2::pwgem::dilepton::utils::electronPFCut cfgEelectronPFCut;
o2::pwgem::dilepton::utils::hadronCut cfgHadronCut;
o2::pwgem::dilepton::utils::v0Cut cfgV0Cut;
o2::pwgem::dilepton::utils::cascadeCut cfgCascadeCut;
// o2::pwgem::dilepton::utils::v0Cut cfgV0Cut;
// o2::pwgem::dilepton::utils::cascadeCut cfgCascadeCut;
o2::pwgem::dilepton::utils::cfgDFeT cfgDFeT;
o2::pwgem::dilepton::utils::cfgDFeV0 cfgDFeV0;
o2::pwgem::dilepton::utils::cfgDFeC cfgDFeC;
// o2::pwgem::dilepton::utils::cfgDFeV0 cfgDFeV0;
// o2::pwgem::dilepton::utils::cfgDFeC cfgDFeC;

o2::framework::HistogramRegistry mRegistry{"output", {}, o2::framework::OutputObjHandlingPolicy::AnalysisObject, false, false};
// ---------- for data ----------
Expand Down Expand Up @@ -174,78 +167,78 @@
mRunNumber = bc.runNumber();
}

//! type of V0. 0: built solely for cascades (does not pass standard V0 cut), 1: standard 2, 3: photon-like with TPC-only use. Regular analysis should always use type 1.
o2::framework::expressions::Filter v0Filter = o2::aod::v0data::v0Type == uint8_t(1) && o2::aod::v0data::v0cosPA > cfgV0Cut.cfg_min_cospa&& o2::aod::v0data::dcaV0daughters<cfgV0Cut.cfg_max_dca2legs && nabs(o2::aod::v0data::dcanegtopv)> cfgV0Cut.cfg_min_dcaxy&& nabs(o2::aod::v0data::dcanegtopv) > cfgV0Cut.cfg_min_dcaxy;
using filteredMyV0s = o2::soa::Filtered<MyV0s>;
// //! type of V0. 0: built solely for cascades (does not pass standard V0 cut), 1: standard 2, 3: photon-like with TPC-only use. Regular analysis should always use type 1.
// o2::framework::expressions::Filter v0Filter = o2::aod::v0data::v0Type == uint8_t(1) && o2::aod::v0data::v0cosPA > cfgV0Cut.cfg_min_cospa&& o2::aod::v0data::dcaV0daughters<cfgV0Cut.cfg_max_dca2legs && nabs(o2::aod::v0data::dcanegtopv)> cfgV0Cut.cfg_min_dcaxy&& nabs(o2::aod::v0data::dcanegtopv) > cfgV0Cut.cfg_min_dcaxy;
// using filteredMyV0s = o2::soa::Filtered<MyV0s>;

o2::framework::expressions::Filter cascadeFilter = nabs(o2::aod::cascdata::dcanegtopv) > cfgCascadeCut.cfg_min_dcaxy_v0leg&& nabs(o2::aod::cascdata::dcanegtopv) > cfgCascadeCut.cfg_min_dcaxy_v0leg&& nabs(o2::aod::cascdata::dcabachtopv) > cfgCascadeCut.cfg_min_dcaxy_bachelor&& o2::aod::cascdata::dcacascdaughters < cfgCascadeCut.cfg_max_dcadau&& o2::aod::cascdata::dcaV0daughters < cfgCascadeCut.cfg_max_dcadau_v0;
using filteredMyCascades = o2::soa::Filtered<MyCascades>;
// o2::framework::expressions::Filter cascadeFilter = nabs(o2::aod::cascdata::dcanegtopv) > cfgCascadeCut.cfg_min_dcaxy_v0leg&& nabs(o2::aod::cascdata::dcanegtopv) > cfgCascadeCut.cfg_min_dcaxy_v0leg&& nabs(o2::aod::cascdata::dcabachtopv) > cfgCascadeCut.cfg_min_dcaxy_bachelor&& o2::aod::cascdata::dcacascdaughters < cfgCascadeCut.cfg_max_dcadau&& o2::aod::cascdata::dcaV0daughters < cfgCascadeCut.cfg_max_dcadau_v0;
// using filteredMyCascades = o2::soa::Filtered<MyCascades>;

void processRec_SA(MyCollisions const& collisions, MyBCs const& bcs, MyTracks const& tracks, filteredMyV0s const& v0s, filteredMyCascades const& cascades)
void processRec_SA(MyCollisions const& collisions, MyBCs const& bcs, MyTracks const& tracks /*, filteredMyV0s const& v0s, filteredMyCascades const& cascades*/)
{
if (bcs.size() == 0) {
return;
}
auto bc = bcs.begin();
initCCDB(bc);
electronModule.processWithoutTTCA<false, false>(bcs, collisions, tracks, v0s, cascades, nullptr, products, mRegistry);
electronModule.processWithoutTTCA<false, false>(bcs, collisions, tracks, /*v0s, cascades,*/ nullptr, products, mRegistry);
}
PROCESS_SWITCH(skimmerPrimaryElectronSV, processRec_SA, "process reconstructed info only", true); // standalone

void processRec_TTCA(MyCollisions const& collisions, MyBCs const& bcs, MyTracks const& tracks, o2::aod::TrackAssoc const& trackIndices, filteredMyV0s const& v0s, filteredMyCascades const& cascades)
void processRec_TTCA(MyCollisions const& collisions, MyBCs const& bcs, MyTracks const& tracks, o2::aod::TrackAssoc const& trackIndices /*, filteredMyV0s const& v0s, filteredMyCascades const& cascades*/)
{
if (bcs.size() == 0) {
return;
}
auto bc = bcs.begin();
initCCDB(bc);
electronModule.processWithTTCA<false, false>(bcs, collisions, tracks, v0s, cascades, trackIndices, nullptr, products, mRegistry, cache, perCol_track, trackIndicesPerCollision, perCol_v0, perCol_casc);
electronModule.processWithTTCA<false, false>(bcs, collisions, tracks, /*v0s, cascades,*/ trackIndices, nullptr, products, mRegistry, cache, perCol_track, trackIndicesPerCollision /*, perCol_v0, perCol_casc*/);
}
PROCESS_SWITCH(skimmerPrimaryElectronSV, processRec_TTCA, "process reconstructed info only", false); // with TTCA

void processRec_SA_SWT(MyCollisionsWithSWT const& collisions, MyBCs const& bcs, MyTracks const& tracks, filteredMyV0s const& v0s, filteredMyCascades const& cascades)
void processRec_SA_SWT(MyCollisionsWithSWT const& collisions, MyBCs const& bcs, MyTracks const& tracks /*, filteredMyV0s const& v0s, filteredMyCascades const& cascades*/)
{
if (bcs.size() == 0) {
return;
}
auto bc = bcs.begin();
initCCDB(bc);
electronModule.processWithoutTTCA<false, true>(bcs, collisions, tracks, v0s, cascades, nullptr, products, mRegistry);
electronModule.processWithoutTTCA<false, true>(bcs, collisions, tracks, /*v0s, cascades,*/ nullptr, products, mRegistry);
}
PROCESS_SWITCH(skimmerPrimaryElectronSV, processRec_SA_SWT, "process reconstructed info only", false); // standalone with swt

void processRec_TTCA_SWT(MyCollisionsWithSWT const& collisions, MyBCs const& bcs, MyTracks const& tracks, o2::aod::TrackAssoc const& trackIndices, filteredMyV0s const& v0s, filteredMyCascades const& cascades)
void processRec_TTCA_SWT(MyCollisionsWithSWT const& collisions, MyBCs const& bcs, MyTracks const& tracks, o2::aod::TrackAssoc const& trackIndices /*, filteredMyV0s const& v0s, filteredMyCascades const& cascades*/)
{
if (bcs.size() == 0) {
return;
}
auto bc = bcs.begin();
initCCDB(bc);
electronModule.processWithTTCA<false, true>(bcs, collisions, tracks, v0s, cascades, trackIndices, nullptr, products, mRegistry, cache, perCol_track, trackIndicesPerCollision, perCol_v0, perCol_casc);
electronModule.processWithTTCA<false, true>(bcs, collisions, tracks, /*v0s, cascades,*/ trackIndices, nullptr, products, mRegistry, cache, perCol_track, trackIndicesPerCollision /*, perCol_v0, perCol_casc*/);
}
PROCESS_SWITCH(skimmerPrimaryElectronSV, processRec_TTCA_SWT, "process reconstructed info only", false); // with TTCA with swt

// ---------- for MC ----------

void processMC_SA(o2::soa::Join<MyCollisions, o2::aod::McCollisionLabels> const& collisions, MyBCs const& bcs, MyTracksMC const& tracks, filteredMyV0s const& v0s, filteredMyCascades const& cascades, o2::aod::McParticles const& mcParticles)
void processMC_SA(o2::soa::Join<MyCollisions, o2::aod::McCollisionLabels> const& collisions, MyBCs const& bcs, MyTracksMC const& tracks, /*filteredMyV0s const& v0s, filteredMyCascades const& cascades,*/ o2::aod::McParticles const& mcParticles)
{
if (bcs.size() == 0) {
return;
}
auto bc = bcs.begin();
initCCDB(bc);
electronModule.processWithoutTTCA<true, false>(bcs, collisions, tracks, v0s, cascades, mcParticles, products, mRegistry);
electronModule.processWithoutTTCA<true, false>(bcs, collisions, tracks, /*v0s, cascades,*/ mcParticles, products, mRegistry);
}
PROCESS_SWITCH(skimmerPrimaryElectronSV, processMC_SA, "process reconstructed and MC info ", false); // without TTCA in MC

void processMC_TTCA(o2::soa::Join<MyCollisions, o2::aod::McCollisionLabels> const& collisions, MyBCs const& bcs, MyTracksMC const& tracks, o2::aod::TrackAssoc const& trackIndices, filteredMyV0s const& v0s, filteredMyCascades const& cascades, o2::aod::McParticles const& mcParticles)
void processMC_TTCA(o2::soa::Join<MyCollisions, o2::aod::McCollisionLabels> const& collisions, MyBCs const& bcs, MyTracksMC const& tracks, o2::aod::TrackAssoc const& trackIndices, /*filteredMyV0s const& v0s, filteredMyCascades const& cascades,*/ o2::aod::McParticles const& mcParticles)
{
if (bcs.size() == 0) {
return;
}
auto bc = bcs.begin();
initCCDB(bc);
electronModule.processWithTTCA<true, false>(bcs, collisions, tracks, v0s, cascades, trackIndices, mcParticles, products, mRegistry, cache, perCol_track, trackIndicesPerCollision, perCol_v0, perCol_casc);
electronModule.processWithTTCA<true, false>(bcs, collisions, tracks, /*v0s, cascades,*/ trackIndices, mcParticles, products, mRegistry, cache, perCol_track, trackIndicesPerCollision /*, perCol_v0, perCol_casc*/);
}
PROCESS_SWITCH(skimmerPrimaryElectronSV, processMC_TTCA, "process reconstructed info only", false); // with TTCA in MC
};
Expand Down Expand Up @@ -278,6 +271,6 @@
{
o2::pid::tof::TOFResponseImpl::metadataInfo.initMetadata(cfgc);
return o2::framework::WorkflowSpec{
adaptAnalysisTask<skimmerPrimaryElectronSV>(cfgc, o2::framework::TaskName{"skimmer-primary-electron-sv"}),

Check failure on line 274 in PWGEM/Dilepton/TableProducer/skimmerPrimaryElectronSV.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-task] 

Device names skimmer-primary-electron-sv and skimmer-primary-electron-s-v generated from the specified task name skimmer-primary-electron-sv and from the struct name skimmerPrimaryElectronSV, respectively, differ in hyphenation. Consider fixing capitalisation of the struct name to SkimmerPrimaryElectronSv and removing TaskName.
adaptAnalysisTask<associateAmbiguousElectron>(cfgc, o2::framework::TaskName{"associate-ambiguous-electron"})};

Check failure on line 275 in PWGEM/Dilepton/TableProducer/skimmerPrimaryElectronSV.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-task] 

Specified task name associate-ambiguous-electron and the struct name associateAmbiguousElectron produce the same device name associate-ambiguous-electron. TaskName is redundant.
}
Loading
Loading