Skip to content

Commit 622afde

Browse files
authored
from rise time to time of arrival (#2534)
1 parent 439c8d1 commit 622afde

File tree

2 files changed

+36
-36
lines changed

2 files changed

+36
-36
lines changed

Modules/ITS/include/ITS/ITSThresholdCalibrationTask.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ class ITSThresholdCalibrationTask : public TaskInterface
6161
float status;
6262
float Tot; // time over threshold
6363
float TotRms; // time over threshold rms
64-
float Rt; // rise time
65-
float RtRms; // rise time rms
64+
float ToA; // time of arrival
65+
float ToARms; // time of arrival rms
6666
};
6767
struct CalibrationResStructPixel {
6868
int Layer;
@@ -135,8 +135,8 @@ class ITSThresholdCalibrationTask : public TaskInterface
135135
TH1F *hCalibrationThrNoiseLayer[NLayer], *hCalibrationThrNoiseRMSLayer[NLayer];
136136

137137
// Histograms for pulse-length scan
138-
TH2F *hTimeOverThreshold[3], *hTimeOverThresholdRms[3], *hRiseTime[3], *hRiseTimeRms[3];
139-
TH1F *hTimeOverThresholdLayer[NLayer], *hTimeOverThresholdRmsLayer[NLayer], *hRiseTimeLayer[NLayer], *hRiseTimeRmsLayer[NLayer];
138+
TH2F *hTimeOverThreshold[3], *hTimeOverThresholdRms[3], *hToA[3], *hToARms[3];
139+
TH1F *hTimeOverThresholdLayer[NLayer], *hTimeOverThresholdRmsLayer[NLayer], *hToALayer[NLayer], *hToARmsLayer[NLayer];
140140

141141
o2::itsmft::ChipMappingITS mp;
142142
};

Modules/ITS/src/ITSThresholdCalibrationTask.cxx

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ ITSThresholdCalibrationTask::~ITSThresholdCalibrationTask()
6060
if (iScan == TOT) {
6161
delete hTimeOverThreshold[iBarrel];
6262
delete hTimeOverThresholdRms[iBarrel];
63-
delete hRiseTime[iBarrel];
64-
delete hRiseTimeRms[iBarrel];
63+
delete hToA[iBarrel];
64+
delete hToARms[iBarrel];
6565
}
6666
if (iScan > 3) {
6767
delete hCalibrationDColChipAverage[iBarrel];
@@ -74,8 +74,8 @@ ITSThresholdCalibrationTask::~ITSThresholdCalibrationTask()
7474
for (int iLayer = 0; iLayer < NLayer; iLayer++) {
7575
delete hTimeOverThresholdLayer[iLayer];
7676
delete hTimeOverThresholdRmsLayer[iLayer];
77-
delete hRiseTimeLayer[iLayer];
78-
delete hRiseTimeRmsLayer[iLayer];
77+
delete hToALayer[iLayer];
78+
delete hToARmsLayer[iLayer];
7979
}
8080
}
8181
}
@@ -211,13 +211,13 @@ void ITSThresholdCalibrationTask::doAnalysisTHR(string inString, int iScan)
211211
// fill 2D plots for the pulse length scan
212212
hTimeOverThreshold[iBarrel]->SetBinContent(currentChip, currentStave, result.Tot);
213213
hTimeOverThresholdRms[iBarrel]->SetBinContent(currentChip, currentStave, result.TotRms);
214-
hRiseTime[iBarrel]->SetBinContent(currentChip, currentStave, result.Rt);
215-
hRiseTimeRms[iBarrel]->SetBinContent(currentChip, currentStave, result.RtRms);
214+
hToA[iBarrel]->SetBinContent(currentChip, currentStave, result.ToA);
215+
hToARms[iBarrel]->SetBinContent(currentChip, currentStave, result.ToARms);
216216
// fill 1D plots for the pulse length scan
217217
hTimeOverThresholdLayer[result.Layer]->Fill(result.Tot);
218218
hTimeOverThresholdRmsLayer[result.Layer]->Fill(result.TotRms);
219-
hRiseTimeLayer[result.Layer]->Fill(result.Rt);
220-
hRiseTimeRmsLayer[result.Layer]->Fill(result.RtRms);
219+
hToALayer[result.Layer]->Fill(result.ToA);
220+
hToARmsLayer[result.Layer]->Fill(result.ToARms);
221221
}
222222
}
223223
}
@@ -339,10 +339,10 @@ ITSThresholdCalibrationTask::CalibrationResStructTHR ITSThresholdCalibrationTask
339339
result.Tot = std::stof(data) / 1000; // to get micro-seconds
340340
} else if (name == "TotRms") {
341341
result.TotRms = std::stof(data) / 1000; // to get micro-seconds
342-
} else if (name == "Rt") {
343-
result.Rt = std::stof(data); // this will be in nano-seconds automatically
344-
} else if (name == "RtRms") {
345-
result.RtRms = std::stof(data); // this will be in nano-seconds automatically
342+
} else if (name == "ToA") {
343+
result.ToA = std::stof(data); // this will be in nano-seconds automatically
344+
} else if (name == "ToARms") {
345+
result.ToARms = std::stof(data); // this will be in nano-seconds automatically
346346
}
347347
}
348348
}
@@ -391,8 +391,8 @@ void ITSThresholdCalibrationTask::reset()
391391
if (iScan == TOT) {
392392
hTimeOverThreshold[iBarrel]->Reset();
393393
hTimeOverThresholdRms[iBarrel]->Reset();
394-
hRiseTime[iBarrel]->Reset();
395-
hRiseTimeRms[iBarrel]->Reset();
394+
hToA[iBarrel]->Reset();
395+
hToARms[iBarrel]->Reset();
396396
}
397397
if (iScan > 3) {
398398
hCalibrationDColChipAverage[iBarrel]->Reset();
@@ -404,8 +404,8 @@ void ITSThresholdCalibrationTask::reset()
404404
for (int iLayer = 0; iLayer < NLayer; iLayer++) {
405405
hTimeOverThresholdLayer[iLayer]->Reset();
406406
hTimeOverThresholdRmsLayer[iLayer]->Reset();
407-
hRiseTimeLayer[iLayer]->Reset();
408-
hRiseTimeRmsLayer[iLayer]->Reset();
407+
hToALayer[iLayer]->Reset();
408+
hToARmsLayer[iLayer]->Reset();
409409
}
410410
}
411411
}
@@ -507,20 +507,20 @@ void ITSThresholdCalibrationTask::createAllHistos()
507507
addObject(hTimeOverThresholdRms[iBarrel]);
508508

