Skip to content

Commit 2fc1af6

Browse files
dsekihatalibuild
dsekihat
and
alibuild
authored
[PWGEM/Dilepton] reduce dependencies of skimmerPrimaryElectronSV.cxx (#16636)
Co-authored-by: ALICE Action Bot <alibuild@cern.ch>
1 parent 81e8bd8 commit 2fc1af6

2 files changed

Lines changed: 897 additions & 916 deletions

File tree

‎PWGEM/Dilepton/TableProducer/skimmerPrimaryElectronSV.cxx‎

Lines changed: 34 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
1616
#include "PWGEM/Dilepton/Utils/ElectronModule.h"
17-
#include "PWGLF/DataModel/LFStrangenessTables.h"
17+
// #include "PWGLF/DataModel/LFStrangenessTables.h"
1818

1919
#include "Common/DataModel/CollisionAssociationTables.h"
2020
#include "Common/DataModel/EventSelection.h"
@@ -39,7 +39,7 @@
3939
#include <Framework/runDataProcessing.h>
4040
#include <PID/PIDTOFParamService.h>
4141

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

4444
#include <cmath>
4545
#include <cstdint>
@@ -49,9 +49,7 @@
4949
#include <math.h>
5050

5151
struct skimmerPrimaryElectronSV {
52-
53-
// using MyBCs = o2::soa::Join<o2::aod::BCsWithTimestamps, o2::aod::BcSels>;
54-
using MyBCs = o2::soa::Join<o2::aod::BCs, o2::aod::Timestamps>;
52+
using MyBCs = o2::soa::Join<o2::aod::BCsWithTimestamps, o2::aod::BcSels>;
5553
using MyCollisions = o2::soa::Join<o2::aod::Collisions, o2::aod::EvSels, o2::aod::EMEvSels>;
5654
using MyCollisionsWithSWT = o2::soa::Join<MyCollisions, o2::aod::EMSWTriggerBitsTMP>;
5755

@@ -62,8 +60,8 @@ struct skimmerPrimaryElectronSV {
6260
using MyTracksMC = o2::soa::Join<MyTracks, o2::aod::McTrackLabels, o2::aod::mcTPCTuneOnData>;
6361
using MyTrackMC = MyTracksMC::iterator;
6462

65-
using MyV0s = o2::soa::Join<o2::aod::V0Datas, o2::aod::V0Covs>;
66-
using MyCascades = o2::soa::Join<o2::aod::CascDatas, o2::aod::CascCovs>;
63+
// using MyV0s = o2::soa::Join<o2::aod::V0Datas, o2::aod::V0Covs>;
64+
// using MyCascades = o2::soa::Join<o2::aod::CascDatas, o2::aod::CascCovs>;
6765

6866
struct : o2::framework::ConfigurableGroup {
6967
o2::framework::Configurable<std::string> ccdburl{"ccdb-url", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
@@ -73,19 +71,18 @@ struct skimmerPrimaryElectronSV {
7371
o2::framework::Configurable<std::string> mVtxPath{"mVtxPath", "GLO/Calib/MeanVertex", "Path of the mean vertex file"};
7472
} ccdbConfig;
7573

76-
o2::framework::Configurable<bool> doSCTwithTracks{"doSCTwithTracks", true, "flag to tag electrons with tracks"};
77-
o2::framework::Configurable<bool> doSCTwithV0s{"doSCTwithV0s", false, "flag to tag electrons with v0s"};
78-
o2::framework::Configurable<bool> doSCTwithCascades{"doSCTwithCascades", false, "flag to tag electrons with cascades"};
74+
o2::framework::Configurable<bool> doSCTwithTracks{"doSCTwithTracks", false, "flag to tag electrons with tracks"};
75+
// o2::framework::Configurable<bool> doSCTwithV0s{"doSCTwithV0s", false, "flag to tag electrons with v0s"};
76+
// o2::framework::Configurable<bool> doSCTwithCascades{"doSCTwithCascades", false, "flag to tag electrons with cascades"};
7977

8078
o2::framework::Service<o2::ccdb::BasicCCDBManager> ccdb;
81-
o2::ccdb::CcdbApi ccdbApi;
8279
o2::framework::Service<o2::pid::tof::TOFResponse> mTOFResponse;
8380

8481
o2::framework::SliceCache cache;
8582
o2::framework::Preslice<o2::aod::TracksIU> perCol_track = o2::aod::track::collisionId;
8683
o2::framework::Preslice<o2::aod::TrackAssoc> trackIndicesPerCollision = o2::aod::track_association::collisionId;
87-
o2::framework::Preslice<o2::aod::V0Datas> perCol_v0 = o2::aod::v0data::collisionId;
88-
o2::framework::Preslice<o2::aod::CascDatas> perCol_casc = o2::aod::cascdata::collisionId;
84+
// o2::framework::Preslice<o2::aod::V0Datas> perCol_v0 = o2::aod::v0data::collisionId;
85+
// o2::framework::Preslice<o2::aod::CascDatas> perCol_casc = o2::aod::cascdata::collisionId;
8986

9087
void init(o2::framework::InitContext& initContext)
9188
{
@@ -97,30 +94,26 @@ struct skimmerPrimaryElectronSV {
9794
ccdb->setCaching(true);
9895
ccdb->setLocalObjectValidityChecking();
9996
ccdb->setFatalWhenNull(false);
100-
// ccdbApi.init(ccdbConfig.ccdburl);
101-
// mTOFResponse->initSetup(ccdb, initContext);
10297

10398
LOGF(info, "initializing electronModule");
104-
electronModule.init(cfgEelectronCut, cfgEelectronPFCut, cfgHadronCut, cfgV0Cut, cfgCascadeCut, cfgDFeT, cfgDFeV0, cfgDFeC, initContext, ccdb, mTOFResponse, ccdbConfig.ccdburl.value);
105-
// electronModule.setTOFResponse(mTOFResponse);
99+
electronModule.init(cfgEelectronCut, cfgEelectronPFCut, cfgHadronCut, /*cfgV0Cut, cfgCascadeCut,*/ cfgDFeT, /*cfgDFeV0, cfgDFeC,*/ initContext, ccdb, mTOFResponse, ccdbConfig.ccdburl.value);
106100
electronModule.addHistograms(mRegistry);
107-
// electronModule.doPFB(doPF.value);
108101

109102
electronModule.doSCTwithTracks(doSCTwithTracks.value);
110-
electronModule.doSCTwithV0s(doSCTwithV0s.value);
111-
electronModule.doSCTwithCascades(doSCTwithCascades.value);
103+
// electronModule.doSCTwithV0s(doSCTwithV0s.value);
104+
// electronModule.doSCTwithCascades(doSCTwithCascades.value);
112105
}
113106

114107
o2::pwgem::dilepton::utils::ElectronModule electronModule;
115108
o2::pwgem::dilepton::utils::ElectronProducts products;
116109
o2::pwgem::dilepton::utils::electronCut cfgEelectronCut;
117110
o2::pwgem::dilepton::utils::electronPFCut cfgEelectronPFCut;
118111
o2::pwgem::dilepton::utils::hadronCut cfgHadronCut;
119-
o2::pwgem::dilepton::utils::v0Cut cfgV0Cut;
120-
o2::pwgem::dilepton::utils::cascadeCut cfgCascadeCut;
112+
// o2::pwgem::dilepton::utils::v0Cut cfgV0Cut;
113+
// o2::pwgem::dilepton::utils::cascadeCut cfgCascadeCut;
121114
o2::pwgem::dilepton::utils::cfgDFeT cfgDFeT;
122-
o2::pwgem::dilepton::utils::cfgDFeV0 cfgDFeV0;
123-
o2::pwgem::dilepton::utils::cfgDFeC cfgDFeC;
115+
// o2::pwgem::dilepton::utils::cfgDFeV0 cfgDFeV0;
116+
// o2::pwgem::dilepton::utils::cfgDFeC cfgDFeC;
124117

125118
o2::framework::HistogramRegistry mRegistry{"output", {}, o2::framework::OutputObjHandlingPolicy::AnalysisObject, false, false};
126119
// ---------- for data ----------
@@ -174,78 +167,78 @@ struct skimmerPrimaryElectronSV {
174167
mRunNumber = bc.runNumber();
175168
}
176169

177-
//! 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.
178-
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;
179-
using filteredMyV0s = o2::soa::Filtered<MyV0s>;
170+
// //! 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.
171+
// 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;
172+
// using filteredMyV0s = o2::soa::Filtered<MyV0s>;
180173

181-
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;
182-
using filteredMyCascades = o2::soa::Filtered<MyCascades>;
174+
// 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;
175+
// using filteredMyCascades = o2::soa::Filtered<MyCascades>;
183176

184-
void processRec_SA(MyCollisions const& collisions, MyBCs const& bcs, MyTracks const& tracks, filteredMyV0s const& v0s, filteredMyCascades const& cascades)
177+
void processRec_SA(MyCollisions const& collisions, MyBCs const& bcs, MyTracks const& tracks /*, filteredMyV0s const& v0s, filteredMyCascades const& cascades*/)
185178
{
186179
if (bcs.size() == 0) {
187180
return;
188181
}
189182
auto bc = bcs.begin();
190183
initCCDB(bc);
191-
electronModule.processWithoutTTCA<false, false>(bcs, collisions, tracks, v0s, cascades, nullptr, products, mRegistry);
184+
electronModule.processWithoutTTCA<false, false>(bcs, collisions, tracks, /*v0s, cascades,*/ nullptr, products, mRegistry);
192185
}
193186
PROCESS_SWITCH(skimmerPrimaryElectronSV, processRec_SA, "process reconstructed info only", true); // standalone
194187

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

206-
void processRec_SA_SWT(MyCollisionsWithSWT const& collisions, MyBCs const& bcs, MyTracks const& tracks, filteredMyV0s const& v0s, filteredMyCascades const& cascades)
199+
void processRec_SA_SWT(MyCollisionsWithSWT const& collisions, MyBCs const& bcs, MyTracks const& tracks /*, filteredMyV0s const& v0s, filteredMyCascades const& cascades*/)
207200
{
208201
if (bcs.size() == 0) {
209202
return;
210203
}
211204
auto bc = bcs.begin();
212205
initCCDB(bc);
213-
electronModule.processWithoutTTCA<false, true>(bcs, collisions, tracks, v0s, cascades, nullptr, products, mRegistry);
206+
electronModule.processWithoutTTCA<false, true>(bcs, collisions, tracks, /*v0s, cascades,*/ nullptr, products, mRegistry);
214207
}
215208
PROCESS_SWITCH(skimmerPrimaryElectronSV, processRec_SA_SWT, "process reconstructed info only", false); // standalone with swt
216209

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

228221
// ---------- for MC ----------
229222

230-
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)
223+
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)
231224
{
232225
if (bcs.size() == 0) {
233226
return;
234227
}
235228
auto bc = bcs.begin();
236229
initCCDB(bc);
237-
electronModule.processWithoutTTCA<true, false>(bcs, collisions, tracks, v0s, cascades, mcParticles, products, mRegistry);
230+
electronModule.processWithoutTTCA<true, false>(bcs, collisions, tracks, /*v0s, cascades,*/ mcParticles, products, mRegistry);
238231
}
239232
PROCESS_SWITCH(skimmerPrimaryElectronSV, processMC_SA, "process reconstructed and MC info ", false); // without TTCA in MC
240233

241-
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)
234+
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)
242235
{
243236
if (bcs.size() == 0) {
244237
return;
245238
}
246239
auto bc = bcs.begin();
247240
initCCDB(bc);
248-
electronModule.processWithTTCA<true, false>(bcs, collisions, tracks, v0s, cascades, trackIndices, mcParticles, products, mRegistry, cache, perCol_track, trackIndicesPerCollision, perCol_v0, perCol_casc);
241+
electronModule.processWithTTCA<true, false>(bcs, collisions, tracks, /*v0s, cascades,*/ trackIndices, mcParticles, products, mRegistry, cache, perCol_track, trackIndicesPerCollision /*, perCol_v0, perCol_casc*/);
249242
}
250243
PROCESS_SWITCH(skimmerPrimaryElectronSV, processMC_TTCA, "process reconstructed info only", false); // with TTCA in MC
251244
};

0 commit comments

Comments
 (0)