Skip to content
Snippets Groups Projects
Commit 89a910b4 authored by Chao Peng's avatar Chao Peng
Browse files

fix a possible issue in waveform integrals, add file test for waveform analyzer

parent 5b040b85
Branches
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
include/WfAnalyzer.h
+ 2
− 1
View file @ 89a910b4
...@@ -169,7 +169,8 @@ public: ...@@ -169,7 +169,8 @@ public:
// integrate it over the peak range // integrate it over the peak range
peak.integral = buffer[peak.pos] - data.ped.mean; peak.integral = buffer[peak.pos] - data.ped.mean;
for (size_t i = peak.pos - 1; i >= peak.left; --i) { // i may go below 0
for (int i = peak.pos - 1; i >= static_cast<int>(peak.left); --i) {
double val = buffer[i] - data.ped.mean; double val = buffer[i] - data.ped.mean;
// stop when it touches or acrosses the baseline // stop when it touches or acrosses the baseline
if (std::abs(val) < data.ped.err || val * sample_height < 0.) { if (std::abs(val) < data.ped.err || val * sample_height < 0.) {
......
tools/test_wfanalyzer.cxx
+ 132
− 45
View file @ 89a910b4
#include "WfAnalyzer.h" #include "WfAnalyzer.h"
#include <algorithm>
#include <string>
#include <vector>
#include <random>
void test(size_t res = 3, double thres = 10.0) // some pre-built events
static const std::vector<std::vector<uint32_t>> _test_events = {
{
129, 132, 131, 128, 128, 127, 130, 130, 126, 126, 128, 126, 126,
// 127, 128, 125, 130, 130, 131, 143, 146, 149, 143, 142, 139, 136,
127, 128, 125, 123, 120, 121, 113, 109, 102, 109, 110, 119, 126,
134, 135, 132, 132, 132, 128, 139, 167, 188, 189, 180, 171, 164,
156, 150, 145, 143, 140, 136, 137, 136, 132, 131, 132, 132, 132,
130, 129, 131, 130, 131, 131, 128, 130, 129, 127, 128, 127
},
{
567, 484, 414, 359, 320, 291, 271, 275, 279, 278, 271, 271, 277,
277, 265, 252, 237, 228, 213, 207, 201, 195, 188, 183, 179, 176,
173, 191, 217, 231, 298, 392, 436, 423, 383, 341, 302, 265, 237,
215, 198, 181, 171, 160, 151, 152, 144, 137, 136, 134, 133, 130,
125, 125, 124, 123, 120, 122, 117, 117, 116, 115, 116, 113
},
{
131, 133, 131, 134, 131, 132, 131, 132, 132, 132, 131, 129, 131,
132, 130, 131, 129, 130, 131, 131, 131, 133, 133, 137, 147, 152,
151, 147, 146, 139, 141, 138, 135, 135, 132, 134, 134, 136, 134,
131, 134, 133, 130, 130, 132, 129, 128, 132, 132, 130, 130, 133,
132, 131, 131, 131, 132, 132, 130, 129, 127, 129, 131, 132
},
{
162, 158, 157, 159, 159, 160, 159, 161, 159, 160, 158, 159, 183,
236, 263, 271, 267, 254, 240, 228, 213, 205, 192, 186, 181, 177,
// 236, 1263, 8000, 8000, 8000, 8000, 8000, 8000, 8000, 8000, 8000, 2271, 1177,
174, 170, 165, 170, 165, 165, 164, 162, 161, 163, 163, 162, 159,
159, 161, 159, 161, 160, 158, 157, 159, 158, 156, 160, 159, 158,
160, 158, 158, 156, 158, 157, 159, 157, 159, 158, 156, 157
},
{
152, 150, 153, 151, 151, 154, 152, 151, 151, 151, 150, 154, 151,
154, 151, 155, 152, 152, 150, 152, 153, 153, 151, 150, 153, 151,
151, 150, 151, 153, 192, 244, 267, 266, 254, 238, 220, 206, 198,
188, 181, 174, 171, 167, 164, 161, 160, 160, 156, 157, 156, 156,
155, 155, 156, 154, 152, 153, 153, 190, 246, 269, 263, 250
},
};
// channel look-up table
static const std::vector<std::string> _channels = {
"Cer11_5", "Cer12_5", "Cer13_5", "Cer14_5",
"Cer21_5", "Cer22_5", "Cer23_5", "Cer24_5",
"Cer31_5", "Cer32_5", "Cer33_5", "Cer34_5",
"Cer41_5", "Cer42_5", "Cer43_5", "Cer44_5",
};
struct TestEvent {
std::string name;
std::vector<uint32_t> raw;
};
// get events from root file
// if empty <path> provided, the pre-built events will be returned
// if empty <indices> provided, <nev> events will be randomly selected
std::vector<TestEvent> get_events(const std::string &path, std::vector<int> indices = {}, int nev = 5)
{ {
gStyle->SetOptStat(0); std::vector<TestEvent> res;
std::vector<std::vector<uint32_t>> tests = { if (path.empty()) {
{ for (size_t i = 0; i < _test_events.size(); ++i) {
129, 132, 131, 128, 128, 127, 130, 130, 126, 126, 128, 126, 126, res.emplace_back(TestEvent{"Pre-built Event " + std::to_string(i + 1), _test_events[i]});
// 127, 128, 125, 130, 130, 131, 143, 146, 149, 143, 142, 139, 136, }
127, 128, 125, 123, 120, 121, 113, 109, 102, 109, 110, 119, 126, return res;
134, 135, 132, 132, 132, 128, 139, 167, 188, 189, 180, 171, 164, }
156, 150, 145, 143, 140, 136, 137, 136, 132, 131, 132, 132, 132,
130, 129, 131, 130, 131, 131, 128, 130, 129, 127, 128, 127 // root tree
}, auto t = new TChain("EvTree");
{ t->Add(path.c_str());
567, 484, 414, 359, 320, 291, 271, 275, 279, 278, 271, 271, 277, int maxn = t->GetEntries();
277, 265, 252, 237, 228, 213, 207, 201, 195, 188, 183, 179, 176,
173, 191, 217, 231, 298, 392, 436, 423, 383, 341, 302, 265, 237, // fetch tree data
215, 198, 181, 171, 160, 151, 152, 144, 137, 136, 134, 133, 130, std::vector<int> nraws(_channels.size());
125, 125, 124, 123, 120, 122, 117, 117, 116, 115, 116, 113 std::vector<std::vector<int>> buffers(_channels.size());
}, for (auto &buf : buffers) { buf.resize(1024); }
{ for (size_t i = 0; i < _channels.size(); ++i) {
131, 133, 131, 134, 131, 132, 131, 132, 132, 132, 131, 129, 131, auto &ch = _channels[i];
132, 130, 131, 129, 130, 131, 131, 131, 133, 133, 137, 147, 152, t->SetBranchAddress((ch + "_Nraw").c_str(), &nraws[i]);
151, 147, 146, 139, 141, 138, 135, 135, 132, 134, 134, 136, 134, t->SetBranchAddress((ch + "_raw").c_str(), &buffers[i][0]);
131, 134, 133, 130, 130, 132, 129, 128, 132, 132, 130, 130, 133, }
132, 131, 131, 131, 132, 132, 130, 129, 127, 129, 131, 132
}, // random samples if no event indices given
{ if (indices.empty()) {
162, 158, 157, 159, 159, 160, 159, 161, 159, 160, 158, 159, 183, if (maxn > nev) {
236, 263, 271, 267, 254, 240, 228, 213, 205, 192, 186, 181, 177, std::random_device rd;
// 236, 1263, 8000, 8000, 8000, 8000, 8000, 8000, 8000, 8000, 8000, 2271, 1177, std::mt19937 rng(rd());
174, 170, 165, 170, 165, 165, 164, 162, 161, 163, 163, 162, 159, std::uniform_int_distribution<int> udist(0, maxn - 1);
159, 161, 159, 161, 160, 158, 157, 159, 158, 156, 160, 159, 158, while (static_cast<int>(indices.size()) < nev) {
160, 158, 158, 156, 158, 157, 159, 157, 159, 158, 156, 157 int idx = udist(rng);
}, if(std::find(indices.begin(), indices.end(), idx) == indices.end()) {
{ indices.push_back(idx);
152, 150, 153, 151, 151, 154, 152, 151, 151, 151, 150, 154, 151, }
154, 151, 155, 152, 152, 150, 152, 153, 153, 151, 150, 153, 151, }
151, 150, 151, 153, 192, 244, 267, 266, 254, 238, 220, 206, 198, } else {
188, 181, 174, 171, 167, 164, 161, 160, 160, 156, 157, 156, 156, for (int i = 0; i < maxn; ++i) { indices.push_back(i); }
155, 155, 156, 154, 152, 153, 153, 190, 246, 269, 263, 250 }
}, }
};
// get event samples
for (int idx : indices) {
if (idx >= maxn) { continue; }
t->GetEntry(idx);
for (size_t i = 0; i < _channels.size(); ++i) {
auto &nraw = nraws[i];
if (nraw == 0) { continue; }
auto &ch = _channels[i];
auto &buf = buffers[i];
TestEvent event;
event.name = "Event " + std::to_string(idx) + ", " + ch;
for (int j = 0; j < nraw; ++j) { event.raw.push_back(buf[j]); }
res.push_back(event);
}
}
return res;
}
void test_wfanalyzer(const std::string &path = "", const std::vector<int> &indices = {}, int nev = 5,
size_t res = 3, double thres = 10.0)
{
gStyle->SetOptStat(0);
wfa::Analyzer ana(res, thres); wfa::Analyzer ana(res, thres);
auto events = get_events(path, indices, nev);
auto c = new TCanvas("test", "test", 1920, 1080); auto c = new TCanvas("test", "test", 1920, 1080);
c->DivideSquare(tests.size() + 1); c->DivideSquare(events.size() + 1);
auto legend = new TLegend(0.1, 0.9, 0.9, 0.1); auto legend = new TLegend(0.1, 0.9, 0.9, 0.1);
int count = 0; int count = 0;
for (auto &samples : tests) { for (auto &event : events) {
auto samples = event.raw;
count ++; count ++;
c->cd(count); c->cd(count);
// waveform // waveform
auto wf = new TGraph(samples.size()); auto wf = new TGraph(samples.size());
wf->SetTitle("Waveform Analysis; Sample Number; ADC Values"); wf->SetTitle((event.name + "; Sample Number; ADC Values").c_str());
for (size_t i = 0; i < samples.size(); ++i) { for (size_t i = 0; i < samples.size(); ++i) {
wf->SetPoint(i, i, samples[i]); wf->SetPoint(i, i, samples[i]);
} }
...@@ -146,6 +233,6 @@ void test(size_t res = 3, double thres = 10.0) ...@@ -146,6 +233,6 @@ void test(size_t res = 3, double thres = 10.0)
legend->AddEntry(grp, "Pedestal", "lf"); legend->AddEntry(grp, "Pedestal", "lf");
} }
} }
c->cd(tests.size() + 1); c->cd(events.size() + 1);
legend->Draw(); legend->Draw();
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment