Skip to content

Commit c9ae1bd

Browse files
authored
Merge branch 'AliceO2Group:master' into master
2 parents 2482f3e + f67ba3f commit c9ae1bd

File tree

166 files changed

+14293
-5956
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+14293
-5956
lines changed

CODEOWNERS

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -29,40 +29,41 @@
2929
/EventFiltering/PWGCF @alibuild @lauraser @mpuccio @lietava
3030
/EventFiltering/PWGMM @alibuild @aortizve @mpuccio @lietava
3131
/EventFiltering/PWGJE @alibuild @fkrizek @nzardosh @mpuccio @lietava
32-
/PWGCF @alibuild @saganatt @victor-gonzalez @zchochul @lgraczykCern @prchakra @lauraser @ariedel-cern @EmilGorm @otonvd @shouqiye @glromane
33-
/PWGCF/Core @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul @lgraczykCern @prchakra @lauraser @ariedel-cern @EmilGorm @otonvd @shouqiye @glromane
34-
/PWGCF/DataModel @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul @lgraczykCern @prchakra @lauraser @ariedel-cern @EmilGorm @otonvd @shouqiye @glromane
35-
/PWGCF/TableProducer @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul @lgraczykCern @prchakra @lauraser @ariedel-cern @EmilGorm @otonvd @shouqiye @glromane
36-
/PWGCF/Tasks @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul @lgraczykCern @prchakra @lauraser @ariedel-cern @EmilGorm @otonvd @shouqiye @glromane
37-
/PWGDQ @alibuild @iarsene @mcoquet642 @lucamicheletti93
32+
33+
/PWGCF @alibuild @victor-gonzalez @zchochul @lgraczykCern @prchakra @lauraser @ariedel-cern @EmilGorm @otonvd @shouqiye @glromane
34+
/PWGCF/Core @alibuild @jgrosseo @victor-gonzalez @zchochul @lgraczykCern @prchakra @lauraser @ariedel-cern @EmilGorm @otonvd @shouqiye @glromane
35+
/PWGCF/DataModel @alibuild @jgrosseo @victor-gonzalez @zchochul @lgraczykCern @prchakra @lauraser @ariedel-cern @EmilGorm @otonvd @shouqiye @glromane
36+
/PWGCF/TableProducer @alibuild @jgrosseo @victor-gonzalez @zchochul @lgraczykCern @prchakra @lauraser @ariedel-cern @EmilGorm @otonvd @shouqiye @glromane
37+
/PWGCF/Tasks @alibuild @jgrosseo @victor-gonzalez @zchochul @lgraczykCern @prchakra @lauraser @ariedel-cern @EmilGorm @otonvd @shouqiye @glromane
38+
/PWGDQ @alibuild @iarsene @mcoquet642 @lucamicheletti93 @XiaozhiBai
3839
/PWGEM @alibuild @feisenhu @dsekihat @ivorobye
3940
/PWGEM/Dilepton @alibuild @mikesas @rbailhac @dsekihat @ivorobye @feisenhu @hscheid
4041
/PWGEM/PhotonMeson @alibuild @mikesas @rbailhac @m-c-danisch @novitzky @mhemmer-cern @dsekihat
4142
/PWGHF @alibuild @vkucera @fcolamar @fgrosa @fcatalan92 @mfaggin @mmazzilli @deepathoms @NicoleBastid @hahassan7 @jpxrk @apalasciano @zhangbiao-phy @gluparel @stefanopolitano
4243
# PWG-LF
43-
/PWGLF @alibuild @sustripathy @skundu692
44-
/PWGLF/DataModel @alibuild @sustripathy @skundu692 @gbencedi @abmodak @fmazzasc @maciacco @dmallick2 @smaff92 @ercolessi @romainschotter
45-
/PWGLF/Tasks/GlobalEventProperties @alibuild @sustripathy @skundu692 @gbencedi @abmodak @omvazque
46-
/PWGLF/TableProducer/GlobalEventProperties @alibuild @sustripathy @skundu692 @gbencedi @abmodak @omvazque
47-
/PWGLF/Tasks/Nuspex @alibuild @sustripathy @skundu692 @fmazzasc @maciacco
48-
/PWGLF/TableProducer/Nuspex @alibuild @sustripathy @skundu692 @fmazzasc @maciacco
49-
/PWGLF/Tasks/Resonances @alibuild @sustripathy @skundu692 @dmallick2 @smaff92
50-
/PWGLF/TableProducer/Resonances @alibuild @sustripathy @skundu692 @dmallick2 @smaff92
51-
/PWGLF/Tasks/Strangeness @alibuild @sustripathy @skundu692 @ercolessi @romainschotter
52-
/PWGLF/TableProducer/Strangeness @alibuild @sustripathy @skundu692 @ercolessi @romainschotter
53-
/PWGLF/Utils @alibuild @sustripathy @skundu692 @gbencedi @abmodak @fmazzasc @maciacco @dmallick2 @smaff92 @ercolessi @romainschotter
44+
/PWGLF @alibuild @sustripathy @skundu692 @mpuccio
45+
/PWGLF/DataModel @alibuild @sustripathy @skundu692 @mpuccio @gbencedi @abmodak @fmazzasc @maciacco @dmallick2 @smaff92 @ercolessi @romainschotter
46+
/PWGLF/Tasks/GlobalEventProperties @alibuild @sustripathy @skundu692 @mpuccio @gbencedi @abmodak @omvazque
47+
/PWGLF/TableProducer/GlobalEventProperties @alibuild @sustripathy @skundu692 @mpuccio @gbencedi @abmodak @omvazque
48+
/PWGLF/Tasks/Nuspex @alibuild @sustripathy @skundu692 @mpuccio @fmazzasc @maciacco
49+
/PWGLF/TableProducer/Nuspex @alibuild @sustripathy @skundu692 @mpuccio @fmazzasc @maciacco
50+
/PWGLF/Tasks/Resonances @alibuild @sustripathy @skundu692 @mpuccio @dmallick2 @smaff92
51+
/PWGLF/TableProducer/Resonances @alibuild @sustripathy @skundu692 @mpuccio @dmallick2 @smaff92
52+
/PWGLF/Tasks/Strangeness @alibuild @sustripathy @skundu692 @mpuccio @ercolessi @romainschotter
53+
/PWGLF/TableProducer/Strangeness @alibuild @sustripathy @mpuccio @skundu692 @ercolessi @romainschotter
54+
/PWGLF/Utils @alibuild @sustripathy @skundu692 @mpuccio @gbencedi @abmodak @fmazzasc @maciacco @dmallick2 @smaff92 @ercolessi @romainschotter
5455

