Skip to content

Commit 65e7acf

Browse files
author
Prottay Das
committed
updated
1 parent beb2dde commit 65e7acf

File tree

3 files changed

+149
-146
lines changed

3 files changed

+149
-146
lines changed

‎PWGLF/DataModel/ZDCCalTables.h‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,22 @@ namespace o2::aod
2929
{
3030
namespace zdccaltable
3131
{
32-
DECLARE_SOA_COLUMN(TriggerEventZDC, triggereventzdc, bool);
33-
DECLARE_SOA_COLUMN(TriggerEventRunNo, triggereventrunno, int);
32+
DECLARE_SOA_COLUMN(TriggerEventZDC, triggerEventZDC, bool);
33+
DECLARE_SOA_COLUMN(TriggerEventRunNo, triggerEventRunNo, int);
3434
DECLARE_SOA_COLUMN(Cent, cent, float);
3535
DECLARE_SOA_COLUMN(Vx, vx, float);
3636
DECLARE_SOA_COLUMN(Vy, vy, float);
3737
DECLARE_SOA_COLUMN(Vz, vz, float);
38-
DECLARE_SOA_COLUMN(ZNAC, znaC, float);
39-
DECLARE_SOA_COLUMN(ZNCC, zncC, float);
40-
DECLARE_SOA_COLUMN(ZNAE0, znaE0, float);
41-
DECLARE_SOA_COLUMN(ZNAE1, znaE1, float);
42-
DECLARE_SOA_COLUMN(ZNAE2, znaE2, float);
43-
DECLARE_SOA_COLUMN(ZNAE3, znaE3, float);
44-
DECLARE_SOA_COLUMN(ZNCE0, zncE0, float);
45-
DECLARE_SOA_COLUMN(ZNCE1, zncE1, float);
46-
DECLARE_SOA_COLUMN(ZNCE2, zncE2, float);
47-
DECLARE_SOA_COLUMN(ZNCE3, zncE3, float);
38+
DECLARE_SOA_COLUMN(ZnaC, znaC, float);
39+
DECLARE_SOA_COLUMN(ZncC, zncC, float);
40+
DECLARE_SOA_COLUMN(ZnaE0, znaE0, float);
41+
DECLARE_SOA_COLUMN(ZnaE1, znaE1, float);
42+
DECLARE_SOA_COLUMN(ZnaE2, znaE2, float);
43+
DECLARE_SOA_COLUMN(ZnaE3, znaE3, float);
44+
DECLARE_SOA_COLUMN(ZncE0, zncE0, float);
45+
DECLARE_SOA_COLUMN(ZncE1, zncE1, float);
46+
DECLARE_SOA_COLUMN(ZncE2, zncE2, float);
47+
DECLARE_SOA_COLUMN(ZncE3, zncE3, float);
4848
} // namespace zdccaltable
4949
DECLARE_SOA_TABLE(ZDCCalTables, "AOD", "ZDCCALTABLE",
5050
zdccaltable::TriggerEventZDC,
@@ -53,16 +53,16 @@ DECLARE_SOA_TABLE(ZDCCalTables, "AOD", "ZDCCALTABLE",
5353
zdccaltable::Vx,
5454
zdccaltable::Vy,
5555
zdccaltable::Vz,
56-
zdccaltable::ZNAC,
57-
zdccaltable::ZNCC,
58-
zdccaltable::ZNAE0,
59-
zdccaltable::ZNAE1,
60-
zdccaltable::ZNAE2,
61-
zdccaltable::ZNAE3,
62-
zdccaltable::ZNCE0,
63-
zdccaltable::ZNCE1,
64-
zdccaltable::ZNCE2,
65-
zdccaltable::ZNCE3);
56+
zdccaltable::ZnaC,
57+
zdccaltable::ZncC,
58+
zdccaltable::ZnaE0,
59+
zdccaltable::ZnaE1,
60+
zdccaltable::ZnaE2,
61+
zdccaltable::ZnaE3,
62+
zdccaltable::ZncE0,
63+
zdccaltable::ZncE1,
64+
zdccaltable::ZncE2,
65+
zdccaltable::ZncE3);
6666
using ZDCCalTable = ZDCCalTables::iterator;
6767
} // namespace o2::aod
6868
#endif // PWGLF_DATAMODEL_ZDCCALTABLES_H_

