Skip to content

Commit 1163dd7

Browse files
jesgumjesgum
authored
[Common] Add outer FT0C and FV0, and combined fit signals to centrality study (#18039)
1 parent dd604f6 commit 1163dd7

5 files changed

Lines changed: 126 additions & 17 deletions

File tree

‎Common/DataModel/Multiplicity.h‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ DECLARE_SOA_COLUMN(TimeToNeNext, timeToNeNext, float); //!
103103
DECLARE_SOA_COLUMN(FT0TriggerMask, ft0TriggerMask, uint8_t); //!
104104
DECLARE_SOA_COLUMN(MultFV0AOuter, multFV0AOuter, float); //! FV0 without innermost ring
105105
DECLARE_SOA_COLUMN(MultFT0AOuter, multFT0AOuter, float); //! FT0A without innermost ring
106+
DECLARE_SOA_COLUMN(MultFT0COuter, multFT0COuter, float); //! FT0C without innermost ring
106107

107108
// Timing information
108109
DECLARE_SOA_COLUMN(TimeZNA, timeZNA, float); //!
@@ -144,7 +145,7 @@ DECLARE_SOA_TABLE(MFTMults, "AOD", "MFTMULT", //! Multiplicity with MFT
144145
DECLARE_SOA_TABLE(FITExtraMults, "AOD", "FITEXTRAMULT", //! Extra information from FIT detectors
145146
mult::MultFV0AOuter,
146147
mult::MultFT0AOuter,
147-
mult::FT0TriggerMask);
148+
mult::MultFT0COuter);
148149

149150
using BarrelMults = soa::Join<TrackletMults, TPCMults, PVMults>;
150151
using Mults = soa::Join<BarrelMults, FV0Mults, FT0Mults, FDDMults, ZDCMults>;
@@ -311,6 +312,22 @@ DECLARE_SOA_TABLE_VERSIONED(MultBCs_001, "AOD", "MULTBC", 1, //!
311312
mult::MultFV0AOuter,
312313
mult::MultFT0AOuter);
313314

315+
DECLARE_SOA_TABLE_VERSIONED(MultBCs_002, "AOD", "MULTBC", 2, //!
316+
mult::MultFT0A,
317+
mult::MultFT0C,
318+
mult::MultFV0A,
319+
mult::MultFDDA,
320+
mult::MultFDDC,
321+
mult::MultZNA,
322+
mult::MultZNC,
323+
mult::MultZEM1,
324+
mult::MultZEM2,
325+
mult::MultZPA,
326+
mult::MultZPC,
327+
mult::MultFV0AOuter,
328+
mult::MultFT0AOuter,
329+
mult::MultFT0COuter);
330+
314331
DECLARE_SOA_TABLE(MultBcSel_000, "AOD", "MULTBCSEL", //! BC selection bits joinable with multBCs
315332
evsel::Selection);
316333

@@ -339,7 +356,7 @@ DECLARE_SOA_TABLE(TimeBCs, "AOD", "TIMEBC", //!
339356
mult::TimeZPA,
340357
mult::TimeZPC)
341358

342-
using MultBCs = MultBCs_001;
359+
using MultBCs = MultBCs_002;
343360
using MultBcSel = MultBcSel_001;
344361
using MultBC = MultBCs::iterator;
345362

‎Common/TableProducer/Converters/CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,3 +118,8 @@ o2physics_add_dpl_workflow(mult-bcs-converter
118118
SOURCES multBCsConverter.cxx
119119
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
120120
COMPONENT_NAME Analysis)
121+
122+
o2physics_add_dpl_workflow(mult-bcs-002-converter
123+
SOURCES multBCs002Converter.cxx
124+
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
125+
COMPONENT_NAME Analysis)

‎Common/TableProducer/Converters/multBCs002Converter.cxx‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
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 multBCs002Converter.cxx
13+
/// \brief Converts MultBCs table from version 001 to 002
14+
/// \author Jesper Karlsson Gumrpecht
15+
16+
#include "Common/DataModel/Multiplicity.h"
17+
18+
#include <Framework/AnalysisDataModel.h>
19+
#include <Framework/AnalysisHelpers.h>
20+
#include <Framework/AnalysisTask.h>
21+
#include <Framework/runDataProcessing.h>
22+
23+
struct MultBCs002Converter {
24+
o2::framework::Produces<o2::aod::MultBCs_002> multBC;
25+
static constexpr float DummyValue = -1.f;
26+
void process(o2::aod::MultBCs_001 const& multBCs)
27+
{
28+
multBC.reserve(multBCs.size());
29+
for (const auto& multbc : multBCs) {
30+
multBC(multbc.multFT0A(),
31+
multbc.multFT0C(),
32+
multbc.multFV0A(),
33+
multbc.multFDDA(),
34+
multbc.multFDDC(),
35+
multbc.multZNA(),
36+
multbc.multZNC(),
37+
multbc.multZEM1(),
38+
multbc.multZEM2(),
39+
multbc.multZPA(),
40+
multbc.multZPC(),
41+
multbc.multFV0AOuter(),
42+
multbc.multFT0AOuter(),
43+
DummyValue /* dummy amplitude for FT0C Outer */);
44+
}
45+
}
46+
};
47+
48+
o2::framework::WorkflowSpec defineDataProcessing(o2::framework::ConfigContext const& cfgc)
49+
{
50+
return o2::framework::WorkflowSpec{adaptAnalysisTask<MultBCs002Converter>(cfgc)};
51+
}

‎Common/TableProducer/multiplicityExtraTable.cxx‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ using namespace o2;
4444
using namespace o2::framework;
4545
using namespace o2::framework::expressions;
4646
using BCPattern = std::bitset<o2::constants::lhc::LHCMaxBunches>;
47-
const int nBCsPerOrbit = o2::constants::lhc::LHCMaxBunches;
4847

4948
struct MultiplicityExtraTable {
5049
Produces<aod::MultBCs> multBC;
@@ -62,6 +61,7 @@ struct MultiplicityExtraTable {
6261
Configurable<float> bcDownscaleFactor{"bcDownscaleFactor", 2, "Downscale factor for BC table (0: save nothing, 1: save all)"};
6362
Configurable<float> minFT0CforBCTable{"minFT0CforBCTable", 25.0f, "Minimum FT0C amplitude to fill BC table to reduce data"};
6463
Configurable<bool> saveOnlyBCsWithCollisions{"saveOnlyBCsWithCollisions", true, "save only BCs with collisions in them"};
64+
Configurable<bool> requestMinSignalForFT0C{"requestMinSignalForFT0C", true, "save only BCs with minimum FT0C signal"};
6565

6666
Configurable<float> bcTableFloatPrecision{"bcTableFloatPrecision", 0.1, "float precision in bc table for data reduction"};
6767

@@ -126,14 +126,14 @@ struct MultiplicityExtraTable {
126126
float multFT0C = 0.f;
127127
if (bc.has_ft0()) {
128128
auto ft0 = bc.ft0();
129-
for (const auto amplitude : ft0.amplitudeC()) {
129+
for (const auto amplitude : ft0.amplitudeC()) { // o2-linter: disable=const-ref-in-for-loop (cheap float copy)
130130
multFT0C += amplitude;
131131
}
132132
} else {
133133
multFT0C = -999.0f;
134134
}
135135

136-
if (multFT0C < minFT0CforBCTable) {
136+
if (requestMinSignalForFT0C && multFT0C < minFT0CforBCTable) {
137137
continue; // skip this event
138138
}
139139

@@ -166,6 +166,7 @@ struct MultiplicityExtraTable {
166166
float multFDDA = 0.f;
167167
float multFDDC = 0.f;
168168
float multFT0AOuter = 0.f;
169+
float multFT0COuter = 0.f;
169170
float multFV0AOuter = 0.f;
170171

171172
// ZDC amplitudes
@@ -196,7 +197,7 @@ struct MultiplicityExtraTable {
196197

197198
// initialize - from Arvind
198199
newRunNumber = bc.runNumber();
199-
int localBC = bc.globalBC() % nBCsPerOrbit;
200+
int localBC = bc.globalBC() % o2::constants::lhc::LHCMaxBunches;
200201

201202
if (newRunNumber != oldRunNumber) {
202203
auto soreor = o2::ccdb::BasicCCDBManager::getRunDuration(ccdbApi, newRunNumber);
@@ -224,8 +225,12 @@ struct MultiplicityExtraTable {
224225
multFT0AOuter += ft0.amplitudeA()[ii];
225226
}
226227
}
227-
for (const auto amplitude : ft0.amplitudeC()) {
228-
multFT0C += amplitude;
228+
for (size_t ii = 0; ii < ft0.amplitudeC().size(); ++ii) {
229+
multFT0C += ft0.amplitudeC()[ii];
230+
static constexpr int MaxChannelIdInnerRingFT0C = 48;
231+
if (ft0.channelC()[ii] > MaxChannelIdInnerRingFT0C) {
232+
multFT0COuter += ft0.amplitudeC()[ii];
233+
}
229234
}
230235
posZFT0 = ft0.posZ();
231236
posZFT0valid = ft0.isValidTime();
@@ -261,10 +266,10 @@ struct MultiplicityExtraTable {
261266
std::bitset<8> fFDDTriggers = fdd.triggerMask();
262267
multFDDTriggerBits = static_cast<uint8_t>(fFDDTriggers.to_ulong());
263268

264-
for (const auto amplitude : fdd.chargeA()) {
269+
for (const auto amplitude : fdd.chargeA()) { // o2-linter: disable=const-ref-in-for-loop (cheap float copy)
265270
multFDDA += amplitude;
266271
}
267-
for (const auto amplitude : fdd.chargeC()) {
272+
for (const auto amplitude : fdd.chargeC()) { // o2-linter: disable=const-ref-in-for-loop (cheap float copy)
268273
multFDDC += amplitude;
269274
}
270275

@@ -313,7 +318,8 @@ struct MultiplicityExtraTable {
313318
tru(multZPA),
314319
tru(multZPC),
315320
tru(multFV0AOuter),
316-
tru(multFT0AOuter));
321+
tru(multFT0AOuter),
322+
tru(multFT0COuter));
317323

318324
multBcSel(
319325
bc.selection_raw(),

‎Common/Tasks/centralityStudy.cxx‎

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ struct CentralityStudy {
185185
Configurable<float> factorFT0C{"factorFT0C", 1.00f, "scale the raw FT0C signal for convenience"};
186186
Configurable<float> factorFV0A{"factorFV0A", 1.00f, "scale the raw FV0A signal for convenience"};
187187
Configurable<float> factorFT0M{"factorFT0M", 1.00f, "scale the raw FT0M signal for convenience"};
188-
Configurable<float> factorFV0AT0C{"factorFV0AT0C", 1.00f, "scale the raw FV0A+FT0C signal for convenience"};
188+
Configurable<float> factorFIT{"factorFIT", 1.00f, "scale the raw FV0A+FT0C signal for convenience"};
189189
Configurable<float> normFT0A{"normFT0A", 1.00f, "scale the self-normalised FT0A signal; scale.normFT0A * FT0A / <FT0A>"};
190190
Configurable<float> normFT0C{"normFT0C", 1.00f, "scale the self-normalised FT0C signal; scale.normFT0C * FT0C / <FT0C>"};
191191
Configurable<float> normFV0A{"normFV0A", 1.00f, "scale the self-normalised FV0A signal; scale.normFV0A * FV0A / <FV0A>"};
@@ -206,6 +206,7 @@ struct CentralityStudy {
206206
ConfigurableAxis axisFT0COccupancy{"axisFT0COccupancy", {50, 0, 80000}, "FT0C occupancy"};
207207

208208
// For one-dimensional plots, where binning is no issue
209+
ConfigurableAxis axisMultUltraFineFIT{"axisMultUltraFineFIT", {60000, 0, 60000}, "FT0M + FV0 amplitude"};
209210
ConfigurableAxis axisMultUltraFineFV0A{"axisMultUltraFineFV0A", {60000, 0, 60000}, "FV0A amplitude"};
210211
ConfigurableAxis axisMultUltraFineFT0C{"axisMultUltraFineFT0C", {60000, 0, 60000}, "FT0C amplitude"};
211212
ConfigurableAxis axisMultUltraFineFT0A{"axisMultUltraFineFT0A", {60000, 0, 60000}, "FT0A amplitude"};
@@ -273,8 +274,13 @@ struct CentralityStudy {
273274
histos.add("hFT0C_Collisions", "hFT0C_Collisions", kTH1D, {axisMultUltraFineFT0C});
274275
histos.add("hFT0M_Collisions", "hFT0M_Collisions", kTH1D, {axisMultUltraFineFT0M});
275276
histos.add("hFV0A_Collisions", "hFV0A_Collisions", kTH1D, {axisMultUltraFineFV0A});
277+
histos.add("hFV0AOuter_Collisions", "hFV0AOuter_Collisions", kTH1D, {axisMultUltraFineFV0A});
276278
histos.add("hFT0AOuter_Collisions", "hFT0AOuter_Collisions", kTH1D, {axisMultUltraFineFT0A});
279+
histos.add("hFT0COuter_Collisions", "hFT0COuter_Collisions", kTH1D, {axisMultUltraFineFT0C});
277280
histos.add("hFT0MOuterA_Collisions", "hFT0MOuterA_Collisions", kTH1D, {axisMultUltraFineFT0M});
281+
histos.add("hFIT_Collisions", "hFIT_Collisions", kTH1D, {axisMultUltraFineFIT});
282+
histos.add("hFIT_FullV0_Collisions", "hFIT_FullV0_Collisions", kTH1D, {axisMultUltraFineFIT});
283+
histos.add("hFIT_All_Collisions", "hFIT_All_Collisions", kTH1D, {axisMultUltraFineFIT});
278284

279285
histos.add("hNGlobalTracks", "hNGlobalTracks", kTH1D, {axisMultUltraFineGlobalTracks});
280286
histos.add("hNMFTTracks", "hNMFTTracks", kTH1D, {axisMultUltraFineMFTTracks});
@@ -407,14 +413,20 @@ struct CentralityStudy {
407413
histos.get<TH1>(HIST("hBCSelection"))->GetXaxis()->SetBinLabel(8, "zpac time");
408414
histos.get<TH1>(HIST("hBCSelection"))->GetXaxis()->SetBinLabel(9, "isFlangeEvent");
409415

416+
histos.add("hFIT_BCs", "hFIT_BCs", kTH1D, {axisMultUltraFineFIT});
417+
histos.add("hFIT_FullV0_BCs", "hFIT_FullV0_BCs", kTH1D, {axisMultUltraFineFIT});
418+
histos.add("hFIT_All_BCs", "hFIT_All_BCs", kTH1D, {axisMultUltraFineFIT});
410419
histos.add("hFT0C_BCs", "hFT0C_BCs", kTH1D, {axisMultUltraFineFT0C});
420+
histos.add("hFT0COuter_BCs", "hFT0COuter_BCs", kTH1D, {axisMultUltraFineFT0C});
411421
histos.add("hFT0A_BCs", "hFT0A_BCs", kTH1D, {axisMultUltraFineFT0A});
412422
histos.add("hFT0AOuter_BCs", "hFT0AOuter_BCs", kTH1D, {axisMultUltraFineFT0A});
413423
histos.add("hFT0M_BCs", "hFT0M_BCs", kTH1D, {axisMultUltraFineFT0M});
414424
histos.add("hFT0MOuterA_BCs", "hFT0MOuterA_BCs", kTH1D, {axisMultUltraFineFT0M});
415425
histos.add("hFV0A_BCs", "hFV0A_BCs", kTH1D, {axisMultUltraFineFV0A});
426+
histos.add("hFV0AOuter_BCs", "hFV0AOuter_BCs", kTH1D, {axisMultUltraFineFV0A});
416427

417428
histos.add("hFV0AT0C_BCs", "hFV0AT0C_BCs", kTH1D, {axisMultUltraFineFV0AT0C});
429+
histos.add("hFV0AOuterT0C_BCs", "hFV0AOuterT0C_BCs", kTH1D, {axisMultUltraFineFV0AT0C});
418430
histos.add("hScaledFT0M_BCs", "hScaledFT0M_BCs", kTH1D, {axisMultUltraFineScaledFT0M});
419431
histos.add("hScaledFV0AT0C_BCs", "hScaledFV0AT0C_BCs", kTH1D, {axisMultUltraFineScaledFV0AT0C});
420432

@@ -541,11 +553,17 @@ struct CentralityStudy {
541553
getHist<TH1>(histPath + "hCollisionSelection")->GetXaxis()->SetBinLabel(19, "bcsel");
542554

543555
histPointers.insert({histPath + "hFT0C_Collisions", histos.add((histPath + "hFT0C_Collisions").c_str(), "hFT0C_Collisions", {kTH1D, {{axisMultUltraFineFT0C}}})});
556+
histPointers.insert({histPath + "hFT0COuter_Collisions", histos.add((histPath + "hFT0COuter_Collisions").c_str(), "hFT0COuter_Collisions", {kTH1D, {{axisMultUltraFineFT0C}}})});
544557
histPointers.insert({histPath + "hFT0A_Collisions", histos.add((histPath + "hFT0A_Collisions").c_str(), "hFT0A_Collisions", {kTH1D, {{axisMultUltraFineFT0A}}})});
545558
histPointers.insert({histPath + "hFT0AOuter_Collisions", histos.add((histPath + "hFT0AOuter_Collisions").c_str(), "hFT0AOuter_Collisions", {kTH1D, {{axisMultUltraFineFT0C}}})});
559+
histPointers.insert({histPath + "hFV0AOuter_Collisions", histos.add((histPath + "hFV0AOuter_Collisions").c_str(), "hFV0AOuter_Collisions", {kTH1D, {{axisMultUltraFineFV0A}}})});
546560
histPointers.insert({histPath + "hFT0MOuterA_Collisions", histos.add((histPath + "hFT0MOuterA_Collisions").c_str(), "hFT0MOuterA_Collisions", {kTH1D, {{axisMultUltraFineFT0A}}})});
547561
histPointers.insert({histPath + "hFT0M_Collisions", histos.add((histPath + "hFT0M_Collisions").c_str(), "hFT0M_Collisions", {kTH1D, {{axisMultUltraFineFT0M}}})});
548562
histPointers.insert({histPath + "hFV0A_Collisions", histos.add((histPath + "hFV0A_Collisions").c_str(), "hFV0A_Collisions", {kTH1D, {{axisMultUltraFineFV0A}}})});
563+
histPointers.insert({histPath + "hFIT_Collisions", histos.add((histPath + "hFIT_Collisions").c_str(), "hFIT_Collisions", {kTH1D, {{axisMultUltraFineFIT}}})});
564+
histPointers.insert({histPath + "hFIT_FullV0_Collisions", histos.add((histPath + "hFIT_FullV0_Collisions").c_str(), "hFIT_FullV0_Collisions", {kTH1D, {{axisMultUltraFineFIT}}})});
565+
histPointers.insert({histPath + "hFIT_All_Collisions", histos.add((histPath + "hFIT_All_Collisions").c_str(), "hFIT_All_Collisions", {kTH1D, {{axisMultUltraFineFIT}}})});
566+
549567
histPointers.insert({histPath + "hNGlobalTracks", histos.add((histPath + "hNGlobalTracks").c_str(), "hNGlobalTracks", {kTH1D, {{axisMultUltraFineGlobalTracks}}})});
550568
histPointers.insert({histPath + "hNMFTTracks", histos.add((histPath + "hNMFTTracks").c_str(), "hNMFTTracks", {kTH1D, {{axisMultUltraFineMFTTracks}}})});
551569
histPointers.insert({histPath + "hNPVContributors", histos.add((histPath + "hNPVContributors").c_str(), "hNPVContributors", {kTH1D, {{axisMultUltraFinePVContributors}}})});
@@ -1174,8 +1192,14 @@ struct CentralityStudy {
11741192
if constexpr (requires { collision.has_multBC(); }) {
11751193
if (collision.has_multBC()) {
11761194
auto multbc = collision.template multBC_as<soa::Join<aod::MultBCs, aod::MultBcSel>>();
1195+
histos.fill(HIST("hFV0AOuter_Collisions"), multbc.multFV0AOuter() * scale.factorFV0A);
11771196
histos.fill(HIST("hFT0AOuter_Collisions"), multbc.multFT0AOuter() * scale.factorFT0A);
11781197
histos.fill(HIST("hFT0MOuterA_Collisions"), multbc.multFT0AOuter() + multbc.multFT0C() * scale.factorFT0M);
1198+
1199+
histos.fill(HIST("hFT0COuter_Collisions"), multbc.multFT0COuter() * scale.factorFT0C);
1200+
histos.fill(HIST("hFIT_Collisions"), (multbc.multFT0C() + multbc.multFT0AOuter() + multbc.multFV0AOuter()) * scale.factorFIT);
1201+
histos.fill(HIST("hFIT_FullV0_Collisions"), (multbc.multFT0C() + multbc.multFT0AOuter() + multbc.multFV0A()) * scale.factorFIT);
1202+
histos.fill(HIST("hFIT_All_Collisions"), (multbc.multFT0C() + multbc.multFT0A() + multbc.multFV0A()) * scale.factorFIT);
11791203
if (studies.do2DPlots) {
11801204
histos.fill(HIST("hFT0AOuterVsFT0C"), multbc.multFT0C() * scale.factorFT0C, multbc.multFT0AOuter() * scale.factorFT0A);
11811205
}
@@ -1192,6 +1216,7 @@ struct CentralityStudy {
11921216
if (studies.doRunByRunHistograms) {
11931217
getHist<TH1>(histPath + "hInteractionRate")->Fill(interactionRate);
11941218
getHist<TH1>(histPath + "hFT0AOuter_Collisions")->Fill(multbc.multFT0AOuter() * scale.factorFT0A);
1219+
getHist<TH1>(histPath + "hFV0AOuter_Collisions")->Fill(multbc.multFV0AOuter() * scale.factorFV0A);
11951220
getHist<TH1>(histPath + "hFT0MOuterA_Collisions")->Fill(multbc.multFT0AOuter() + multbc.multFT0C() * scale.factorFT0M);
11961221
if (studies.do2DPlots) {
11971222
getHist<TH2>(histPath + "hFT0AOuterVsFT0C")->Fill(multbc.multFT0C() * scale.factorFT0C, multbc.multFT0AOuter() * scale.factorFT0A);
@@ -1348,13 +1373,18 @@ struct CentralityStudy {
13481373

13491374
// if we got here, we also finally fill the FT0C histogram, please
13501375
histos.fill(HIST("hFT0C_BCs"), multbc.multFT0C() * scale.factorFT0C);
1376+
histos.fill(HIST("hFT0COuter_BCs"), multbc.multFT0COuter() * scale.factorFT0C);
13511377
histos.fill(HIST("hFT0A_BCs"), multbc.multFT0A() * scale.factorFT0A);
13521378
histos.fill(HIST("hFT0AOuter_BCs"), multbc.multFT0AOuter() * scale.factorFT0A);
1379+
histos.fill(HIST("hFV0AOuter_BCs"), multbc.multFV0AOuter() * scale.factorFV0A);
13531380
histos.fill(HIST("hFT0M_BCs"), (multbc.multFT0A() + multbc.multFT0C()) * scale.factorFT0M);
13541381
histos.fill(HIST("hFT0MOuterA_BCs"), (multbc.multFT0AOuter() + multbc.multFT0C()) * scale.factorFT0M);
13551382
histos.fill(HIST("hFV0A_BCs"), multbc.multFV0A() * scale.factorFV0A);
1356-
histos.fill(HIST("hFV0AT0C_BCs"), (multbc.multFV0A() + multbc.multFT0C()) * scale.factorFV0AT0C);
1357-
1383+
histos.fill(HIST("hFV0AT0C_BCs"), (multbc.multFV0A() + multbc.multFT0C()) * scale.factorFIT);
1384+
histos.fill(HIST("hFV0AOuterT0C_BCs"), (multbc.multFV0AOuter() + multbc.multFT0C()) * scale.factorFIT);
1385+
histos.fill(HIST("hFIT_BCs"), (multbc.multFT0C() + multbc.multFT0AOuter() + multbc.multFV0AOuter()) * scale.factorFIT);
1386+
histos.fill(HIST("hFIT_FullV0_BCs"), (multbc.multFT0C() + multbc.multFT0AOuter() + multbc.multFV0A()) * scale.factorFIT);
1387+
histos.fill(HIST("hFIT_All_BCs"), (multbc.multFT0C() + multbc.multFT0A() + multbc.multFV0A()) * scale.factorFIT);
13581388
if (studies.do2DPlots) {
13591389
histos.fill(HIST("hFT0AVsFT0C_BCs"), multbc.multFT0C() * scale.factorFT0C, multbc.multFT0A() * scale.factorFT0A);
13601390
histos.fill(HIST("hFV0AVsFT0C_BCs"), multbc.multFT0C() * scale.factorFT0C, multbc.multFV0A() * scale.factorFV0A);
@@ -1384,9 +1414,9 @@ struct CentralityStudy {
13841414
continue;
13851415
}
13861416

1387-
const float selfNormFV0A = scale.normFT0A * multbc.multFV0A() / histos.get<TH1>(HIST("hFT0A_BCs"))->GetMean();
1388-
const float selfNormFT0A = scale.normFV0A * multbc.multFT0A() / histos.get<TH1>(HIST("hFT0C_BCs"))->GetMean();
1389-
const float selfNormFT0C = scale.normFT0C * multbc.multFT0C() / histos.get<TH1>(HIST("hFV0A_BCs"))->GetMean();
1417+
const float selfNormFV0A = scale.normFV0A * multbc.multFV0A() / histos.get<TH1>(HIST("hFV0A_BCs"))->GetMean();
1418+
const float selfNormFT0A = scale.normFT0A * multbc.multFT0A() / histos.get<TH1>(HIST("hFT0A_BCs"))->GetMean();
1419+
const float selfNormFT0C = scale.normFT0C * multbc.multFT0C() / histos.get<TH1>(HIST("hFT0C_BCs"))->GetMean();
13901420
histos.fill(HIST("hScaledFT0M_BCs"), selfNormFT0A + selfNormFT0C);
13911421
histos.fill(HIST("hScaledFV0AT0C_BCs"), selfNormFV0A + selfNormFT0C);
13921422
}

0 commit comments

Comments
 (0)