55-
# PWG-MM
56+
# PWG-MM (fused with LF, LF conveners included. Directories to be merged in the future)
5657
/PWGMM @alibuild @sustripathy @skundu692 @aalkin @jgcn
5758
/PWGMM/Mult @alibuild @sustripathy @skundu692 @aalkin @aortizve @ddobrigk @gbencedi @jgcn
58-
/PWGMM/Lumi @alibuild @aalkin @jgcn
59-
/PWGMM/UE @alibuild @aalkin @aortizve @jgcn
59+
/PWGMM/Lumi @alibuild @sustripathy @skundu692 @aalkin @jgcn @gbencedi @abmodak
60+
/PWGMM/UE @alibuild @sustripathy @skundu692 @aalkin @aortizve @jgcn
6061

6162
/PWGUD @alibuild @pbuehler @nystrand @rolavick
6263
/PWGJE @alibuild @lhavener @maoyx @nzardosh @fjonasALICE @mfasDa @mhemmer-cern
6364
/Tools/PIDML @alibuild @saganatt
6465
/Tools/ML @alibuild @fcatalan92 @fmazzasc
65-
/Tutorials/PWGCF @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul
66+
/Tutorials/PWGCF @alibuild @jgrosseo @victor-gonzalez @zchochul
6667
/Tutorials/PWGDQ @alibuild @iarsene @mcoquet @lucamicheletti93
6768
/Tutorials/PWGEM @alibuild @mikesas @rbailhac @dsekihat @ivorobye @feisenhu
6869
/Tutorials/PWGHF @alibuild @vkucera @fcolamar @fgrosa @gluparel

