Skip to content

Commit 9ea63f5

Browse files
coppediscoppedis
committed
Updating task and table reader
1 parent efcc862 commit 9ea63f5

File tree

2 files changed

+80
-35
lines changed

2 files changed

+80
-35
lines changed

‎Common/TableProducer/zdcTaskLightIons.cxx‎

Lines changed: 37 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,13 @@ struct ZdcTaskLightIons {
6363

6464
enum SelectionCriteria {
6565
evSel_zvtx,
66+
evSel_kIsTriggerTVX,
6667
evSel_sel8,
6768
evSel_occupancy,
6869
evSel_kNoSameBunchPileup,
6970
evSel_kIsGoodZvtxFT0vsPV,
7071
evSel_kNoCollInTimeRangeStandard,
72+
evSel_kNoTimeFrameBorder,
7173
evSel_kNoITSROFrameBorder,
7274
evSel_kIsGoodITSLayersAll,
7375
evSel_allEvents,
@@ -78,25 +80,27 @@ struct ZdcTaskLightIons {
7880
{
7981
registry.add("zdcDebunchHist", "ZN sum vs. diff; ZNA-ZNC (ns); ZNA+ZNC (ns)", {HistType::kTH2D, {{nBinsTiming, -20., 20.}, {nBinsTiming, -20., 20.}}});
8082

81-
if (doprocessALICEcoll) {
82-
registry.add("hEventCount", "Number of Event; Cut; #Events Passed Cut", {HistType::kTH1D, {{nEventSelections, 0, nEventSelections}}});
83-
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_allEvents + 1, "All events");
84-
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_zvtx + 1, "vtxZ");
85-
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_sel8 + 1, "Sel8");
86-
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_occupancy + 1, "kOccupancy");
87-
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_kNoSameBunchPileup + 1, "kNoSameBunchPileup");
88-
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_kIsGoodZvtxFT0vsPV + 1, "kIsGoodZvtxFT0vsPV");
89-
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_kNoCollInTimeRangeStandard + 1, "kNoCollInTimeRangeStandard");
90-
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_kNoITSROFrameBorder + 1, "kNoITSROFrameBorder");
91-
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_kIsGoodITSLayersAll + 1, "kkIsGoodITSLayersAll");
92-
}
83+
// if (doprocessALICEcoll) {
84+
registry.add("hEventCount", "Number of events; Cut; # of selected events ", {HistType::kTH1D, {{nEventSelections, 0, nEventSelections}}});
85+
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_allEvents + 1, "All events");
86+
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_zvtx + 1, "vtxZ");
87+
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_sel8 + 1, "sel8");
88+
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_kIsTriggerTVX + 1, "kIsTriggerTVX");
89+
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_occupancy + 1, "kOccupancy");
90+
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_kNoSameBunchPileup + 1, "kNoSameBunchPileup");
91+
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_kIsGoodZvtxFT0vsPV + 1, "kIsGoodZvtxFT0vsPV");
92+
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_kNoCollInTimeRangeStandard + 1, "kNoCollInTimeRangeStandard");
93+
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_kNoTimeFrameBorder + 1, "kNoTimeFrameBorder");
94+
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_kNoITSROFrameBorder + 1, "kNoITSROFrameBorder");
95+
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_kIsGoodITSLayersAll + 1, "kkIsGoodITSLayersAll");
96+
//}
9397
}
9498

