Skip to content

Commit f24d5e0

Browse files
coppediscoppedis
committed
Fixing coding convention
1 parent 0439ec2 commit f24d5e0

File tree

2 files changed

+74
-73
lines changed

2 files changed

+74
-73
lines changed

‎PWGMM/DataModel/ZDCdmOxygen.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616
#ifndef PWGMM_DATAMODEL_ZDCDMOXYGEN_H_
1717
#define PWGMM_DATAMODEL_ZDCDMOXYGEN_H_
1818

19-
#include "Framework/AnalysisDataModel.h"
20-
#include "Framework/ASoAHelpers.h"
2119
#include "Common/DataModel/Centrality.h"
2220

21+
#include "Framework/ASoAHelpers.h"
22+
#include "Framework/AnalysisDataModel.h"
23+
2324
namespace o2::aod
2425
{
2526
namespace zdcTableOO // o2-linter: disable=name/namespace
@@ -56,7 +57,7 @@ DECLARE_SOA_COLUMN(CentralityFt0C, centralityFT0C, float); //! Centrality
5657
DECLARE_SOA_COLUMN(CentralityFt0A, centralityFT0A, float); //! Centrality // o2-linter: disable=name/o2-column
5758
DECLARE_SOA_COLUMN(CentralityFt0M, centralityFT0M, float); //! Centrality // o2-linter: disable=name/o2-column
5859
DECLARE_SOA_COLUMN(SelectionBits, selectionBits, uint8_t); //! Selection Flags // o2-linter: disable=name/o2-column
59-
} // namespace zdctable
60+
} // namespace zdcTableOO
6061

6162
DECLARE_SOA_TABLE(ZdcTable, "AOD", "ZdcTeble",
6263
zdcTableOO::ZnaTdc,

‎PWGMM/TableProducer/QC/zdcTaskOxygen.cxx‎

Lines changed: 70 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@
1313
/// \brief Task for ZDC
1414
/// \author chiara.oppedisano@cern.ch
1515

16-
#include "Framework/AnalysisDataModel.h"
17-
#include "Framework/AnalysisTask.h"
18-
#include "Framework/HistogramRegistry.h"
19-
#include "Framework/runDataProcessing.h"
16+
#include "PWGMM/DataModel/ZDCdmOxygen.h"
2017

2118
#include "Common/CCDB/EventSelectionParams.h"
2219
#include "Common/CCDB/TriggerAliases.h"
23-
#include "Common/DataModel/Centrality.h"
24-
#include "Common/DataModel/Multiplicity.h"
25-
#include "Common/DataModel/EventSelection.h"
2620
#include "Common/Core/TrackSelection.h"
2721
#include "Common/Core/trackUtilities.h"
22+
#include "Common/DataModel/Centrality.h"
23+
#include "Common/DataModel/EventSelection.h"
24+
#include "Common/DataModel/Multiplicity.h"
2825

29-
#include "PWGMM/DataModel/ZDCdmOxygen.h"
26+
#include "Framework/AnalysisDataModel.h"
27+
#include "Framework/AnalysisTask.h"
28+
#include "Framework/HistogramRegistry.h"
29+
#include "Framework/runDataProcessing.h"
3030

3131
#include "TH1F.h"
3232
#include "TH2F.h"
@@ -80,7 +80,7 @@ struct ZdcTaskOxygen {
8080
{
8181
registry.add("debunchHist", "ZN sum vs. diff; ZNA-ZNC (ns); ZNA+ZNC (ns)", {HistType::kTH2D, {{nBinsTiming, -20., 20.}, {nBinsTiming, -20., 20.}}});
8282

83-
if(doprocessALICEcoll) {
83+
if (doprocessALICEcoll) {
8484
registry.add("hEventCount", "Number of Event; Cut; #Events Passed Cut", {HistType::kTH1D, {{nEventSelections, 0, nEventSelections}}});
8585
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_allEvents + 1, "All events");
8686
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_zvtx + 1, "vtxZ");
@@ -156,63 +156,63 @@ struct ZdcTaskOxygen {
156156

157157
void processZDCautoTrig(aod::Zdc const& zdc)
158158
{
159-
// auto-triggered events for ZDC
160-
161-
auto tdcZNA = zdc.timeZNA();
162-
auto tdcZNC = zdc.timeZNC();
163-
auto tdcZPA = zdc.timeZPA();
164-
auto tdcZPC = zdc.timeZPC();
165-
auto tdcZEM1 = zdc.timeZEM1();
166-
auto tdcZEM2 = zdc.timeZEM2();
167-
//
168-
double zna = zdc.amplitudeZNA();
169-
double znc = zdc.amplitudeZNC();
170-
double zpa = zdc.amplitudeZPA();
171-
double zpc = zdc.amplitudeZPC();
172-
double zem1 = zdc.amplitudeZEM1();
173-
double zem2 = zdc.amplitudeZEM2();
174-
//
175-
double pmcZNA = zdc.energyCommonZNA();
176-
double pmcZNC = zdc.energyCommonZNC();
177-
double pmqZNC[4] = {
178-
0,
179-
0,
180-
0,
181-
0,
182-
};
183-
double pmqZNA[4] = {
184-
0,
185-
0,
186-
0,
187-
0,
188-
};
189-
const int noofZNsectors = 4;
190-
for (int itow = 0; itow < noofZNsectors; itow++) {
191-
pmqZNA[itow] = (zdc.energySectorZNA())[itow];
192-
pmqZNC[itow] = (zdc.energySectorZNC())[itow];
193-
}
159+
// auto-triggered events for ZDC
160+
161+
auto tdcZNA = zdc.timeZNA();
162+
auto tdcZNC = zdc.timeZNC();
163+
auto tdcZPA = zdc.timeZPA();
164+
auto tdcZPC = zdc.timeZPC();
165+
auto tdcZEM1 = zdc.timeZEM1();
166+
auto tdcZEM2 = zdc.timeZEM2();
167+
//
168+
double zna = zdc.amplitudeZNA();
169+
double znc = zdc.amplitudeZNC();
170+
double zpa = zdc.amplitudeZPA();
171+
double zpc = zdc.amplitudeZPC();
172+
double zem1 = zdc.amplitudeZEM1();
173+
double zem2 = zdc.amplitudeZEM2();
174+
//
175+
double pmcZNA = zdc.energyCommonZNA();
176+
double pmcZNC = zdc.energyCommonZNC();
177+
double pmqZNC[4] = {
178+
0,
179+
0,
180+
0,
181+
0,
182+
};
183+
double pmqZNA[4] = {
184+
0,
185+
0,
186+
0,
187+
0,
188+
};
189+
const int noofZNsectors = 4;
190+
for (int itow = 0; itow < noofZNsectors; itow++) {
191+
pmqZNA[itow] = (zdc.energySectorZNA())[itow];
192+
pmqZNC[itow] = (zdc.energySectorZNC())[itow];
193+
}
194194

195-
bool isZNChit = false, isZNAhit = false;
196-
if (tdcCut) { // a narrow TDC window is set
197-
if ((tdcZNC >= tdcZNmincut) && (tdcZNC <= tdcZNmaxcut)) {
198-
isZNChit = true;
199-
}
200-
if ((tdcZNA >= tdcZNmincut) && (tdcZNA <= tdcZNmaxcut)) {
201-
isZNAhit = true;
202-
}
203-
} else { // if no window on TDC is set
204-
if (pmcZNC > 0.) {
205-
isZNChit = true;
206-
}
207-
if (pmcZNA > 0.) {
208-
isZNAhit = true;
209-
}
195+
bool isZNChit = false, isZNAhit = false;
196+
if (tdcCut) { // a narrow TDC window is set
197+
if ((tdcZNC >= tdcZNmincut) && (tdcZNC <= tdcZNmaxcut)) {
198+
isZNChit = true;
199+
}
200+
if ((tdcZNA >= tdcZNmincut) && (tdcZNA <= tdcZNmaxcut)) {
201+
isZNAhit = true;
202+
}
203+
} else { // if no window on TDC is set
204+
if (pmcZNC > 0.) {
205+
isZNChit = true;
210206
}
211-
if (isZNChit && isZNAhit) {
212-
registry.get<TH1>(HIST("debunchHist"))->Fill(zna-znc, zna+znc);
207+
if (pmcZNA > 0.) {
208+
isZNAhit = true;
213209
}
210+
}
211+
if (isZNChit && isZNAhit) {
212+
registry.get<TH1>(HIST("debunchHist"))->Fill(zna - znc, zna + znc);
213+
}
214214

215-
zdcTableoo(tdcZNA, zna, pmcZNA, pmqZNA[0], pmqZNA[1], pmqZNA[2], pmqZNA[3],
215+
zdcTableoo(tdcZNA, zna, pmcZNA, pmqZNA[0], pmqZNA[1], pmqZNA[2], pmqZNA[3],
216216
tdcZNC, znc, pmcZNC, pmqZNC[0], pmqZNC[1], pmqZNC[2], pmqZNC[3],
217217
tdcZPA, zpa, tdcZPC, zpc, tdcZEM1, zem1, tdcZEM2, zem2,
218218
-1, -1, -1,
@@ -253,7 +253,7 @@ struct ZdcTaskOxygen {
253253
for (auto const& amplitude : foundBC.fv0a().amplitude()) {
254254
multV0A += amplitude;
255255
}
256-
}
256+
}
257257

258258
if (foundBC.has_zdc()) {
259259
const auto& zdc = foundBC.zdc();
@@ -309,16 +309,16 @@ struct ZdcTaskOxygen {
309309
}
310310
}
311311
if (isZNChit && isZNAhit) {
312-
registry.get<TH1>(HIST("debunchHist"))->Fill(zna-znc, zna+znc);
312+
registry.get<TH1>(HIST("debunchHist"))->Fill(zna - znc, zna + znc);
313313
}
314314

315315
zdcTableoo(tdcZNA, zna, pmcZNA, pmqZNA[0], pmqZNA[1], pmqZNA[2], pmqZNA[3],
316-
tdcZNC, znc, pmcZNC, pmqZNC[0], pmqZNC[1], pmqZNC[2], pmqZNC[3],
317-
tdcZPA, zpa, tdcZPC, zpc, tdcZEM1, zem1, tdcZEM2, zem2,
318-
multFT0A, multFT0C, multV0A,
319-
zv,
320-
centralityFT0C, centralityFT0A, centralityFT0M,
321-
evSelection);
316+
tdcZNC, znc, pmcZNC, pmqZNC[0], pmqZNC[1], pmqZNC[2], pmqZNC[3],
317+
tdcZPA, zpa, tdcZPC, zpc, tdcZEM1, zem1, tdcZEM2, zem2,
318+
multFT0A, multFT0C, multV0A,
319+
zv,
320+
centralityFT0C, centralityFT0A, centralityFT0M,
321+
evSelection);
322322
}
323323
}
324324
}

0 commit comments

Comments
 (0)