Skip to content

Commit 1b32fed

Browse files
prottayCMTProttay Das
prottayCMT
and
Prottay Das
authored
[PWGLF] updated data models and table producer for reducing deriveddata size (#15177)
Co-authored-by: Prottay Das <prottay@alipap1.cern.ch>
1 parent a7a0353 commit 1b32fed

File tree

3 files changed

+39
-46
lines changed

3 files changed

+39
-46
lines changed

‎PWGLF/DataModel/ZDCCalTables.h‎

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,10 @@ DECLARE_SOA_COLUMN(Cent, cent, float);
3434
DECLARE_SOA_COLUMN(Vx, vx, float);
3535
DECLARE_SOA_COLUMN(Vy, vy, float);
3636
DECLARE_SOA_COLUMN(Vz, vz, float);
37-
DECLARE_SOA_COLUMN(ZnaC, znaC, float);
38-
DECLARE_SOA_COLUMN(ZncC, zncC, float);
39-
DECLARE_SOA_COLUMN(ZnaE0, znaE0, float);
40-
DECLARE_SOA_COLUMN(ZnaE1, znaE1, float);
41-
DECLARE_SOA_COLUMN(ZnaE2, znaE2, float);
42-
DECLARE_SOA_COLUMN(ZnaE3, znaE3, float);
43-
DECLARE_SOA_COLUMN(ZncE0, zncE0, float);
44-
DECLARE_SOA_COLUMN(ZncE1, zncE1, float);
45-
DECLARE_SOA_COLUMN(ZncE2, zncE2, float);
46-
DECLARE_SOA_COLUMN(ZncE3, zncE3, float);
37+
DECLARE_SOA_COLUMN(QxA, qxA, float);
38+
DECLARE_SOA_COLUMN(QxC, qxC, float);
39+
DECLARE_SOA_COLUMN(QyA, qyA, float);
40+
DECLARE_SOA_COLUMN(QyC, qyC, float);
4741
} // namespace zdccaltable
4842
DECLARE_SOA_TABLE(ZDCCalTables, "AOD", "ZDCCALTABLE",
4943
zdccaltable::TriggerEventZDC,
@@ -52,16 +46,10 @@ DECLARE_SOA_TABLE(ZDCCalTables, "AOD", "ZDCCALTABLE",
5246
zdccaltable::Vx,
5347
zdccaltable::Vy,
5448
zdccaltable::Vz,
55-
zdccaltable::ZnaC,
56-
zdccaltable::ZncC,
57-
zdccaltable::ZnaE0,
58-
zdccaltable::ZnaE1,
59-
zdccaltable::ZnaE2,
60-
zdccaltable::ZnaE3,
61-
zdccaltable::ZncE0,
62-
zdccaltable::ZncE1,
63-
zdccaltable::ZncE2,
64-
zdccaltable::ZncE3);
49+
zdccaltable::QxA,
50+
zdccaltable::QxC,
51+
zdccaltable::QyA,
52+
zdccaltable::QyC);
6553
using ZDCCalTable = ZDCCalTables::iterator;
6654
} // namespace o2::aod
6755
#endif // PWGLF_DATAMODEL_ZDCCALTABLES_H_