Common/CCDB/RCTSelectionFlags.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,13 @@
1818
#define COMMON_CCDB_RCTSELECTIONFLAGS_H_
1919

2020
#include <CommonUtils/EnumFlags.h>
21-
#include <Rtypes.h>
21+
2222
#include <TMath.h>
2323

24-
#include <stdexcept>
24+
#include <Rtypes.h>
25+
2526
#include <algorithm>
27+
#include <stdexcept>
2628
#include <string>
2729
#include <vector>
2830

@@ -98,7 +100,7 @@ class RCTFlagsChecker : public o2::utils::EnumFlags<RCTSelectionFlags>
98100
// - "CBT"
99101
// - "CBT_hadronPID"
100102
// - "CBT_electronPID"
101-
// - "CCBT_calo"
103+
// - "CBT_calo"
102104
// - "CBT_muon"
103105
// - "CBT_muon_glo"
104106
// The checkZDC boolean flag controls whether to iclude the ZDC quality in all the pre-defined selections (for Pb-Pb data)
@@ -121,7 +123,7 @@ class RCTFlagsChecker : public o2::utils::EnumFlags<RCTSelectionFlags>
121123
// - "CBT"
122124
// - "CBT_hadronPID"
123125
// - "CBT_electronPID"
124-
// - "CCBT_calo"
126+
// - "CBT_calo"
125127
// - "CBT_muon"
126128
// - "CBT_muon_glo"
127129
// The checkZDC boolean flag controls whether to iclude the ZDC quality in all the pre-defined selections (for Pb-Pb data)

Common/TableProducer/CMakeLists.txt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,6 @@ o2physics_add_dpl_workflow(timestamp
5959
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
6060
COMPONENT_NAME Analysis)
6161

