Skip to content

always padding, rebaseline, no fftbest #446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 16, 2025
Merged

always padding, rebaseline, no fftbest #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sigproc/inc/WireCellSigProc/OmnibusSigProc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ namespace WireCell {
void init_overall_response(IFrame::pointer frame);

void restore_baseline(WireCell::Array::array_xxf& arr);
void rebase_waveform(WireCell::Array::array_xxf& arr, const int& nbins);
void rebase_waveform(Eigen::Ref<Array::array_xxf> arr, const int& nbins);
// This little struct is used to map between WCT channel idents
// and internal OmnibusSigProc wire/channel numbers. See
// m_channel_map and m_channel_range below.
Expand Down Expand Up @@ -252,7 +252,7 @@ namespace WireCell {
int m_mp_tick_resolution{4};

//Rebase waveforms for each channel of spesific wire-plane.
std::vector<int> m_rebase_planes{};
std::vector<int> m_rebase_planes{0,1,2};
int m_rebase_nbins=200;

bool m_isWrapped{false};
Expand Down
44 changes: 27 additions & 17 deletions sigproc/src/OmnibusSigProc.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,11 @@ WireCell::Configuration OmnibusSigProc::default_configuration() const
void OmnibusSigProc::load_data(const input_pointer& in, int plane)
{
m_r_data[plane] = Array::array_xxf::Zero(m_fft_nwires[plane], m_fft_nticks);
// for (int i = 0; i < m_r_data[plane].rows(); ++i) {
// for (int j = 0; j < m_r_data[plane].cols(); ++j) {
// m_r_data[plane](i, j) = 7370;
// }
// }

auto traces = in->traces();

Expand Down Expand Up @@ -403,7 +408,8 @@ void OmnibusSigProc::load_data(const input_pointer& in, int plane)
//rebase for this plane
if (std::find(m_rebase_planes.begin(), m_rebase_planes.end(), plane) != m_rebase_planes.end()) {
log->debug("rebase_waveform for plane {} with m_rebase_nbins = {}", plane, m_rebase_nbins);
rebase_waveform(m_r_data[plane],m_rebase_nbins);
auto m_r_data_ref = m_r_data[plane].block(0, 0, m_r_data[plane].rows(), m_nticks);
rebase_waveform(m_r_data_ref,m_rebase_nbins);
}

log->debug("call={} load plane index: {}, ntraces={}, input bad regions: {}",
Expand Down Expand Up @@ -770,6 +776,15 @@ void OmnibusSigProc::save_mproi(ITrace::vector& itraces, IFrame::trace_list_t& i

void OmnibusSigProc::init_overall_response(IFrame::pointer frame)
{
// Fixme: this should be moved into configure()
auto ifr = Factory::find_tn<IFieldResponse>(m_field_response);
// Get full, "fine-grained" field responses defined at impact
// positions.
Response::Schema::FieldResponse fr = ifr->field_response();

// Make a new data set which is the average FR
Response::Schema::FieldResponse fravg = Response::wire_region_average(fr);

m_period = frame->tick();
{
std::vector<int> tbins;
Expand All @@ -786,34 +801,29 @@ void OmnibusSigProc::init_overall_response(IFrame::pointer frame)
log->debug("call={} init nticks={} tbinmin={} tbinmax={}", m_count, m_nticks, tbinmin, tbinmax);

if (m_fft_flag == 0) {
m_fft_nticks = m_nticks;
m_fft_nticks = m_nticks+fravg.planes[0].paths[0].current.size()/5;
log->debug("call={} init enlarge window from {} to {}", m_count, m_nticks, m_fft_nticks);
}
else {
m_fft_nticks = fft_best_length(m_nticks);
log->debug("call={} init enlarge window from {} to {}", m_count, m_nticks, m_fft_nticks);
m_fft_nticks = fft_best_length(m_nticks, false);
log->debug("call={} using fft_best_length init enlarge window from {} to {}", m_count, m_nticks, m_fft_nticks);
}
//

m_pad_nticks = m_fft_nticks - m_nticks;
}

// Fixme: this should be moved into configure()
auto ifr = Factory::find_tn<IFieldResponse>(m_field_response);
// Get full, "fine-grained" field responses defined at impact
// positions.
Response::Schema::FieldResponse fr = ifr->field_response();

// Make a new data set which is the average FR
Response::Schema::FieldResponse fravg = Response::wire_region_average(fr);

for (int i = 0; i != 3; i++) {
//
if (m_fft_flag == 0) {
m_fft_nwires[i] = m_nwires[i];
m_fft_nwires[i] = m_nwires[i] + fravg.planes[0].paths.size() - 1;
log->debug("call={} init enlarge wire number in plane {} from {} to {}",
m_count, i, m_nwires[i],
m_fft_nwires[i]);
}
else {
m_fft_nwires[i] = fft_best_length(m_nwires[i] + fravg.planes[0].paths.size() - 1, 1);
log->debug("call={} init enlarge wire number in plane {} from {} to {}",
m_fft_nwires[i] = fft_best_length(m_nwires[i] + fravg.planes[0].paths.size() - 1, true);
log->debug("call={} using fft_best_length init enlarge wire number in plane {} from {} to {}",
m_count, i, m_nwires[i],
m_fft_nwires[i]);
}
Expand Down Expand Up @@ -977,7 +987,7 @@ void OmnibusSigProc::restore_baseline(Array::array_xxf& arr)
}


void OmnibusSigProc::rebase_waveform(Array::array_xxf& arr,const int& n_bins)
void OmnibusSigProc::rebase_waveform(Eigen::Ref<Array::array_xxf> arr,const int& n_bins)
{
for (int i = 0; i != arr.rows(); ++i) {
Waveform::realseq_t signal(arr.cols());
Expand Down