Skip to content

Commit 91e8fea

Browse files
vkuceravkucera
authored
[PWGDQ,PWGEM,PWGLF] Use fully qualified names for std::string in configurables (#12384)
1 parent 42dbd4f commit 91e8fea

15 files changed

+513
-477
lines changed

‎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"};

‎PWGDQ/Tasks/TagAndProbe.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,15 +116,15 @@ struct AnalysisTagAndProbe {
116116
OutputObj<THashList> fOutputList{"output"};
117117

118118
struct : ConfigurableGroup {
119-
Configurable<string> muon{"cfgMuonCuts", "", "Comma separated list of muon cuts"};
119+
Configurable<std::string> muon{"cfgMuonCuts", "", "Comma separated list of muon cuts"};
120120
// TODO: Add pair cuts via JSON
121121
} fConfigCuts;
122122

123123
Configurable<std::string> fConfigAddSEPHistogram{"cfgAddSEPHistogram", "", "Comma separated list of histograms"};
124124
Configurable<bool> fConfigQA{"cfgQA", true, "If true, fill output histograms"};
125125

126126
struct : ConfigurableGroup {
127-
Configurable<string> url{"ccdb-url", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
127+
Configurable<std::string> url{"ccdb-url", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
128128
Configurable<std::string> grpMagPath{"grpmagPath", "GLO/Config/GRPMagField", "CCDB path of the GRPMagField object"};
129129
Configurable<std::string> lutPath{"lutPath", "GLO/Param/MatLUT", "Path of the Lut parametrization"};
130130
Configurable<std::string> geoPath{"geoPath", "GLO/Config/GeometryAligned", "Path of the geometry file"};

‎PWGDQ/Tasks/dqCorrelation.cxx‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,44 +11,45 @@
1111
/// @author Victor Valencia
1212
// Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
1313
//
14-
#include <iostream>
15-
#include <vector>
16-
#include <algorithm>
17-
#include <TH1F.h>
18-
#include <TH3F.h>
19-
#include <THashList.h>
20-
#include <TList.h>
21-
#include <TString.h>
22-
#include <TRandom3.h>
23-
#include <cmath>
24-
25-
#include "CCDB/BasicCCDBManager.h"
26-
#include "DataFormatsParameters/GRPObject.h"
27-
#include "Framework/runDataProcessing.h"
28-
#include "Framework/AnalysisTask.h"
29-
#include "Framework/AnalysisDataModel.h"
30-
#include "Framework/ASoAHelpers.h"
3114
#include "PWGCF/GenericFramework/Core/FlowContainer.h"
32-
#include "PWGCF/GenericFramework/Core/GFWCumulant.h"
3315
#include "PWGCF/GenericFramework/Core/GFW.h"
16+
#include "PWGCF/GenericFramework/Core/GFWCumulant.h"
17+
#include "PWGCF/GenericFramework/Core/GFWPowerArray.h"
3418
#include "PWGCF/GenericFramework/Core/GFWWeights.h"
35-
#include "PWGDQ/DataModel/ReducedInfoTables.h"
36-
#include "PWGDQ/Core/VarManager.h"
37-
#include "PWGDQ/Core/HistogramManager.h"
38-
#include "PWGDQ/Core/MixingHandler.h"
39-
#include "PWGDQ/Core/AnalysisCut.h"
4019
#include "PWGDQ/Core/AnalysisCompositeCut.h"
41-
#include "PWGDQ/Core/HistogramsLibrary.h"
20+
#include "PWGDQ/Core/AnalysisCut.h"
4221
#include "PWGDQ/Core/CutsLibrary.h"
22+
#include "PWGDQ/Core/HistogramManager.h"
23+
#include "PWGDQ/Core/HistogramsLibrary.h"
24+
#include "PWGDQ/Core/MixingHandler.h"
4325
#include "PWGDQ/Core/MixingLibrary.h"
26+
#include "PWGDQ/Core/VarManager.h"
27+
#include "PWGDQ/DataModel/ReducedInfoTables.h"
28+
29+
#include "CCDB/BasicCCDBManager.h"
4430
#include "DataFormatsParameters/GRPMagField.h"
45-
#include "Field/MagneticField.h"
46-
#include "TGeoGlobalMagField.h"
47-
#include "DetectorsBase/Propagator.h"
31+
#include "DataFormatsParameters/GRPObject.h"
4832
#include "DetectorsBase/GeometryManager.h"
33+
#include "DetectorsBase/Propagator.h"
34+
#include "Field/MagneticField.h"
35+
#include "Framework/ASoAHelpers.h"
36+
#include "Framework/AnalysisDataModel.h"
37+
#include "Framework/AnalysisTask.h"
38+
#include "Framework/runDataProcessing.h"
4939

50-
#include "PWGCF/GenericFramework/Core/GFWPowerArray.h"
40+
#include "TGeoGlobalMagField.h"
5141
#include "TProfile.h"
42+
#include <TH1F.h>
43+
#include <TH3F.h>
44+
#include <THashList.h>
45+
#include <TList.h>
46+
#include <TRandom3.h>
47+
#include <TString.h>
48+
49+
#include <algorithm>
50+
#include <cmath>
51+
#include <iostream>
52+
#include <vector>
5253

5354
using std::cout;
5455
using std::endl;
@@ -118,7 +119,7 @@ struct DqCumulantFlow {
118119
ConfigurableAxis axisMass{"axisMass", {40, 2, 4}, "mass axis for histograms"};
119120
Configurable<uint> fConfigNPow{"cfgNPow", 0, "Power of weights for Q vector"};
120121
// Configurables for the reference flow
121-
Configurable<string> fConfigTrackCuts{"cfgLeptonCuts", "jpsiO2MCdebugCuts2", "Comma separated list of barrel track cuts"};
122+
Configurable<std::string> fConfigTrackCuts{"cfgLeptonCuts", "jpsiO2MCdebugCuts2", "Comma separated list of barrel track cuts"};
122123
Configurable<float> fConfigCutPtMin{"cfgCutPtMin", 1.0f, "Minimal pT for tracks"};
123124
Configurable<float> fConfigCutPtMax{"cfgCutPtMax", 12.0f, "Maximal pT for tracks"};
124125
Configurable<float> fConfigCutEtaMin{"cfgCutEtaMin", -0.8f, "Eta min range for tracks"};

‎PWGDQ/Tasks/dqEfficiency.cxx‎

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,33 @@
1313
//
1414
// Analysis task for processing O2::DQ MC skimmed AODs
1515
//
16-
#include <iostream>
17-
#include <vector>
18-
#include <TMath.h>
19-
#include <TH1F.h>
20-
#include <THashList.h>
21-
#include <TString.h>
22-
#include <cstdio>
23-
#include <string>
24-
#include <memory>
25-
#include "Framework/runDataProcessing.h"
26-
#include "Framework/AnalysisTask.h"
27-
#include "Framework/AnalysisDataModel.h"
28-
#include "PWGDQ/DataModel/ReducedInfoTables.h"
29-
#include "PWGDQ/Core/VarManager.h"
30-
#include "PWGDQ/Core/HistogramManager.h"
31-
#include "PWGDQ/Core/AnalysisCut.h"
3216
#include "PWGDQ/Core/AnalysisCompositeCut.h"
33-
#include "PWGDQ/Core/HistogramsLibrary.h"
17+
#include "PWGDQ/Core/AnalysisCut.h"
3418
#include "PWGDQ/Core/CutsLibrary.h"
19+
#include "PWGDQ/Core/HistogramManager.h"
20+
#include "PWGDQ/Core/HistogramsLibrary.h"
3521
#include "PWGDQ/Core/MCSignal.h"
3622
#include "PWGDQ/Core/MCSignalLibrary.h"
23+
#include "PWGDQ/Core/VarManager.h"
24+
#include "PWGDQ/DataModel/ReducedInfoTables.h"
25+
3726
#include "CCDB/BasicCCDBManager.h"
3827
#include "DataFormatsParameters/GRPMagField.h"
3928
#include "DetectorsBase/GeometryManager.h"
29+
#include "Framework/AnalysisDataModel.h"
30+
#include "Framework/AnalysisTask.h"
31+
#include "Framework/runDataProcessing.h"
32+
33+
#include <TH1F.h>
34+
#include <THashList.h>
35+
#include <TMath.h>
36+
#include <TString.h>
37+
38+
#include <cstdio>
39+
#include <iostream>
40+
#include <memory>
41+
#include <string>
42+
#include <vector>
4043

4144
using std::cout;
4245
using std::endl;
@@ -1044,7 +1047,7 @@ struct AnalysisDileptonTrack {
10441047
o2::base::MatLayerCylSet* lut = nullptr;
10451048

10461049
// TODO: For now this is only used to determine the position in the filter bit map for the hadron cut
1047-
Configurable<string> fConfigTrackCuts{"cfgLeptonCuts", "", "Comma separated list of barrel track cuts"};
1050+
Configurable<std::string> fConfigTrackCuts{"cfgLeptonCuts", "", "Comma separated list of barrel track cuts"};
10481051
Configurable<bool> fConfigFillCandidateTable{"cfgFillCandidateTable", false, "Produce a single flat tables with all relevant information dilepton-track candidates"};
10491052
Configurable<std::string> ccdburl{"ccdburl", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
10501053
Configurable<bool> fCorrFullGeo{"cfgCorrFullGeo", false, "Use full geometry to correct for MCS effects in track propagation"};

0 commit comments

Comments
 (0)