62-
o2physics_add_dpl_workflow(timestamptester
63-
SOURCES timestampTester.cxx
64-
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
65-
COMPONENT_NAME Analysis)
66-
6762
o2physics_add_dpl_workflow(weak-decay-indices
6863
SOURCES weakDecayIndices.cxx
6964
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
@@ -84,11 +79,6 @@ o2physics_add_dpl_workflow(track-dca-cov-filler-run2
8479
PUBLIC_LINK_LIBRARIES O2::DetectorsBase O2Physics::AnalysisCore
8580
COMPONENT_NAME Analysis)
8681

87-
o2physics_add_dpl_workflow(track-propagation-tester
88-
SOURCES trackPropagationTester.cxx
89-
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::trackSelectionRequest
90-
COMPONENT_NAME Analysis)
91-
9282
o2physics_add_dpl_workflow(calo-clusters
9383
SOURCES caloClusterProducer.cxx
9484
PUBLIC_LINK_LIBRARIES O2::DataFormatsPHOS O2::PHOSBase O2::PHOSReconstruction O2Physics::DataModel

Common/TableProducer/PID/CMakeLists.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,16 @@ o2physics_add_dpl_workflow(pid-tpc-service
4848
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::MLCore O2Physics::AnalysisCCDB
4949
COMPONENT_NAME Analysis)
5050

51+
o2physics_add_dpl_workflow(pid-tpc-service-run2
52+
SOURCES pidTPCServiceRun2.cxx
53+
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::MLCore O2Physics::AnalysisCCDB
54+
COMPONENT_NAME Analysis)
55+
56+
o2physics_add_dpl_workflow(pid-tpc-service-run3
57+
SOURCES pidTPCServiceRun3.cxx
58+
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::MLCore O2Physics::AnalysisCCDB
59+
COMPONENT_NAME Analysis)
60+
5161
o2physics_add_dpl_workflow(pid-tpc-base
5262
SOURCES pidTPCBase.cxx
5363
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::AnalysisCCDB

Common/TableProducer/PID/pidTPCService.cxx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333
#include "MetadataHelper.h"
3434
#include "TableHelper.h"
3535
#include "pidTPCBase.h"
36-
#include "pidTPCModule.h"
3736

3837
#include "Common/Core/PID/TPCPIDResponse.h"
3938
#include "Common/DataModel/EventSelection.h"
4039
#include "Common/DataModel/Multiplicity.h"
4140
#include "Common/DataModel/PIDResponseTPC.h"
41+
#include "Common/Tools/PID/pidTPCModule.h"
4242
#include "Tools/ML/model.h"
4343

4444
#include "CCDB/BasicCCDBManager.h"
@@ -98,9 +98,15 @@ struct pidTpcService {
9898
pidTPC.process(ccdb, ccdbApi, bcs, collisions, tracks, static_cast<TObject*>(nullptr), products);
9999
}
100100

101+
void processTracksMCIU(soa::Join<aod::Collisions, aod::EvSels> const& collisions, soa::Join<aod::TracksIU, aod::TracksCovIU, aod::TracksExtra, aod::McTrackLabels> const& tracks, aod::BCsWithTimestamps const& bcs, aod::McParticles const&)
102+
{
103+
pidTPC.process(ccdb, ccdbApi, bcs, collisions, tracks, static_cast<TObject*>(nullptr), products);
104+
}
105+
101106
PROCESS_SWITCH(pidTpcService, processTracks, "Process Tracks", false);
102107
PROCESS_SWITCH(pidTpcService, processTracksMC, "Process Tracks in MC (enables tune-on-data)", false);
103-
PROCESS_SWITCH(pidTpcService, processTracksIU, "Process TracksIU (experimental)", true);
108+
PROCESS_SWITCH(pidTpcService, processTracksIU, "Process TracksIU (Run 3)", true);
109+
PROCESS_SWITCH(pidTpcService, processTracksMCIU, "Process TracksIUMC (Run 3)", false);
104110
};
105111

106112
//****************************************************************************************
Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
2+
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
3+
// All rights not expressly granted are reserved.
4+
//
5+
// This software is distributed under the terms of the GNU General Public
6+
// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
7+
//
8+
// In applying this license CERN does not waive the privileges and immunities
9+
// granted to it by virtue of its status as an Intergovernmental Organization
10+
// or submit itself to any jurisdiction.
11+
12+
/// \file trackPropagationTester.cxx
13+
/// \brief testing ground for track propagation
14+
/// \author ALICE
15+
16+
//===============================================================
17+
//
18+
// Modularized version of TPC PID task
19+
//
20+
//===============================================================
21+
22+
#include <map>
23+
#include <memory>
24+
#include <string>
25+
#include <utility>
26+
#include <vector>
27+
// ROOT includes
28+
#include "TFile.h"
29+
#include "TRandom.h"
30+
#include "TSystem.h"
31+
32+
// O2 includes
33+
#include "MetadataHelper.h"
34+
#include "TableHelper.h"
35+
#include "pidTPCBase.h"
36+
37+
#include "Common/Core/PID/TPCPIDResponse.h"
38+
#include "Common/DataModel/EventSelection.h"
39+
#include "Common/DataModel/Multiplicity.h"
40+
#include "Common/DataModel/PIDResponseTPC.h"
41+
#include "Common/Tools/PID/pidTPCModule.h"
42+
#include "Tools/ML/model.h"
43+
44+
#include "CCDB/BasicCCDBManager.h"
45+
#include "CCDB/CcdbApi.h"
46+
#include "Framework/ASoAHelpers.h"
47+
#include "Framework/AnalysisDataModel.h"
48+
#include "Framework/AnalysisTask.h"
49+
#include "Framework/runDataProcessing.h"
50+
#include "ReconstructionDataFormats/Track.h"
51+
52+
using namespace o2;
53+
using namespace o2::framework;
54+
55+
o2::common::core::MetadataHelper metadataInfo; // Metadata helper
56+
57+
struct pidTpcServiceRun2 {
58+
59+
// CCDB boilerplate declarations
60+
o2::framework::Configurable<std::string> ccdburl{"ccdburl", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
61+
Service<o2::ccdb::BasicCCDBManager> ccdb;
62+
o2::ccdb::CcdbApi ccdbApi;
63+
64+
o2::aod::pid::pidTPCProducts products;
65+
o2::aod::pid::pidTPCConfigurables pidTPCopts;
66+
o2::aod::pid::pidTPCModule pidTPC;
67+
68+
void init(o2::framework::InitContext& initContext)
69+
{
70+
// CCDB boilerplate init
71+
ccdb->setURL(ccdburl.value);
72+
ccdb->setFatalWhenNull(false); // manual fallback in case ccdb entry empty
73+
ccdb->setCaching(true);
74+
ccdb->setLocalObjectValidityChecking();
75+
ccdb->setCreatedNotAfter(std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count());
76+
ccdbApi.init(ccdburl.value);
77+
78+
// task-specific
79+
pidTPC.init(ccdb, ccdbApi, initContext, pidTPCopts, metadataInfo);
80+
}
81+
82+
void processTracks(soa::Join<aod::Collisions, aod::EvSels> const& collisions, soa::Join<aod::Tracks, aod::TracksExtra> const& tracks, aod::BCsWithTimestamps const& bcs)
83+
{
84+
pidTPC.process(ccdb, ccdbApi, bcs, collisions, tracks, static_cast<TObject*>(nullptr), products);
85+
}
86+
void processTracksWithTracksQA(soa::Join<aod::Collisions, aod::EvSels> const& collisions, soa::Join<aod::Tracks, aod::TracksExtra> const& tracks, aod::BCsWithTimestamps const& bcs, aod::TracksQA const& tracksQA)
87+
{
88+
pidTPC.process(ccdb, ccdbApi, bcs, collisions, tracks, tracksQA, products);
89+
}
90+
91+
void processTracksMC(soa::Join<aod::Collisions, aod::EvSels> const& collisions, soa::Join<aod::Tracks, aod::TracksExtra, aod::McTrackLabels> const& tracks, aod::BCsWithTimestamps const& bcs, aod::McParticles const&)
92+
{
93+
pidTPC.process(ccdb, ccdbApi, bcs, collisions, tracks, static_cast<TObject*>(nullptr), products);
94+
}
95+
96+
PROCESS_SWITCH(pidTpcServiceRun2, processTracks, "Process Tracks", true);
97+
PROCESS_SWITCH(pidTpcServiceRun2, processTracksMC, "Process Tracks in MC (enables tune-on-data)", false);
98+
};
99+
100+
//****************************************************************************************
101+
/**
102+
* Workflow definition.
103+
*/
104+
//****************************************************************************************
105+
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
106+
{
107+
// Parse the metadata for later too
108+
metadataInfo.initMetadata(cfgc);
109+
110+
WorkflowSpec workflow{adaptAnalysisTask<pidTpcServiceRun2>(cfgc)};
111+
return workflow;
112+
}
Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
2+
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
3+
// All rights not expressly granted are reserved.
4+
//
5+
// This software is distributed under the terms of the GNU General Public
6+
// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
7+
//
8+
// In applying this license CERN does not waive the privileges and immunities
9+
// granted to it by virtue of its status as an Intergovernmental Organization
10+
// or submit itself to any jurisdiction.
11+
12+
/// \file trackPropagationTester.cxx
13+
/// \brief testing ground for track propagation
14+
/// \author ALICE
15+
16+
//===============================================================
17+
//
18+
// Modularized version of TPC PID task
19+
//
20+
//===============================================================
21+
22+
#include <map>
23+
#include <memory>
24+
#include <string>
25+
#include <utility>
26+
#include <vector>
27+
// ROOT includes
28+
#include "TFile.h"
29+
#include "TRandom.h"
30+
#include "TSystem.h"
31+
32+
// O2 includes
33+
#include "MetadataHelper.h"
34+
#include "TableHelper.h"
35+
#include "pidTPCBase.h"
36+
37+
#include "Common/Core/PID/TPCPIDResponse.h"
38+
#include "Common/DataModel/EventSelection.h"
39+
#include "Common/DataModel/Multiplicity.h"
40+
#include "Common/DataModel/PIDResponseTPC.h"
41+
#include "Common/Tools/PID/pidTPCModule.h"
42+
#include "Tools/ML/model.h"
43+
44+
#include "CCDB/BasicCCDBManager.h"
45+
#include "CCDB/CcdbApi.h"
46+
#include "Framework/ASoAHelpers.h"
47+
#include "Framework/AnalysisDataModel.h"
48+
#include "Framework/AnalysisTask.h"
49+
#include "Framework/runDataProcessing.h"
50+
#include "ReconstructionDataFormats/Track.h"
51+
52+
using namespace o2;
53+
using namespace o2::framework;
54+
55+
o2::common::core::MetadataHelper metadataInfo; // Metadata helper
56+
57+
struct pidTpcServiceRun3 {
58+
59+
// CCDB boilerplate declarations
60+
o2::framework::Configurable<std::string> ccdburl{"ccdburl", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
61+
Service<o2::ccdb::BasicCCDBManager> ccdb;
62+
o2::ccdb::CcdbApi ccdbApi;
63+
64+
o2::aod::pid::pidTPCProducts products;
65+
o2::aod::pid::pidTPCConfigurables pidTPCopts;
66+
o2::aod::pid::pidTPCModule pidTPC;
67+
68+
void init(o2::framework::InitContext& initContext)
69+
{
70+
// CCDB boilerplate init
71+
ccdb->setURL(ccdburl.value);
72+
ccdb->setFatalWhenNull(false); // manual fallback in case ccdb entry empty
73+
ccdb->setCaching(true);
74+
ccdb->setLocalObjectValidityChecking();
75+
ccdb->setCreatedNotAfter(std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count());
76+
ccdbApi.init(ccdburl.value);
77+
78+
// task-specific
79+
pidTPC.init(ccdb, ccdbApi, initContext, pidTPCopts, metadataInfo);
80+
}
81+
82+
void processTracksIU(soa::Join<aod::Collisions, aod::EvSels> const& collisions, soa::Join<aod::TracksIU, aod::TracksCovIU, aod::TracksExtra> const& tracks, aod::BCsWithTimestamps const& bcs)
83+
{
84+
pidTPC.process(ccdb, ccdbApi, bcs, collisions, tracks, static_cast<TObject*>(nullptr), products);
85+
}
86+
87+
void processTracksMCIU(soa::Join<aod::Collisions, aod::EvSels> const& collisions, soa::Join<aod::TracksIU, aod::TracksCovIU, aod::TracksExtra, aod::McTrackLabels> const& tracks, aod::BCsWithTimestamps const& bcs, aod::McParticles const&)
88+
{
89+
pidTPC.process(ccdb, ccdbApi, bcs, collisions, tracks, static_cast<TObject*>(nullptr), products);
90+
}
91+
92+
PROCESS_SWITCH(pidTpcServiceRun3, processTracksIU, "Process TracksIU (Run 3)", true);
93+
PROCESS_SWITCH(pidTpcServiceRun3, processTracksMCIU, "Process TracksIUMC (Run 3)", false);
94+
};
95+
96+
//****************************************************************************************
97+
/**
98+
* Workflow definition.
99+
*/
100+
//****************************************************************************************
101+
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
102+
{
103+
// Parse the metadata for later too
104+
metadataInfo.initMetadata(cfgc);
105+
106+
WorkflowSpec workflow{adaptAnalysisTask<pidTpcServiceRun3>(cfgc)};
107+
return workflow;
108+
}

Common/TableProducer/eventSelectionService.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include "Common/Core/trackUtilities.h"
2525
#include "Common/DataModel/TrackSelectionTables.h"
26-
#include "Common/Tools/EventSelectionTools.h"
26+
#include "Common/Tools/EventSelectionModule.h"
2727
#include "Common/Tools/timestampModule.h"
2828

2929
#include "CCDB/BasicCCDBManager.h"

0 commit comments

Comments
 (0)