‎PWGLF/TableProducer/Common/zdcvector.cxx‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ struct zdcvector {
176176

177177
if (!bc.has_zdc()) {
178178
triggerevent = false;
179-
zdccaltable(triggerevent, currentRunNumber, centrality, vx, vy, vz, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
179+
zdccaltable(triggerevent, currentRunNumber, centrality, vx, vy, vz, 0.0, 0.0, 0.0, 0.0);
180180
return;
181181
}
182182

@@ -190,38 +190,43 @@ struct zdcvector {
190190

191191
if (znaEnergycommon <= 0.0 || zncEnergycommon <= 0.0) {
192192
triggerevent = false;
193-
zdccaltable(triggerevent, currentRunNumber, centrality, vx, vy, vz, znaEnergycommon, zncEnergycommon, znaEnergy[0], znaEnergy[1], znaEnergy[2], znaEnergy[3], zncEnergy[0], zncEnergy[1], zncEnergy[2], zncEnergy[3]);
193+
zdccaltable(triggerevent, currentRunNumber, centrality, vx, vy, vz, 0.0, 0.0, 0.0, 0.0);
194+
// zdccaltable(triggerevent, currentRunNumber, centrality, vx, vy, vz, znaEnergycommon, zncEnergycommon, znaEnergy[0], znaEnergy[1], znaEnergy[2], znaEnergy[3], zncEnergy[0], zncEnergy[1], zncEnergy[2], zncEnergy[3]);
194195
return;
195196
}
196197

197198
histos.fill(HIST("hEvtSelInfo"), 2.5);
198199

199200
if (znaEnergy[0] <= 0.0 || znaEnergy[1] <= 0.0 || znaEnergy[2] <= 0.0 || znaEnergy[3] <= 0.0) {
200201
triggerevent = false;
201-
zdccaltable(triggerevent, currentRunNumber, centrality, vx, vy, vz, znaEnergycommon, zncEnergycommon, znaEnergy[0], znaEnergy[1], znaEnergy[2], znaEnergy[3], zncEnergy[0], zncEnergy[1], zncEnergy[2], zncEnergy[3]);
202+
zdccaltable(triggerevent, currentRunNumber, centrality, vx, vy, vz, 0.0, 0.0, 0.0, 0.0);
203+
// zdccaltable(triggerevent, currentRunNumber, centrality, vx, vy, vz, znaEnergycommon, zncEnergycommon, znaEnergy[0], znaEnergy[1], znaEnergy[2], znaEnergy[3], zncEnergy[0], zncEnergy[1], zncEnergy[2], zncEnergy[3]);
202204
return;
203205
}
204206
histos.fill(HIST("hEvtSelInfo"), 3.5);
205207

206208
if (zncEnergy[0] <= 0.0 || zncEnergy[1] <= 0.0 || zncEnergy[2] <= 0.0 || zncEnergy[3] <= 0.0) {
207209
triggerevent = false;
208-
zdccaltable(triggerevent, currentRunNumber, centrality, vx, vy, vz, znaEnergycommon, zncEnergycommon, znaEnergy[0], znaEnergy[1], znaEnergy[2], znaEnergy[3], zncEnergy[0], zncEnergy[1], zncEnergy[2], zncEnergy[3]);
210+
zdccaltable(triggerevent, currentRunNumber, centrality, vx, vy, vz, 0.0, 0.0, 0.0, 0.0);
211+
// zdccaltable(triggerevent, currentRunNumber, centrality, vx, vy, vz, znaEnergycommon, zncEnergycommon, znaEnergy[0], znaEnergy[1], znaEnergy[2], znaEnergy[3], zncEnergy[0], zncEnergy[1], zncEnergy[2], zncEnergy[3]);
209212
return;
210213
}
211214

212215
histos.fill(HIST("hEvtSelInfo"), 4.5);
213216

214217
if (rctCut.requireRCTFlagChecker && !rctChecker(collision)) {
215218
triggerevent = false;
216-
zdccaltable(triggerevent, currentRunNumber, centrality, vx, vy, vz, znaEnergycommon, zncEnergycommon, znaEnergy[0], znaEnergy[1], znaEnergy[2], znaEnergy[3], zncEnergy[0], zncEnergy[1], zncEnergy[2], zncEnergy[3]);
219+
zdccaltable(triggerevent, currentRunNumber, centrality, vx, vy, vz, 0.0, 0.0, 0.0, 0.0);
220+
// zdccaltable(triggerevent, currentRunNumber, centrality, vx, vy, vz, znaEnergycommon, zncEnergycommon, znaEnergy[0], znaEnergy[1], znaEnergy[2], znaEnergy[3], zncEnergy[0], zncEnergy[1], zncEnergy[2], zncEnergy[3]);
217221
return;
218222
}
219223

220224
histos.fill(HIST("hEvtSelInfo"), 5.5);
221225

222226
if (additionalEvSel && (!collision.selection_bit(aod::evsel::kIsGoodZvtxFT0vsPV))) {
223227
triggerevent = false;
224-
zdccaltable(triggerevent, currentRunNumber, centrality, vx, vy, vz, znaEnergycommon, zncEnergycommon, znaEnergy[0], znaEnergy[1], znaEnergy[2], znaEnergy[3], zncEnergy[0], zncEnergy[1], zncEnergy[2], zncEnergy[3]);
228+
zdccaltable(triggerevent, currentRunNumber, centrality, vx, vy, vz, 0.0, 0.0, 0.0, 0.0);
229+
// zdccaltable(triggerevent, currentRunNumber, centrality, vx, vy, vz, znaEnergycommon, zncEnergycommon, znaEnergy[0], znaEnergy[1], znaEnergy[2], znaEnergy[3], zncEnergy[0], zncEnergy[1], zncEnergy[2], zncEnergy[3]);
225230
return;
226231
}
227232

@@ -255,7 +260,7 @@ struct zdcvector {
255260

256261
if (znaEnergy[iChA] <= 0.0) {
257262
triggerevent = false;
258-
zdccaltable(triggerevent, currentRunNumber, centrality, vx, vy, vz, znaEnergycommon, zncEnergycommon, znaEnergy[0], znaEnergy[1], znaEnergy[2], znaEnergy[3], zncEnergy[0], zncEnergy[1], zncEnergy[2], zncEnergy[3]);
263+
zdccaltable(triggerevent, currentRunNumber, centrality, vx, vy, vz, 0.0, 0.0, 0.0, 0.0);
259264
return;
260265
} else {
261266
double ampl = gainequal * znaEnergy[iChA];
@@ -270,7 +275,8 @@ struct zdcvector {
270275
} else {
271276
if (zncEnergy[iChA - 4] <= 0.0) {
272277
triggerevent = false;
273-
zdccaltable(triggerevent, currentRunNumber, centrality, vx, vy, vz, znaEnergycommon, zncEnergycommon, znaEnergy[0], znaEnergy[1], znaEnergy[2], znaEnergy[3], zncEnergy[0], zncEnergy[1], zncEnergy[2], zncEnergy[3]);
278+
zdccaltable(triggerevent, currentRunNumber, centrality, vx, vy, vz, 0.0, 0.0, 0.0, 0.0);
279+
// zdccaltable(triggerevent, currentRunNumber, centrality, vx, vy, vz, znaEnergycommon, zncEnergycommon, znaEnergy[0], znaEnergy[1], znaEnergy[2], znaEnergy[3], zncEnergy[0], zncEnergy[1], zncEnergy[2], zncEnergy[3]);
274280
return;
275281
} else {
276282
double ampl = gainequal * zncEnergy[iChA - 4];
@@ -300,7 +306,8 @@ struct zdcvector {
300306
qyZDCA = 0.0;
301307
qyZDCC = 0.0;
302308
triggerevent = false;
303-
zdccaltable(triggerevent, currentRunNumber, centrality, vx, vy, vz, znaEnergycommon, zncEnergycommon, znaEnergy[0], znaEnergy[1], znaEnergy[2], znaEnergy[3], zncEnergy[0], zncEnergy[1], zncEnergy[2], zncEnergy[3]);
309+
zdccaltable(triggerevent, currentRunNumber, centrality, vx, vy, vz, 0.0, 0.0, 0.0, 0.0);
310+
// zdccaltable(triggerevent, currentRunNumber, centrality, vx, vy, vz, znaEnergycommon, zncEnergycommon, znaEnergy[0], znaEnergy[1], znaEnergy[2], znaEnergy[3], zncEnergy[0], zncEnergy[1], zncEnergy[2], zncEnergy[3]);
304311
return;
305312
}
306313

@@ -322,7 +329,7 @@ struct zdcvector {
322329

323330
lastRunNumber = currentRunNumber;
324331
}
325-
zdccaltable(triggerevent, currentRunNumber, centrality, vx, vy, vz, znaEnergycommon, zncEnergycommon, znaEnergy[0], znaEnergy[1], znaEnergy[2], znaEnergy[3], zncEnergy[0], zncEnergy[1], zncEnergy[2], zncEnergy[3]);
332+
zdccaltable(triggerevent, currentRunNumber, centrality, vx, vy, vz, qxZDCA, qxZDCC, qyZDCA, qyZDCC);
326333
}
327334
};
328335

‎PWGLF/Tasks/Strangeness/zdccalderived.cxx‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ struct zdccalderived {
116116
Configurable<bool> useShift{"useShift", false, "shift histograms"};
117117
Configurable<bool> ispolarization{"ispolarization", false, "Flag to check polarization"};
118118
Configurable<bool> followpub{"followpub", true, "flag to use alphaZDC"};
119-
Configurable<bool> useGainCallib{"useGainCallib", false, "use gain calibration"};
120-
Configurable<bool> useCallibvertex{"useCallibvertex", false, "use calibration for vxy"};
119+
// Configurable<bool> useGainCallib{"useGainCallib", false, "use gain calibration"};
120+
// Configurable<bool> useCallibvertex{"useCallibvertex", false, "use calibration for vxy"};
121121
Configurable<bool> coarse1{"coarse1", false, "RE1"};
122122
Configurable<bool> fine1{"fine1", false, "REfine1"};
123123
Configurable<bool> coarse2{"coarse2", false, "RE2"};
@@ -133,8 +133,6 @@ struct zdccalderived {
133133
Configurable<bool> useRecentereSp{"useRecentereSp", false, "use Recentering with Sparse or THn"};
134134
Configurable<bool> useRecenterefineSp{"useRecenterefineSp", false, "use fine Recentering with THn"};
135135

136-
Configurable<std::string> confGainPath{"confGainPath", "Users/p/prottay/My/Object/NewPbPbpass4_10092024/gaincallib", "Path to gain calibration"};
137-
Configurable<std::string> confGainPathVxy{"confGainPathVxy", "Users/p/prottay/My/Object/swapcoords/PbPbpass4_20112024/recentervert", "Path to gain calibration for vxy"};
138136
Configurable<std::string> confRecentereSp{"confRecentereSp", "Users/p/prottay/My/Object/Testingwithsparse/NewPbPbpass4_17092024/recenter", "Sparse or THn path for recentering"};
139137
Configurable<std::string> confRecentereSp2{"confRecentereSp2", "Users/p/prottay/My/Object/Testingwithsparse/NewPbPbpass4_17092024/recenter", "Sparse or THn path for recentering 2"};
140138
Configurable<std::string> confRecentereSp3{"confRecentereSp3", "Users/p/prottay/My/Object/Testingwithsparse/NewPbPbpass4_17092024/recenter", "Sparse or THn path for recentering 3"};
@@ -354,20 +352,20 @@ struct zdccalderived {
354352
auto vx = collision.vx();
355353
auto vy = collision.vy();
356354

357-
float psiZDCC = -99;
358-
float psiZDCA = -99;
359-
auto qxZDCA = 0.0;
360-
auto qxZDCC = 0.0;
361-
auto qyZDCA = 0.0;
362-
auto qyZDCC = 0.0;
363-
auto sumA = 0.0;
364-
auto sumC = 0.0;
355+
double psiZDCC = -99;
356+
double psiZDCA = -99;
357+
auto qxZDCA = collision.qxA();
358+
auto qxZDCC = collision.qxC();
359+
auto qyZDCA = collision.qyA();
360+
auto qyZDCC = collision.qyC();
361+
// auto sumA = 0.0;
362+
// auto sumC = 0.0;
365363

366364
auto timestamps = ccdb->getRunDuration(currentRunNumber, true); /// fatalise if timestamps are not found
367365
int64_t sorTimestamp = timestamps.first; // timestamp of the SOR/SOX/STF in ms
368366
int64_t eorTimestamp = timestamps.second; // timestamp of the EOR/EOX/ETF in ms
369367
int64_t ts = eorTimestamp / 2 + sorTimestamp / 2; // timestamp of the middle of the run
370-
368+
/*
371369
std::array<float, 4> znaEnergy = {
372370
collision.znaE0(),
373371
collision.znaE1(),
@@ -442,14 +440,14 @@ struct zdccalderived {
442440
qyZDCC = 0.0;
443441
return;
444442
}
445-
443+
*/
446444
histos.fill(HIST("hEvtSelInfo"), 8.5);
447445
histos.fill(HIST("hCentrality"), centrality);
448446
histos.fill(HIST("Vz"), vz);
449447

450448
histos.fill(HIST("AvgVxy"), 0.5, vx);
451449
histos.fill(HIST("AvgVxy"), 1.5, vy);
452-
450+
/*
453451
if (useCallibvertex && (currentRunNumber != lastRunNumber)) {
454452
gainprofilevxy = ccdb->getForTimeStamp<TProfile>(confGainPathVxy.value, ts);
455453
}
@@ -458,7 +456,7 @@ struct zdccalderived {
458456
vx = vx - gainprofilevxy->GetBinContent(1);
459457
vy = vy - gainprofilevxy->GetBinContent(2);
460458
}
461-
459+
*/
462460
bool res = 0;
463461
bool resfine = 0;
464462
int check = 1;

0 commit comments

Comments
 (0)