Skip to content

Commit 2ff2570

Browse files
jesgumjesgum
committed
Rename table
1 parent 1f24399 commit 2ff2570

3 files changed

Lines changed: 21 additions & 21 deletions

File tree

‎Common/DataModel/Centrality.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ DECLARE_SOA_COLUMN(CentFDDM, centFDDM, float); //! Run 3 cent.
3838
DECLARE_SOA_COLUMN(CentNTPV, centNTPV, float); //! Run 3 cent. from the number of tracks contributing to the PV
3939
DECLARE_SOA_COLUMN(CentNGlobal, centNGlobal, float); //! Run 3 cent. from the number of global tracks
4040
DECLARE_SOA_COLUMN(CentMFT, centMFT, float); //! Run 3 cent. from the number of tracks in the MFT
41-
DECLARE_SOA_COLUMN(CentFT0MVariant3, centFT0MVariant3, float); //! Run 3 cent. from FT0AOuter+FT0C multiplicity
41+
DECLARE_SOA_COLUMN(CentFT0MOuterA, centFT0MOuterA, float); //! Run 3 cent. from FT0AOuter+FT0C multiplicity
4242
} // namespace cent
4343

4444
// Run 2 tables
@@ -66,7 +66,7 @@ DECLARE_SOA_TABLE(CentFT0CVariant1s, "AOD", "CENTFT0Cvar1", cent::CentFT0CVarian
6666
DECLARE_SOA_TABLE(CentFT0CVariant2s, "AOD", "CENTFT0Cvar2", cent::CentFT0CVariant2); //! Run 3 FT0C variant 2 - uses truncated Nancestors in glauber fit. Not recommended! for cross-checks only
6767
DECLARE_SOA_TABLE(CentFT0MAnchorCols, "AOD", "CENTFT0MCOL", cent::CentFT0MAnchorCol); //! Run 3 FT0M with anchored Glauber. Colliison based calibration. Not recommended! for cross-checks only
6868
DECLARE_SOA_TABLE(CentFT0MAnchorBCs, "AOD", "CENTFT0MBC", cent::CentFT0MAnchorBC); //! Run 3 FT0M with anchored Glauber. Bunch crossing based calibration. Not recommended! for cross-checks only
69-
DECLARE_SOA_TABLE(CentFT0MVariant3s, "AOD", "CENTFT0Mvar3", cent::CentFT0MVariant3); //! Run 3 FT0M variant 3 - excludes FT0A channels that saturates in PbPb (channel id < 31)
69+
DECLARE_SOA_TABLE(CentFT0MOuterAs, "AOD", "CENTFT0Mvar3", cent::CentFT0MOuterA); //! Run 3 FT0M variant 3 - excludes FT0A channels that saturates in PbPb (channel id < 31)
7070

7171
// Run 3 centrality per BC (joinable with BC)
7272
DECLARE_SOA_TABLE(BCCentFT0Ms, "AOD", "BCCENTFT0M", cent::CentFT0M, o2::soa::Marker<1>); //! Run 3 FT0M BC centrality table
@@ -92,7 +92,7 @@ using CentMFT = CentMFTs::iterator;
9292

9393
using CentFT0CVariant1 = CentFT0CVariant1s::iterator;
9494
using CentFT0CVariant2 = CentFT0CVariant2s::iterator;
95-
using CentFT0MVariant3 = CentFT0MVariant3s::iterator;
95+
using CentFT0MOuterA = CentFT0MOuterAs::iterator;
9696

9797
using BCCentFT0M = BCCentFT0Ms::iterator;
9898
using BCCentFT0A = BCCentFT0As::iterator;

‎Common/Tasks/centralityQa.cxx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ struct CentralityQa {
206206
} else {
207207
histos.add("hCentFV0A", ";FV0A centrality (%)", kTH1D, {{nBins, 0, 105.}});
208208
histos.add("hCentFT0M", ";FT0M centrality (%)", kTH1D, {{nBins, 0, 105.}});
209-
histos.add("hCentFT0MVar3", ";FT0M centrality (%)", kTH1D, {{nBins, 0, 105.}});
209+
histos.add("hCentFT0MOuterA", ";FT0M centrality (%)", kTH1D, {{nBins, 0, 105.}});
210210
histos.add("hCentFT0A", ";FT0A centrality (%)", kTH1D, {{nBins, 0, 105.}});
211211
histos.add("hCentFT0C", ";FT0C centrality (%)", kTH1D, {{nBins, 0, 105.}});
212212
histos.add("hCentFT0CVar1", ";FT0CVar1 centrality (%)", kTH1D, {{nBins, 0, 105.}});
@@ -221,7 +221,7 @@ struct CentralityQa {
221221
// profiles of midrapidity multiplicity density
222222
histos.add("hCentProfileFV0A", ";FV0A centrality (%)", kTProfile, {{nBins, 0, 105.}});
223223
histos.add("hCentProfileFT0M", ";FT0M centrality (%)", kTProfile, {{nBins, 0, 105.}});
224-
histos.add("hCentProfileFT0MVar3", ";FT0M centrality (%)", kTProfile, {{nBins, 0, 105.}});
224+
histos.add("hCentProfileFT0MOuterA", ";FT0M centrality (%)", kTProfile, {{nBins, 0, 105.}});
225225
histos.add("hCentProfileFT0A", ";FT0A centrality (%)", kTProfile, {{nBins, 0, 105.}});
226226
histos.add("hCentProfileFT0C", ";FT0C centrality (%)", kTProfile, {{nBins, 0, 105.}});
227227
histos.add("hCentProfileFT0CVar1", ";FT0CVar1 centrality (%)", kTProfile, {{nBins, 0, 105.}});
@@ -235,7 +235,7 @@ struct CentralityQa {
235235

236236
histos.add("hMultEta05VsCentFV0A", ";FV0A centrality (%); Multiplicity PV contributors (|#it{#eta}| < 0.5)", kTH2D, {{nBins, 0, 105.}, axisMultiplicityPV});
237237
histos.add("hMultEta05VsCentFT0M", ";FT0M centrality (%); Multiplicity PV contributors (|#it{#eta}| < 0.5)", kTH2D, {{nBins, 0, 105.}, axisMultiplicityPV});
238-
histos.add("hMultEta05VsCentFT0MVar3", ";FT0M centrality (%); Multiplicity PV contributors (|#it{#eta}| < 0.5)", kTH2D, {{nBins, 0, 105.}, axisMultiplicityPV});
238+
histos.add("hMultEta05VsCentFT0MOuterA", ";FT0M centrality (%); Multiplicity PV contributors (|#it{#eta}| < 0.5)", kTH2D, {{nBins, 0, 105.}, axisMultiplicityPV});
239239
histos.add("hMultEta05VsCentFT0A", ";FT0A centrality (%); Multiplicity PV contributors (|#it{#eta}| < 0.5)", kTH2D, {{nBins, 0, 105.}, axisMultiplicityPV});
240240
histos.add("hMultEta05VsCentFT0C", ";FT0C centrality (%); Multiplicity PV contributors (|#it{#eta}| < 0.5)", kTH2D, {{nBins, 0, 105.}, axisMultiplicityPV});
241241
histos.add("hMultEta05VsCentFT0CVar1", ";FT0CVar1 centrality (%); Multiplicity PV contributors (|#it{#eta}| < 0.5)", kTH2D, {{nBins, 0, 105.}, axisMultiplicityPV});
@@ -688,17 +688,17 @@ struct CentralityQa {
688688
}
689689
PROCESS_SWITCH(CentralityQa, processRun3_FT0M, "Process with Run 3 FT0M estimator", false);
690690

691-
void processRun3_FT0Mvar3(soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFT0MVariant3s>::iterator const& col)
691+
void processRun3_FT0MOuterA(soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFT0MOuterAs>::iterator const& col)
692692
{
693693
if (!isCollisionAccepted(col)) {
694694
return;
695695
}
696-
LOGF(debug, "centFT0MVar3=%.0f", col.centFT0MVariant3());
697-
histos.fill(HIST("hCentFT0MVar3"), col.centFT0MVariant3());
698-
histos.fill(HIST("hCentProfileFT0MVar3"), col.centFT0MVariant3(), col.multNTracksPVetaHalf());
699-
histos.fill(HIST("hMultEta05VsCentFT0MVar3"), col.centFT0MVariant3(), col.multNTracksPVetaHalf());
696+
LOGF(debug, "centFT0MOuterA=%.0f", col.centFT0MOuterA());
697+
histos.fill(HIST("hCentFT0MOuterA"), col.centFT0MOuterA());
698+
histos.fill(HIST("hCentProfileFT0MOuterA"), col.centFT0MOuterA(), col.multNTracksPVetaHalf());
699+
histos.fill(HIST("hMultEta05VsCentFT0MOuterA"), col.centFT0MOuterA(), col.multNTracksPVetaHalf());
700700
}
701-
PROCESS_SWITCH(CentralityQa, processRun3_FT0Mvar3, "Process with Run 3 FT0M estimator", false);
701+
PROCESS_SWITCH(CentralityQa, processRun3_FT0MOuterA, "Process with Run 3 FT0M estimator", false);
702702

703703
void processRun3_FT0A(soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFT0As>::iterator const& col)
704704
{

‎Common/Tools/Multiplicity/MultModule.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ static const std::vector<std::string> tableNames{
100100
"BCCentFT0Cs",
101101
"CentFT0MAnchorCols",
102102
"CentFT0MAnchorBCs",
103-
"CentFT0MVariant3s"};
103+
"CentFT0MOuterAs"};
104104

105105
static constexpr int nTablesConst = 42;
106106
static const std::vector<std::string> parameterNames{"enable"};
@@ -191,7 +191,7 @@ enum tableIndex { kFV0Mults, // standard
191191
kBCCentFT0Cs, // bc centrality
192192
kCentFT0MAnchorCols, // standard Run 3
193193
kCentFT0MAnchorBCs, // standard Run 3
194-
kCentFT0MVariant3s, // standard Run 3
194+
kCentFT0MOuterAs, // standard Run 3
195195
kNTables };
196196

197197
struct products : o2::framework::ProducesGroup {
@@ -229,7 +229,7 @@ struct products : o2::framework::ProducesGroup {
229229
o2::framework::Produces<aod::CentRun2CL1s> centRun2CL1;
230230
o2::framework::Produces<aod::CentFV0As> centFV0A;
231231
o2::framework::Produces<aod::CentFT0Ms> centFT0M;
232-
o2::framework::Produces<aod::CentFT0MVariant3s> centFT0MVariant3;
232+
o2::framework::Produces<aod::CentFT0MOuterAs> centFT0MOuterA;
233233
o2::framework::Produces<aod::CentFT0As> centFT0A;
234234
o2::framework::Produces<aod::CentFT0Cs> centFT0C;
235235
o2::framework::Produces<aod::CentFT0CVariant1s> centFT0CVariant1;
@@ -457,7 +457,7 @@ class MultModule
457457
CalibrationInfo ft0mInfo = CalibrationInfo("FT0");
458458
CalibrationInfo ft0mColInfo = CalibrationInfo("FT0AnchorCol");
459459
CalibrationInfo ft0mBcInfo = CalibrationInfo("FT0AnchorBc");
460-
CalibrationInfo ft0mVariant3Info = CalibrationInfo("FT0Mvar3");
460+
CalibrationInfo FT0MOuterAInfo = CalibrationInfo("FT0MOuterA");
461461
CalibrationInfo ft0aInfo = CalibrationInfo("FT0A");
462462
CalibrationInfo ft0cInfo = CalibrationInfo("FT0C");
463463
CalibrationInfo ft0cVariant1Info = CalibrationInfo("FT0Cvar1");
@@ -1237,7 +1237,7 @@ class MultModule
12371237
ft0mInfo.mCalibrationStored = false;
12381238
ft0mColInfo.mCalibrationStored = false;
12391239
ft0mBcInfo.mCalibrationStored = false;
1240-
ft0mVariant3Info.mCalibrationStored = false;
1240+
FT0MOuterAInfo.mCalibrationStored = false;
12411241
ft0aInfo.mCalibrationStored = false;
12421242
ft0cInfo.mCalibrationStored = false;
12431243
ft0cVariant1Info.mCalibrationStored = false;
@@ -1279,8 +1279,8 @@ class MultModule
12791279
getccdb(ft0mColInfo, internalOpts.generatorName);
12801280
if (internalOpts.mEnabledTables[kCentFT0MAnchorBCs])
12811281
getccdb(ft0mBcInfo, internalOpts.generatorName);
1282-
if (internalOpts.mEnabledTables[kCentFT0MVariant3s])
1283-
getccdb(ft0mVariant3Info, internalOpts.generatorName);
1282+
if (internalOpts.mEnabledTables[kCentFT0MOuterAs])
1283+
getccdb(FT0MOuterAInfo, internalOpts.generatorName);
12841284
if (internalOpts.mEnabledTables[kCentFT0As] || internalOpts.mEnabledTables[kBCCentFT0As])
12851285
getccdb(ft0aInfo, internalOpts.generatorName);
12861286
if (internalOpts.mEnabledTables[kCentFT0Cs] || internalOpts.mEnabledTables[kBCCentFT0Cs])
@@ -1369,8 +1369,8 @@ class MultModule
13691369
populateTable(cursors.centFT0MAnchorCol, ft0mColInfo, mults[iEv].multFT0AZeq + mults[iEv].multFT0CZeq, isInelGt0);
13701370
if (internalOpts.mEnabledTables[kCentFT0Ms])
13711371
populateTable(cursors.centFT0MAnchorBC, ft0mBcInfo, mults[iEv].multFT0AZeq + mults[iEv].multFT0CZeq, isInelGt0);
1372-
if (internalOpts.mEnabledTables[kCentFT0MVariant3s])
1373-
populateTable(cursors.centFT0MVariant3, ft0mVariant3Info, mults[iEv].multFT0AOuterZeq + mults[iEv].multFT0CZeq, isInelGt0);
1372+
if (internalOpts.mEnabledTables[kCentFT0MOuterAs])
1373+
populateTable(cursors.centFT0MOuterA, FT0MOuterAInfo, mults[iEv].multFT0AOuterZeq + mults[iEv].multFT0CZeq, isInelGt0);
13741374
if (internalOpts.mEnabledTables[kCentFT0As])
13751375
populateTable(cursors.centFT0A, ft0aInfo, mults[iEv].multFT0AZeq, isInelGt0);
13761376
if (internalOpts.mEnabledTables[kCentFT0Cs])

0 commit comments

Comments
 (0)