Skip to content

Commit d245b2b

Browse files
a-m-andrushkoa-m-andrushko
authored
Merge branch 'AliceO2Group:master' into helicity_task
2 parents c0ca740 + d6e0c77 commit d245b2b

27 files changed

+2257
-1247
lines changed

‎EventFiltering/PWGEM/EMPhotonFilter.cxx‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ struct EMPhotonFilter {
131131
return false;
132132
}
133133

134-
if (track.pt() < minpt || abs(track.eta()) > maxeta) {
134+
if (track.pt() < minpt || std::fabs(track.eta()) > maxeta) {
135135
return false;
136136
}
137137

@@ -161,7 +161,7 @@ struct EMPhotonFilter {
161161
dca_3d = 999.f;
162162
} else {
163163
float chi2 = (track.dcaXY() * track.dcaXY() * track.cZZ() + track.dcaZ() * track.dcaZ() * track.cYY() - 2. * track.dcaXY() * track.dcaZ() * track.cZY()) / det;
164-
dca_3d = std::sqrt(std::abs(chi2) / 2.);
164+
dca_3d = std::sqrt(std::fabs(chi2) / 2.);
165165
}
166166
if (dca_3d > dca_3d_sigma_max) {
167167
return false;
@@ -177,23 +177,23 @@ struct EMPhotonFilter {
177177
template <uint8_t system, typename TCollisions, typename TPhotons1, typename TPhotons2, typename TPhotons3, typename TV0Legs, typename TDielectrons, typename TEMPrimaryElectrons>
178178
void runFilter(TCollisions const& collisions, TPhotons1 const& photons1, TPhotons2 const& photons2, TPhotons3 const& /*photons3*/, TV0Legs const&, TDielectrons const& dielectrons, TEMPrimaryElectrons const& /*emprimaryelectrons*/)
179179
{
180-
for (auto& collision : collisions) {
180+
for (const auto& collision : collisions) {
181181
mHistManager.fill(HIST("hEventCounter"), 1.);
182182
bool keepEvent[kNtrg]{false};
183183

184184
if (collision.sel8()) {
185185
mHistManager.fill(HIST("hEventCounter"), 2.);
186186
}
187-
if (abs(collision.posZ()) < 10.f) {
187+
if (std::fabs(collision.posZ()) < 10.f) {
188188
mHistManager.fill(HIST("hEventCounter"), 3.);
189189
}
190190
if (collision.selection_bit(aod::evsel::kNoTimeFrameBorder)) {
191191
mHistManager.fill(HIST("hEventCounter"), 4.);
192192
}
193-
if (collision.sel8() && abs(collision.posZ()) < 10.f) {
193+
if (collision.sel8() && std::fabs(collision.posZ()) < 10.f) {
194194
mHistManager.fill(HIST("hEventCounter"), 5.);
195195
}
196-
if (collision.sel8() && abs(collision.posZ()) < 10.f && collision.selection_bit(aod::evsel::kNoTimeFrameBorder)) {
196+
if (collision.sel8() && std::fabs(collision.posZ()) < 10.f && collision.selection_bit(aod::evsel::kNoTimeFrameBorder)) {
197197
mHistManager.fill(HIST("hEventCounter"), 6.);
198198
}
199199

@@ -206,7 +206,7 @@ struct EMPhotonFilter {
206206
auto photons1_per_coll = photons1.sliceBy(perCollision_pcm, collision.globalIndex());
207207
auto dielectrons_per_coll = dielectrons.sliceBy(perCollision_ee, collision.globalIndex());
208208

209-
for (auto& v0photon : photons1_per_coll) {
209+
for (const auto& v0photon : photons1_per_coll) {
210210
auto pos_sv = v0photon.template posTrack_as<TV0Legs>();
211211
auto ele_sv = v0photon.template negTrack_as<TV0Legs>();
212212
if (!isSelectedSecondary(pos_sv) || !isSelectedSecondary(ele_sv)) {
@@ -218,7 +218,7 @@ struct EMPhotonFilter {
218218
}
219219
} // end of single v0 photon loop
220220

221-
for (auto& [g1, g2] : combinations(CombinationsFullIndexPolicy(photons1_per_coll, dielectrons_per_coll))) {
221+
for (const auto& [g1, g2] : combinations(CombinationsFullIndexPolicy(photons1_per_coll, dielectrons_per_coll))) {
222222
auto pos_sv = g1.template posTrack_as<TV0Legs>();
223223
auto ele_sv = g1.template negTrack_as<TV0Legs>();
224224
if (!isSelectedSecondary(pos_sv) || !isSelectedSecondary(ele_sv)) {
@@ -282,8 +282,8 @@ struct EMPhotonFilter {
282282
if (clu2.trackdist() < 1.) { // select neutral clusters. Disp, Ncell cuts?
283283
continue;
284284
}
285-
double m = pow(clu.e() + clu2.e(), 2) - pow(clu.px() + clu2.px(), 2) -
286-
pow(clu.py() + clu2.py(), 2) - pow(clu.pz() + clu2.pz(), 2);
285+
double m = std::pow(clu.e() + clu2.e(), 2) - std::pow(clu.px() + clu2.px(), 2) -
286+
std::pow(clu.py() + clu2.py(), 2) - std::pow(clu.pz() + clu2.pz(), 2);
287287
if (m > ePair * ePair) {
288288
keepEvent[kPHOS_Pair] |= true;
289289
break;

‎PWGCF/FemtoUniverse/Core/FemtoUniverseCascadeSelection.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -252,9 +252,9 @@ class FemtoUniverseCascadeSelection
252252
femto_universe_selection::kLowerLimit, // cascade tran rad min
253253
femto_universe_selection::kUpperLimit, // cascade tran rad max
254254
femto_universe_selection::kUpperLimit, // cascade maximum distance of decay vertex to PV
255-
femto_universe_selection::kLowerLimit, // DCA pos to PV max
256-
femto_universe_selection::kLowerLimit, // DCA neg to PV max
257-
femto_universe_selection::kLowerLimit, // DCA bach to PV max
255+
femto_universe_selection::kLowerLimit, // DCA pos to PV min
256+
femto_universe_selection::kLowerLimit, // DCA neg to PV min
257+
femto_universe_selection::kLowerLimit, // DCA bach to PV min
258258
femto_universe_selection::kLowerLimit, // DCA v0 to PV max
259259
femto_universe_selection::kLowerLimit, // v0 mass min
260260
femto_universe_selection::kUpperLimit, // v0 mass max
@@ -276,10 +276,10 @@ class FemtoUniverseCascadeSelection
276276
"Minimum cascade transverse radius (cm)",
277277
"Maximum cascade transverse radius (cm)",
278278
"Maximum distance of cascade from primary vertex",
279-
"Maximum DCA of positive track form primary vertex",
280-
"Maximum DCA of negative track form primary vertex",
281-
"Maximum DCA of bachelor track form primary vertex",
282-
"Maximum DCA of v0 form primary vertex",
279+
"Minimum DCA of positive track form primary vertex",
280+
"Minimum DCA of negative track form primary vertex",
281+
"Minimum DCA of bachelor track form primary vertex",
282+
"Minimum DCA of v0 form primary vertex",
283283
"Minimum V0 mass",
284284
"Maximum V0 mass"}; ///< Helper information for the
285285
///< different selections

‎PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackCascadeExtended.cxx‎

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ struct femtoUniversePairTaskTrackCascadeExtended {
5454
ConfigurableAxis confChildTempFitVarBins{"confChildTempFitVarBins", {300, -0.15, 0.15}, "V0 child: binning of the TempFitVar in the pT vs. TempFitVar plot"};
5555
Configurable<float> confCascInvMassLowLimit{"confCascInvMassLowLimit", 1.315, "Lower limit of the Casc invariant mass"};
5656
Configurable<float> confCascInvMassUpLimit{"confCascInvMassUpLimit", 1.325, "Upper limit of the Casc invariant mass"};
57-
Configurable<float> confCascTranRad{"confCascTranRad", 0.5, "Cascade transverse radius"};
5857

5958
Configurable<float> confNSigmaTPCPion{"confNSigmaTPCPion", 4, "NSigmaTPCPion"};
6059
Configurable<float> confNSigmaTPCProton{"confNSigmaTPCProton", 4, "NSigmaTPCProton"};
@@ -299,29 +298,17 @@ struct femtoUniversePairTaskTrackCascadeExtended {
299298
}
300299
}
301300

302-
void processCascades([[maybe_unused]] const FilteredFDCollision& col, const FemtoFullParticles& parts, const aod::FDCascParticles& fdcascs)
301+
void processCascadeQA([[maybe_unused]] const FilteredFDCollision& col, const FemtoFullParticles& parts, const aod::FDCascParticles& fdcascs)
303302
{
304-
// auto groupCascs = cascs->sliceByCached(aod::femtouniverseparticle::fdCollisionId, col.globalIndex(), cache);
305-
// const int multCol = col.multNtr();
306-
307303
for (const auto& casc : fdcascs) {
308304
const auto& part = casc.fdParticle_as<FemtoFullParticles>();
309305
rXiQA.fill(HIST("hMassXi"), part.mLambda());
310306

311-
// if (!invMCascade(casc.mLambda(), casc.mAntiLambda()))
312-
// continue;
313-
314307
const auto& posChild = parts.iteratorAt(part.globalIndex() - 3 - parts.begin().globalIndex());
315308
const auto& negChild = parts.iteratorAt(part.globalIndex() - 2 - parts.begin().globalIndex());
316309
const auto& bachelor = parts.iteratorAt(part.globalIndex() - 1 - parts.begin().globalIndex());
317310

318-
// if (casc.transRadius() < confCascTranRad)
319-
// continue;
320-
// std::cout<<std::endl;
321-
// std::cout<<"TYPE:"<<std::endl;
322-
// std::cout<<casc.partType()<<std::endl;
323311
// nSigma selection for daughter and bachelor tracks
324-
325312
if (part.sign() < 0) {
326313
if (std::abs(posChild.tpcNSigmaPr()) > confNSigmaTPCProton) {
327314
continue;
@@ -356,13 +343,9 @@ struct femtoUniversePairTaskTrackCascadeExtended {
356343
rXiQA.fill(HIST("hDcaBachtoPV"), casc.dcabachtopv());
357344
rXiQA.fill(HIST("hDcaV0toPV"), casc.dcav0topv());
358345
rXiQA.fill(HIST("hInvMpT"), part.pt(), part.mLambda());
359-
360-
posChildHistos.fillQA<false, true>(posChild);
361-
negChildHistos.fillQA<false, true>(negChild);
362-
bachHistos.fillQABase<false, true>(bachelor, HIST("hBachelor"));
363346
}
364347
}
365-
PROCESS_SWITCH(femtoUniversePairTaskTrackCascadeExtended, processCascades, "Enable processing cascades", false);
348+
PROCESS_SWITCH(femtoUniversePairTaskTrackCascadeExtended, processCascadeQA, "Enable processing cascades", false);
366349

367350
template <class T>
368351
using hasSigma = decltype(std::declval<T&>().tpcNSigmaStorePr());
@@ -383,11 +366,6 @@ struct femtoUniversePairTaskTrackCascadeExtended {
383366
if (!invMCascade(part.mLambda(), part.mAntiLambda(), confCascType1)) /// mLambda stores Xi mass, mAntiLambda stores Omega mass
384367
continue;
385368

386-
if constexpr (std::experimental::is_detected<hasSigma, typename TableType::iterator>::value)
387-
cascQAHistos.fillQA<false, true>(part);
388-
else
389-
cascQAHistos.fillQA<false, false>(part);
390-
391369
const auto& posChild = parts.iteratorAt(part.globalIndex() - 3 - parts.begin().globalIndex());
392370
const auto& negChild = parts.iteratorAt(part.globalIndex() - 2 - parts.begin().globalIndex());
393371
const auto& bachelor = parts.iteratorAt(part.globalIndex() - 1 - parts.begin().globalIndex());
@@ -409,6 +387,11 @@ struct femtoUniversePairTaskTrackCascadeExtended {
409387
if ((!confCheckTOFBachelorOnly && ((posChild.pidCut() & (8u << CascChildTable[confCascType1][0])) == 0 || (negChild.pidCut() & (8u << CascChildTable[confCascType1][1])) == 0)) || (bachelor.pidCut() & (8u << CascChildTable[confCascType1][2])) == 0)
410388
continue;
411389

390+
if constexpr (std::experimental::is_detected<hasSigma, typename TableType::iterator>::value)
391+
cascQAHistos.fillQA<false, true>(part);
392+
else
393+
cascQAHistos.fillQA<false, false>(part);
394+
412395
posChildHistos.fillQA<false, false>(posChild);
413396
negChildHistos.fillQA<false, false>(negChild);
414397
bachHistos.fillQABase<false, false>(bachelor, HIST("hBachelor"));

‎PWGDQ/TableProducer/tableMaker.cxx‎

Lines changed: 37 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -24,45 +24,48 @@
2424
#include <string>
2525
#include <vector>
2626
// other includes
27-
#include "Framework/AnalysisTask.h"
28-
#include "Framework/AnalysisDataModel.h"
29-
#include "Framework/ASoAHelpers.h"
30-
#include "Framework/DataTypes.h"
31-
#include "Framework/runDataProcessing.h"
32-
#include "CCDB/BasicCCDBManager.h"
33-
#include "Common/DataModel/Multiplicity.h"
34-
#include "Common/DataModel/EventSelection.h"
35-
#include "Common/DataModel/Centrality.h"
27+
#include "PWGDQ/Core/AnalysisCompositeCut.h"
28+
#include "PWGDQ/Core/AnalysisCut.h"
29+
#include "PWGDQ/Core/CutsLibrary.h"
30+
#include "PWGDQ/Core/HistogramManager.h"
31+
#include "PWGDQ/Core/HistogramsLibrary.h"
32+
#include "PWGDQ/Core/VarManager.h"
33+
#include "PWGDQ/DataModel/ReducedInfoTables.h"
34+
3635
#include "Common/CCDB/TriggerAliases.h"
36+
#include "Common/DataModel/Centrality.h"
37+
#include "Common/DataModel/CollisionAssociationTables.h"
38+
#include "Common/DataModel/EventSelection.h"
39+
#include "Common/DataModel/FwdTrackReAlignTables.h"
40+
#include "Common/DataModel/MftmchMatchingML.h"
41+
#include "Common/DataModel/Multiplicity.h"
3742
#include "Common/DataModel/PIDResponse.h"
3843
#include "Common/DataModel/TrackSelectionTables.h"
39-
#include "Common/DataModel/MftmchMatchingML.h"
40-
#include "Common/DataModel/FwdTrackReAlignTables.h"
41-
#include "PWGDQ/DataModel/ReducedInfoTables.h"
42-
#include "PWGDQ/Core/VarManager.h"
43-
#include "PWGDQ/Core/HistogramManager.h"
44-
#include "PWGDQ/Core/AnalysisCut.h"
45-
#include "PWGDQ/Core/AnalysisCompositeCut.h"
46-
#include "PWGDQ/Core/HistogramsLibrary.h"
47-
#include "PWGDQ/Core/CutsLibrary.h"
48-
#include "DataFormatsGlobalTracking/RecoContainerCreateTracksVariadic.h"
49-
#include "DetectorsVertexing/VertexTrackMatcher.h"
50-
#include "ReconstructionDataFormats/PrimaryVertex.h"
51-
#include "ReconstructionDataFormats/VtxTrackIndex.h"
52-
#include "ReconstructionDataFormats/VtxTrackRef.h"
53-
#include "DataFormatsITSMFT/ROFRecord.h"
44+
#include "EventFiltering/Zorro.h"
45+
46+
#include "CCDB/BasicCCDBManager.h"
5447
#include "CommonDataFormat/InteractionRecord.h"
55-
#include "DetectorsVertexing/PVertexerParams.h"
56-
#include "MathUtils/Primitive2D.h"
5748
#include "DataFormatsGlobalTracking/RecoContainer.h"
58-
#include "Common/DataModel/CollisionAssociationTables.h"
49+
#include "DataFormatsGlobalTracking/RecoContainerCreateTracksVariadic.h"
50+
#include "DataFormatsITSMFT/ROFRecord.h"
5951
#include "DataFormatsParameters/GRPMagField.h"
6052
#include "DataFormatsParameters/GRPObject.h"
53+
#include "DetectorsBase/GeometryManager.h"
54+
#include "DetectorsBase/Propagator.h"
55+
#include "DetectorsVertexing/PVertexerParams.h"
56+
#include "DetectorsVertexing/VertexTrackMatcher.h"
6157
#include "Field/MagneticField.h"
58+
#include "Framework/ASoAHelpers.h"
59+
#include "Framework/AnalysisDataModel.h"
60+
#include "Framework/AnalysisTask.h"
61+
#include "Framework/DataTypes.h"
62+
#include "Framework/runDataProcessing.h"
63+
#include "MathUtils/Primitive2D.h"
64+
#include "ReconstructionDataFormats/PrimaryVertex.h"
65+
#include "ReconstructionDataFormats/VtxTrackIndex.h"
66+
#include "ReconstructionDataFormats/VtxTrackRef.h"
67+
6268
#include "TGeoGlobalMagField.h"
63-
#include "DetectorsBase/Propagator.h"
64-
#include "DetectorsBase/GeometryManager.h"
65-
#include "EventFiltering/Zorro.h"
6669

6770
using std::cout;
6871
using std::endl;
@@ -191,15 +194,15 @@ struct TableMaker {
191194

192195
struct : ConfigurableGroup {
193196
Configurable<bool> fConfigRunZorro{"cfgRunZorro", false, "Enable event selection with zorro"};
194-
Configurable<string> fConfigZorroTrigMask{"cfgZorroTriggerMask", "fDiMuon", "DQ Trigger masks: fSingleE,fLMeeIMR,fLMeeHMR,fDiElectron,fSingleMuLow,fSingleMuHigh,fDiMuon"};
197+
Configurable<std::string> fConfigZorroTrigMask{"cfgZorroTriggerMask", "fDiMuon", "DQ Trigger masks: fSingleE,fLMeeIMR,fLMeeHMR,fDiElectron,fSingleMuLow,fSingleMuHigh,fDiMuon"};
195198
Configurable<bool> fConfigRunZorroSel{"cfgRunZorroSel", false, "Select events with trigger mask"};
196199
Configurable<uint64_t> fBcTolerance{"cfgBcTolerance", 100, "Number of BCs of margin for software triggers"};
197200
} useZorro;
198201

199202
struct : ConfigurableGroup {
200-
Configurable<string> fConfigCcdbUrl{"useCCDBConfigurations.ccdb-url", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
201-
Configurable<string> fConfigCcdbPathTPC{"useCCDBConfigurations.ccdb-path-tpc", "Users/z/zhxiong/TPCPID/PostCalib", "base path to the ccdb object"};
202-
Configurable<string> fConfigCcdbPathZorro{"useCCDBConfigurations.ccdb-path-zorro", "/Users/m/mpuccio/EventFiltering/OTS/", "base path to the ccdb object for zorro"};
203+
Configurable<std::string> fConfigCcdbUrl{"useCCDBConfigurations.ccdb-url", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
204+
Configurable<std::string> fConfigCcdbPathTPC{"useCCDBConfigurations.ccdb-path-tpc", "Users/z/zhxiong/TPCPID/PostCalib", "base path to the ccdb object"};
205+
Configurable<std::string> fConfigCcdbPathZorro{"useCCDBConfigurations.ccdb-path-zorro", "/Users/m/mpuccio/EventFiltering/OTS/", "base path to the ccdb object for zorro"};
203206
} useCCDBConfigurations;
204207

205208
Configurable<int64_t> fConfigNoLaterThan{"ccdb-no-later-than", std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count(), "latest acceptable timestamp of creation for the object"};

‎PWGDQ/TableProducer/tableMaker_withAssoc.cxx‎

Lines changed: 37 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -23,46 +23,49 @@
2323
#include <string>
2424
#include <vector>
2525
// other includes
26-
#include "Framework/AnalysisTask.h"
27-
#include "Framework/AnalysisDataModel.h"
28-
#include "Framework/ASoAHelpers.h"
29-
#include "Framework/DataTypes.h"
30-
#include "Framework/runDataProcessing.h"
31-
#include "CCDB/BasicCCDBManager.h"
32-
#include "Common/DataModel/Multiplicity.h"
33-
#include "Common/DataModel/EventSelection.h"
34-
#include "Common/DataModel/Centrality.h"
26+
#include "PWGDQ/Core/AnalysisCompositeCut.h"
27+
#include "PWGDQ/Core/AnalysisCut.h"
28+
#include "PWGDQ/Core/CutsLibrary.h"
29+
#include "PWGDQ/Core/HistogramManager.h"
30+
#include "PWGDQ/Core/HistogramsLibrary.h"
31+
#include "PWGDQ/Core/VarManager.h"
32+
#include "PWGDQ/DataModel/ReducedInfoTables.h"
33+
3534
#include "Common/CCDB/TriggerAliases.h"
35+
#include "Common/Core/TableHelper.h"
36+
#include "Common/DataModel/Centrality.h"
37+
#include "Common/DataModel/CollisionAssociationTables.h"
38+
#include "Common/DataModel/EventSelection.h"
39+
#include "Common/DataModel/FwdTrackReAlignTables.h"
40+
#include "Common/DataModel/MftmchMatchingML.h"
41+
#include "Common/DataModel/Multiplicity.h"
3642
#include "Common/DataModel/PIDResponse.h"
3743
#include "Common/DataModel/TrackSelectionTables.h"
38-
#include "Common/DataModel/MftmchMatchingML.h"
39-
#include "Common/DataModel/FwdTrackReAlignTables.h"
40-
#include "Common/Core/TableHelper.h"
41-
#include "PWGDQ/DataModel/ReducedInfoTables.h"
42-
#include "PWGDQ/Core/VarManager.h"
43-
#include "PWGDQ/Core/HistogramManager.h"
44-
#include "PWGDQ/Core/AnalysisCut.h"
45-
#include "PWGDQ/Core/AnalysisCompositeCut.h"
46-
#include "PWGDQ/Core/HistogramsLibrary.h"
47-
#include "PWGDQ/Core/CutsLibrary.h"
48-
#include "DataFormatsGlobalTracking/RecoContainerCreateTracksVariadic.h"
49-
#include "DetectorsVertexing/VertexTrackMatcher.h"
50-
#include "ReconstructionDataFormats/PrimaryVertex.h"
51-
#include "ReconstructionDataFormats/VtxTrackIndex.h"
52-
#include "ReconstructionDataFormats/VtxTrackRef.h"
53-
#include "DataFormatsITSMFT/ROFRecord.h"
44+
#include "EventFiltering/Zorro.h"
45+
46+
#include "CCDB/BasicCCDBManager.h"
5447
#include "CommonDataFormat/InteractionRecord.h"
55-
#include "DetectorsVertexing/PVertexerParams.h"
56-
#include "MathUtils/Primitive2D.h"
5748
#include "DataFormatsGlobalTracking/RecoContainer.h"
58-
#include "Common/DataModel/CollisionAssociationTables.h"
49+
#include "DataFormatsGlobalTracking/RecoContainerCreateTracksVariadic.h"
50+
#include "DataFormatsITSMFT/ROFRecord.h"
5951
#include "DataFormatsParameters/GRPMagField.h"
6052
#include "DataFormatsParameters/GRPObject.h"
53+
#include "DetectorsBase/GeometryManager.h"
54+
#include "DetectorsBase/Propagator.h"
55+
#include "DetectorsVertexing/PVertexerParams.h"
56+
#include "DetectorsVertexing/VertexTrackMatcher.h"
6157
#include "Field/MagneticField.h"
58+
#include "Framework/ASoAHelpers.h"
59+
#include "Framework/AnalysisDataModel.h"
60+
#include "Framework/AnalysisTask.h"
61+
#include "Framework/DataTypes.h"
62+
#include "Framework/runDataProcessing.h"
63+
#include "MathUtils/Primitive2D.h"
64+
#include "ReconstructionDataFormats/PrimaryVertex.h"
65+
#include "ReconstructionDataFormats/VtxTrackIndex.h"
66+
#include "ReconstructionDataFormats/VtxTrackRef.h"
67+
6268
#include "TGeoGlobalMagField.h"
63-
#include "DetectorsBase/Propagator.h"
64-
#include "DetectorsBase/GeometryManager.h"
65-
#include "EventFiltering/Zorro.h"
6669

6770
using namespace o2;
6871
using namespace o2::framework;
@@ -225,9 +228,9 @@ struct TableMaker {
225228

226229
// CCDB connection configurables
227230
struct : ConfigurableGroup {
228-
Configurable<string> fConfigCcdbUrl{"ccdb-url", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
229-
Configurable<string> fConfigCcdbPathTPC{"ccdb-path-tpc", "Users/z/zhxiong/TPCPID/PostCalib", "base path to the ccdb object"};
230-
Configurable<string> fConfigCcdbPathZorro{"ccdb-path-zorro", "/Users/m/mpuccio/EventFiltering/OTS/Chunked/", "base path to the ccdb object for zorro"};
231+
Configurable<std::string> fConfigCcdbUrl{"ccdb-url", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
232+
Configurable<std::string> fConfigCcdbPathTPC{"ccdb-path-tpc", "Users/z/zhxiong/TPCPID/PostCalib", "base path to the ccdb object"};
233+
Configurable<std::string> fConfigCcdbPathZorro{"ccdb-path-zorro", "/Users/m/mpuccio/EventFiltering/OTS/Chunked/", "base path to the ccdb object for zorro"};
231234
Configurable<int64_t> fConfigNoLaterThan{"ccdb-no-later-than", std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count(), "latest acceptable timestamp of creation for the object"};
232235
Configurable<std::string> fConfigGeoPath{"geoPath", "GLO/Config/GeometryAligned", "Path of the geometry file"};
233236
Configurable<std::string> fConfigGrpMagPath{"grpmagPath", "GLO/Config/GRPMagField", "CCDB path of the GRPMagField object"};

0 commit comments

Comments
 (0)