‎PWGLF/TableProducer/Common/zdcvector.cxx‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "Common/DataModel/Qvectors.h"
2626
#include "Common/DataModel/TrackSelectionTables.h"
2727

28+
#include "Framework/Logger.h"
2829
#include <CCDB/BasicCCDBManager.h>
2930
#include <CCDB/CcdbApi.h>
3031
#include <CommonConstants/PhysicsConstants.h>
@@ -53,7 +54,6 @@
5354
#include <array>
5455
#include <chrono>
5556
#include <cmath>
56-
#include <iostream>
5757
#include <string>
5858
#include <vector>
5959

@@ -72,7 +72,6 @@ struct zdcvector {
7272
// Configurables.
7373
struct : ConfigurableGroup {
7474
Configurable<std::string> cfgURL{"cfgURL", "http://alice-ccdb.cern.ch", "Address of the CCDB to browse"};
75-
Configurable<int64_t> nolaterthan{"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"};
7675
} cfgCcdbParam;
7776

7877
// Enable access to the CCDB for the offset and correction constants and save them in dedicated variables.
@@ -87,19 +86,19 @@ struct zdcvector {
8786
Configurable<bool> usemem{"usemem", true, "usemem"};
8887

8988
struct : ConfigurableGroup {
90-
Configurable<int> VzfineNbins{"VzfineNbins", 20, "Number of bins in Vz fine histograms"};
89+
Configurable<int> vzFineNbins{"vzFineNbins", 20, "Number of bins in Vz fine histograms"};
9190
Configurable<float> lfinebinVz{"lfinebinVz", -10.0, "lower bin value in Vz fine histograms"};
9291
Configurable<float> hfinebinVz{"hfinebinVz", 10.0, "higher bin value in Vz fine histograms"};
93-
Configurable<int> CentfineNbins{"CentfineNbins", 16, "Number of bins in cent fine histograms"};
92+
Configurable<int> centFineNbins{"centFineNbins", 16, "Number of bins in cent fine histograms"};
9493
Configurable<float> lfinebinCent{"lfinebinCent", 0.0, "lower bin value in cent fine histograms"};
9594
Configurable<float> hfinebinCent{"hfinebinCent", 80.0, "higher bin value in cent fine histograms"};
9695
} configbins;
9796

9897
Configurable<bool> followpub{"followpub", true, "flag to use alphaZDC"};
9998
Configurable<bool> useGainCallib{"useGainCallib", false, "use gain calibration"};
10099
Configurable<bool> useCallibvertex{"useCallibvertex", false, "use calibration for vxy"};
101-
Configurable<std::string> ConfGainPath{"ConfGainPath", "Users/p/prottay/My/Object/NewPbPbpass4_10092024/gaincallib", "Path to gain calibration"};
102-
Configurable<std::string> ConfGainPathvxy{"ConfGainPathvxy", "Users/p/prottay/My/Object/swapcoords/PbPbpass4_20112024/recentervert", "Path to gain calibration for vxy"};
100+
Configurable<std::string> confGainPath{"confGainPath", "Users/p/prottay/My/Object/NewPbPbpass4_10092024/gaincallib", "Path to gain calibration"};
101+
Configurable<std::string> confGainPathVxy{"confGainPathVxy", "Users/p/prottay/My/Object/swapcoords/PbPbpass4_20112024/recentervert", "Path to gain calibration for vxy"};
103102

104103
struct : ConfigurableGroup {
105104
Configurable<bool> requireRCTFlagChecker{"requireRCTFlagChecker", true, "Check event quality in run condition table"};
@@ -116,8 +115,8 @@ struct zdcvector {
116115
rctChecker.init(rctCut.cfgEvtRCTFlagCheckerLabel, rctCut.cfgEvtRCTFlagCheckerZDCCheck, rctCut.cfgEvtRCTFlagCheckerLimitAcceptAsBad);
117116

118117
AxisSpec channelZDCAxis = {8, 0.0, 8.0, "ZDC tower"};
119-
AxisSpec vzfineAxis = {configbins.VzfineNbins, configbins.lfinebinVz, configbins.hfinebinVz, "vzfine"};
120-
AxisSpec centfineAxis = {configbins.CentfineNbins, configbins.lfinebinCent, configbins.hfinebinCent, "V0M (%) fine"};
118+
AxisSpec vzfineAxis = {configbins.vzFineNbins, configbins.lfinebinVz, configbins.hfinebinVz, "vzfine"};
119+
AxisSpec centfineAxis = {configbins.centFineNbins, configbins.lfinebinCent, configbins.hfinebinCent, "V0M (%) fine"};
121120
AxisSpec VxyAxis = {2, 0, 2, "Vxy"};
122121

123122
histos.add("htpcnsigmapi", "htpcnsigmapi", kTH1F, {{50, -10, 10.0}});
@@ -227,10 +226,10 @@ struct zdcvector {
227226

228227
histos.fill(HIST("hEvtSelInfo"), 6.5);
229228

230-
if (collision.sel8() && centrality > cfgCutCentralityMin && centrality < cfgCutCentralityMax && TMath::Abs(vz) < cfgCutVertex && collision.has_foundFT0() && collision.selection_bit(aod::evsel::kNoTimeFrameBorder) && collision.selection_bit(aod::evsel::kNoITSROFrameBorder)) {
229+
if (collision.sel8() && centrality > cfgCutCentralityMin && centrality < cfgCutCentralityMax && std::abs(vz) < cfgCutVertex && collision.has_foundFT0() && collision.selection_bit(aod::evsel::kNoTimeFrameBorder) && collision.selection_bit(aod::evsel::kNoITSROFrameBorder)) {
231230
triggerevent = true;
232231
if (useGainCallib && (currentRunNumber != lastRunNumber)) {
233-
gainprofile = ccdb->getForTimeStamp<TH2D>(ConfGainPath.value, bc.timestamp());
232+
gainprofile = ccdb->getForTimeStamp<TH2D>(confGainPath.value, bc.timestamp());
234233
}
235234

236235
histos.fill(HIST("hEvtSelInfo"), 7.5);
@@ -243,7 +242,8 @@ struct zdcvector {
243242
histos.fill(HIST("ZDCAmpCommon"), 0.5, vz, znaEnergycommon);
244243
histos.fill(HIST("ZDCAmpCommon"), 1.5, vz, zncEnergycommon);
245244

246-
for (std::size_t iChA = 0; iChA < 8; iChA++) {
245+
int ntow = 8;
246+
for (std::size_t iChA = 0; iChA < ntow; iChA++) {
247247
auto chanelid = iChA;
248248
if (useGainCallib && gainprofile) {
249249
gainequal = gainprofile->GetBinContent(gainprofile->FindBin(vz + 0.00001, chanelid + 0.5));
@@ -258,7 +258,7 @@ struct zdcvector {
258258
} else {
259259
double ampl = gainequal * znaEnergy[iChA];
260260
if (followpub) {
261-
ampl = TMath::Power(ampl, alphaZDC);
261+
ampl = std::pow(ampl, alphaZDC);
262262
}
263263
qxZDCA = qxZDCA - ampl * x[iChA];
264264
qyZDCA = qyZDCA + ampl * y[iChA];
@@ -273,7 +273,7 @@ struct zdcvector {
273273
} else {
274274
double ampl = gainequal * zncEnergy[iChA - 4];
275275
if (followpub) {
276-
ampl = TMath::Power(ampl, alphaZDC);
276+
ampl = std::pow(ampl, alphaZDC);
277277
}
278278
qxZDCC = qxZDCC + ampl * x[iChA - 4];
279279
qyZDCC = qyZDCC + ampl * y[iChA - 4];
@@ -310,7 +310,7 @@ struct zdcvector {
310310
histos.fill(HIST("AvgVxy"), 1.5, vy);
311311

312312
if (useCallibvertex && (currentRunNumber != lastRunNumber)) {
313-
gainprofilevxy = ccdb->getForTimeStamp<TProfile>(ConfGainPathvxy.value, bc.timestamp());
313+
gainprofilevxy = ccdb->getForTimeStamp<TProfile>(confGainPathVxy.value, bc.timestamp());
314314
}
315315

316316
if (useCallibvertex) {

0 commit comments

Comments
 (0)