9599
template <typename TCollision>
96100
uint8_t eventSelected(TCollision collision)
97101
{
98102
uint8_t selectionBits = 0;
99-
bool selected;
103+
bool selected = false;
100104

101105
registry.fill(HIST("hEventCount"), evSel_allEvents);
102106

@@ -112,6 +116,12 @@ struct ZdcTaskLightIons {
112116
registry.fill(HIST("hEventCount"), evSel_sel8);
113117
}
114118

119+
selected = collision.selection_bit(kIsTriggerTVX);
120+
if (selected) {
121+
selectionBits |= (uint8_t)(0x1u << evSel_kIsTriggerTVX);
122+
registry.fill(HIST("hEventCount"), evSel_kIsTriggerTVX);
123+
}
124+
115125
auto occupancy = collision.trackOccupancyInTimeRange();
116126
selected = occupancy <= cfgEvSelsMaxOccupancy;
117127
if (selected) {
@@ -137,6 +147,12 @@ struct ZdcTaskLightIons {
137147
registry.fill(HIST("hEventCount"), evSel_kNoCollInTimeRangeStandard);
138148
}
139149

150+
selected = collision.selection_bit(o2::aod::evsel::kNoTimeFrameBorder);
151+
if (selected) {
152+
selectionBits |= (uint8_t)(0x1u << evSel_kNoTimeFrameBorder);
153+
registry.fill(HIST("hEventCount"), evSel_kNoTimeFrameBorder);
154+
}
155+
140156
selected = collision.selection_bit(o2::aod::evsel::kNoITSROFrameBorder);
141157
if (selected) {
142158
selectionBits |= (uint8_t)(0x1u << evSel_kNoITSROFrameBorder);
@@ -237,6 +253,14 @@ struct ZdcTaskLightIons {
237253

238254
const auto& foundBC = collision.foundBC_as<BCsRun3>();
239255
uint8_t evSelection = eventSelected(collision);
256+
//
257+
// sel8
258+
if (!collision.sel8())
259+
continue;
260+
// vertex cut
261+
if (std::fabs(collision.posZ()) > cfgEvSelVtxZ)
262+
continue;
263+
240264
auto zv = collision.posZ();
241265
auto centralityFT0C = collision.centFT0C();
242266
auto centralityFT0A = collision.centFT0A();

‎Common/Tasks/zdcTableReader.cxx‎

Lines changed: 43 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ struct ZDCLIAnalysis {
5858

5959
void init(InitContext const&)
6060
{
61-
registry.add("hZNApmc", "ZNApmc; ZNA amplitude; Entries", {HistType::kTH1F, {{nBinsAmpZN, -10.5, MaxZN}}});
62-
registry.add("hZPApmc", "ZPApmc; ZPA amplitude; Entries", {HistType::kTH1F, {{nBinsAmpZP, -10.5, MaxZP}}});
63-
registry.add("hZNCpmc", "ZNCpmc; ZNC amplitude; Entries", {HistType::kTH1F, {{nBinsAmpZN, -10.5, MaxZN}}});
64-
registry.add("hZPCpmc", "ZPCpmc; ZPC amplitude; Entries", {HistType::kTH1F, {{nBinsAmpZP, -10.5, MaxZP}}});
65-
registry.add("hZEM", "ZEM; ZEM1+ZEM2 amplitude; Entries", {HistType::kTH1F, {{nBinsAmpZP, -10.5, MaxZEM}}});
61+
registry.add("hZNApmc", "ZNApmc; ZNA amplitude; Entries", {HistType::kTH1F, {{nBinsAmpZN, -0.5, MaxZN}}});
62+
registry.add("hZPApmc", "ZPApmc; ZPA amplitude; Entries", {HistType::kTH1F, {{nBinsAmpZP, -0.5, MaxZP}}});
63+
registry.add("hZNCpmc", "ZNCpmc; ZNC amplitude; Entries", {HistType::kTH1F, {{nBinsAmpZN, -0.5, MaxZN}}});
64+
registry.add("hZPCpmc", "ZPCpmc; ZPC amplitude; Entries", {HistType::kTH1F, {{nBinsAmpZP, -0.5, MaxZP}}});
65+
registry.add("hZEM", "ZEM; ZEM1+ZEM2 amplitude; Entries", {HistType::kTH1F, {{nBinsAmpZP, -0.5, MaxZEM}}});
6666
registry.add("hZNAamplvsADC", "ZNA amplitude vs. ADC; ZNA ADC; ZNA amplitude", {HistType::kTH2F, {{{nBinsAmpZN, -0.5, 3. * MaxZN}, {nBinsAmpZN, -0.5, MaxZN}}}});
6767
registry.add("hZNCamplvsADC", "ZNC amplitude vs. ADC; ZNC ADC; ZNC amplitude", {HistType::kTH2F, {{{nBinsAmpZN, -0.5, 3. * MaxZN}, {nBinsAmpZN, -0.5, MaxZN}}}});
6868
registry.add("hZPAamplvsADC", "ZPA amplitude vs. ADC; ZPA ADC; ZPA amplitude", {HistType::kTH2F, {{{nBinsAmpZP, -0.5, 3. * MaxZP}, {nBinsAmpZP, -0.5, MaxZP}}}});
@@ -76,10 +76,10 @@ struct ZDCLIAnalysis {
7676
registry.add("hZNCcvsZNCsum", "ZNC PMC vs PMsum; ZNCC ADC; ZNCsum", {HistType::kTH2F, {{{nBinsADC, -0.5, 3. * MaxZN}, {nBinsADC, -0.5, 3. * MaxZN}}}});
7777
registry.add("hZNAcvsZNAsum", "ZNA PMC vs PMsum; ZNAsum", {HistType::kTH2F, {{{nBinsADC, -0.5, 3. * MaxZN}, {nBinsADC, -0.5, 3. * MaxZN}}}});
7878
//
79-
registry.add("hZNCvstdc", "ZNC vs tdc; ZNC amplitude; ZNC TDC", {HistType::kTH2F, {{{480, -13.5, 11.45}, {nBinsAmpZN, -0.5, MaxZN}}}});
80-
registry.add("hZNAvstdc", "ZNA vs tdc; ZNA amplitude; ZNA TDC", {HistType::kTH2F, {{{480, -13.5, 11.45}, {nBinsAmpZN, -0.5, MaxZN}}}});
81-
registry.add("hZPCvstdc", "ZPC vs tdc; ZPC amplitude; ZPC TDC", {HistType::kTH2F, {{{480, -13.5, 11.45}, {nBinsAmpZP, -0.5, MaxZP}}}});
82-
registry.add("hZPAvstdc", "ZPA vs tdc; ZPA amplitude; ZPA TDC", {HistType::kTH2F, {{{480, -13.5, 11.45}, {nBinsAmpZP, -0.5, MaxZP}}}});
79+
registry.add("hZNCvstdc", "ZNC vs tdc; ZNC TDC (ns); ZNC amplitude", {HistType::kTH2F, {{{480, -13.5, 11.45}, {nBinsAmpZN, -0.5, MaxZN}}}});
80+
registry.add("hZNAvstdc", "ZNA vs tdc; ZNA TDC (ns); ZNA amplitude", {HistType::kTH2F, {{{480, -13.5, 11.45}, {nBinsAmpZN, -0.5, MaxZN}}}});
81+
registry.add("hZPCvstdc", "ZPC vs tdc; ZPC TDC (ns); ZPC amplitude", {HistType::kTH2F, {{{480, -13.5, 11.45}, {nBinsAmpZP, -0.5, MaxZP}}}});
82+
registry.add("hZPAvstdc", "ZPA vs tdc; ZPA TDC (ns); ZPA amplitude", {HistType::kTH2F, {{{480, -13.5, 11.45}, {nBinsAmpZP, -0.5, MaxZP}}}});
8383
//
8484
registry.add("hZNvsV0A", "ZN vs V0A", {HistType::kTH2F, {{{nBinsFit, 0., MaxMultFV0}, {nBinsAmpZN, -0.5, 2. * MaxZN}}}});
8585
registry.add("hZNAvsFT0A", "ZNA vs FT0A", {HistType::kTH2F, {{{nBinsFit, 0., MaxMultFT0}, {nBinsAmpZN, -0.5, MaxZN}}}});
@@ -139,10 +139,31 @@ struct ZDCLIAnalysis {
139139
auto timestamp = zdc.timestamp();
140140
// auto selectionBits = zdc.selectionBits();
141141

142-
enCalibZNA != 1.0 ? zna *= enCalibZNA : zna;
143-
enCalibZNC != 1.0 ? znc *= enCalibZNC : znc;
144-
enCalibZPA != 1.0 ? zpa *= enCalibZPA : zpa;
145-
enCalibZPC != 1.0 ? zpc *= enCalibZPC : zpc;
142+
if( enCalibZNA > 0.) {
143+
zna *= enCalibZNA;
144+
znaADC *= enCalibZNA;
145+
znapm1 *= enCalibZNA;
146+
znapm2 *= enCalibZNA;
147+
znapm3 *= enCalibZNA;
148+
znapm4 *= enCalibZNA;
149+
150+
}
151+
if( enCalibZNC > 0.) {
152+
znc *= enCalibZNC;
153+
zncADC *= enCalibZNC;
154+
zncpm1 *= enCalibZNC;
155+
zncpm2 *= enCalibZNC;
156+
zncpm3 *= enCalibZNC;
157+
zncpm4 *= enCalibZNC;
158+
}
159+
if( enCalibZPA > 0.) {
160+
zpa *= enCalibZPA;
161+
zpaADC *= enCalibZPA;
162+
}
163+
if( enCalibZPC > 0.) {
164+
zpc *= enCalibZPC;
165+
zpcADC *= enCalibZPC;
166+
}
146167

147168
registry.get<TH1>(HIST("hZNApmc"))->Fill(zna);
148169
registry.get<TH1>(HIST("hZNCpmc"))->Fill(znc);
@@ -166,8 +187,8 @@ struct ZDCLIAnalysis {
166187
registry.get<TH2>(HIST("hZPAvstdc"))->Fill(tdczpa, zpa);
167188
registry.get<TH2>(HIST("hZPCvstdc"))->Fill(tdczpc, zpc);
168189
//
169-
registry.get<TH2>(HIST("hZNAcvsZNAsum"))->Fill(znapm1 + znapm2 + znapm3 + znapm4, zna);
170-
registry.get<TH2>(HIST("hZNCcvsZNCsum"))->Fill(zncpm1 + zncpm2 + zncpm3 + zncpm4, znc);
190+
registry.get<TH2>(HIST("hZNAcvsZNAsum"))->Fill(0.25*(znapm1 + znapm2 + znapm3 + znapm4), zna);
191+
registry.get<TH2>(HIST("hZNCcvsZNCsum"))->Fill(0.25*(zncpm1 + zncpm2 + zncpm3 + zncpm4), znc);
171192
//
172193
registry.get<TH2>(HIST("hZNvsV0A"))->Fill(multV0A / 100., zna + znc);
173194
registry.get<TH2>(HIST("hZNAvsFT0A"))->Fill((multFT0A) / 100., zna);
@@ -186,15 +207,15 @@ struct ZDCLIAnalysis {
186207
registry.get<TH2>(HIST("hZPCvscentrFT0C"))->Fill(centrFT0C, zpc);
187208
registry.get<TH2>(HIST("hZPCvscentrFT0M"))->Fill(centrFT0M, zpc);
188209
//
189-
/*if ( tStampOffset > timestamp ) {
190-
printf(" ################# OFFSET timestamp too large!!!!!!!!!!!!!!!!!!!!!!!!!! > timestamp %llu \n", timestamp);
210+
if ( tStampOffset > timestamp ) {
211+
printf("\n\n ################# OFFSET timestamp too large!!!!!!!!!!!!!!!!!!!!!!!!!! > timestamp %llu \n\n", timestamp);
191212
return;
192-
}*/
193-
float tsh = 1. * (timestamp - tStampOffset) / 1000.;
194-
/*if ( tsh > tStampMax ) {
195-
printf(" MAXIMUM timestamp too small!!!!!!!!!!!!!!!!!!!!!!!!!! > timestamp-offset %f \n", tsh);
213+
}
214+
float tsh = (timestamp/1000.) - (tStampOffset/1000.); // in hours
215+
if ( tsh > tStampMax ) {
216+
printf("\n\n MAXIMUM timestamp too small!!!!!!!!!!!!!!!!!!!!!!!!!! > timestamp-offset %f \n\n", tsh);
196217
return;
197-
}*/
218+
}
198219
registry.get<TH2>(HIST("hZNAvstimestamp"))->Fill(tsh, zna);
199220
registry.get<TH2>(HIST("hZNCvstimestamp"))->Fill(tsh, znc);
200221
registry.get<TH2>(HIST("hZPAvstimestamp"))->Fill(tsh, zpa);

0 commit comments

Comments
 (0)