509509
// Rise time 2D plot
510-
hRiseTime[iBarrel] = new TH2F(Form("RiseTime%s", sBarrelType[iBarrel].Data()), Form("Rise time for %s (in ns)", sBarrelType[iBarrel].Data()), nChips[iBarrel], -0.5, nChips[iBarrel] - 0.5, nStaves[iBarrel], -0.5, nStaves[iBarrel] - 0.5);
511-
hRiseTime[iBarrel]->SetStats(0);
510+
hToA[iBarrel] = new TH2F(Form("ToA%s", sBarrelType[iBarrel].Data()), Form("ToA for %s (in ns)", sBarrelType[iBarrel].Data()), nChips[iBarrel], -0.5, nChips[iBarrel] - 0.5, nStaves[iBarrel], -0.5, nStaves[iBarrel] - 0.5);
511+
hToA[iBarrel]->SetStats(0);
512512
if (iBarrel != 0)
513-
formatAxes(hRiseTime[iBarrel], "Chip", "", 1, 1.10);
514-
formatLayers(hRiseTime[iBarrel], iBarrel);
515-
addObject(hRiseTime[iBarrel]);
513+
formatAxes(hToA[iBarrel], "Chip", "", 1, 1.10);
514+
formatLayers(hToA[iBarrel], iBarrel);
515+
addObject(hToA[iBarrel]);
516516

517517
// Rise time RMS 2D plot
518-
hRiseTimeRms[iBarrel] = new TH2F(Form("RiseTimeRms%s", sBarrelType[iBarrel].Data()), Form("Rise time RMS for %s (in ns)", sBarrelType[iBarrel].Data()), nChips[iBarrel], -0.5, nChips[iBarrel] - 0.5, nStaves[iBarrel], -0.5, nStaves[iBarrel] - 0.5);
519-
hRiseTimeRms[iBarrel]->SetStats(0);
518+
hToARms[iBarrel] = new TH2F(Form("ToARms%s", sBarrelType[iBarrel].Data()), Form("ToA RMS for %s (in ns)", sBarrelType[iBarrel].Data()), nChips[iBarrel], -0.5, nChips[iBarrel] - 0.5, nStaves[iBarrel], -0.5, nStaves[iBarrel] - 0.5);
519+
hToARms[iBarrel]->SetStats(0);
520520
if (iBarrel != 0)
521-
formatAxes(hRiseTimeRms[iBarrel], "Chip", "", 1, 1.10);
522-
formatLayers(hRiseTimeRms[iBarrel], iBarrel);
523-
addObject(hRiseTimeRms[iBarrel]);
521+
formatAxes(hToARms[iBarrel], "Chip", "", 1, 1.10);
522+
formatLayers(hToARms[iBarrel], iBarrel);
523+
addObject(hToARms[iBarrel]);
524524
}
525525
}
526526

@@ -549,14 +549,14 @@ void ITSThresholdCalibrationTask::createAllHistos()
549549
addObject(hTimeOverThresholdRmsLayer[iLayer]);
550550

551551
// Rise time for each layer
552-
hRiseTimeLayer[iLayer] = new TH1F(Form("RiseTimeLayer%d", iLayer), Form("Rise time distribution for Layer%d", iLayer), 1600, 0, 800);
553-
formatAxes(hRiseTimeLayer[iLayer], "Rise time (ns) ", "Counts", 1, 1.10);
554-
addObject(hRiseTimeLayer[iLayer]);
552+
hToALayer[iLayer] = new TH1F(Form("ToALayer%d", iLayer), Form("ToA distribution for Layer%d", iLayer), 1600, 0, 800);
553+
formatAxes(hToALayer[iLayer], "ToA (ns) ", "Counts", 1, 1.10);
554+
addObject(hToALayer[iLayer]);
555555

556556
// Rise time RMS for each layer
557-
hRiseTimeRmsLayer[iLayer] = new TH1F(Form("RiseTimeRmsLayer%d", iLayer), Form("Rise time Rms distribution for Layer%d", iLayer), 1000, 0, 500);
558-
formatAxes(hRiseTimeRmsLayer[iLayer], "Rise time Rms (ns) ", "Counts", 1, 1.10);
559-
addObject(hRiseTimeRmsLayer[iLayer]);
557+
hToARmsLayer[iLayer] = new TH1F(Form("ToARmsLayer%d", iLayer), Form("ToA Rms distribution for Layer%d", iLayer), 1000, 0, 500);
558+
formatAxes(hToARmsLayer[iLayer], "ToA Rms (ns) ", "Counts", 1, 1.10);
559+
addObject(hToARmsLayer[iLayer]);
560560
}
561561
}
562562

0 commit comments

Comments
 (0)