Skip to content

Feature: Channel by channel gain configuration for opdet deconvolution #126

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

Draft
vpec0 wants to merge 3 commits into
base: develop
Choose a base branch
from
Draft

Feature: Channel by channel gain configuration for opdet deconvolution #126

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
deba3e3
Implementing gains per channel to the deconvolution module.
vpec0 Dec 2, 2025
30e81df
Gains file will now be searched for in FW_SEARCH_PATH.
vpec0 Dec 3, 2025
3ff7ff3
Merge branch 'develop' into feature/vpec_chbych_gain_in_deconv
vpec0 Dec 17, 2025
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
49 changes: 49 additions & 0 deletions duneopdet/OpticalDetector/Deconvolution/Deconvolution_module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
// Modified:
// Oct 7, 2024, Viktor Pec
// Added possibility to use SPE and noise templates by channel.
// Dec 2, 2025, Viktor Pec
// Adding option to set gains channel by channel. Gains are read from an input file, configurable by fhicl.
//=============================================================================

#ifndef Deconvolution_h
Expand Down Expand Up @@ -121,6 +123,7 @@ namespace opdet {

fhicl::Sequence<int> IgnoreChannels{ fhicl::Name("IgnoreChannels") }; // integer to allow for channel -1 = unrecognized channel

fhicl::Atom<std::string> ChannelGainFile{ fhicl::Name("ChannelGainFile") }; // file containing pairs of channel and its corresponding gain in #ADC per SPE

struct Filter {
fhicl::Atom<std::string> Name{fhicl::Name("Name"), "Gauss"};
Expand Down Expand Up @@ -314,6 +317,9 @@ namespace opdet {
std::vector<double> fNoiseDefault;


// Map of channel - gain pairs
std::map<unsigned int, double> fChannelToGainMap;

//--------Filter Variables
std::string fOutputProduct;
WfmExtraFilter_t fPostfilterConfig;
Expand All @@ -327,6 +333,7 @@ namespace opdet {
int CountFileColumns(const char* file_path);
void SourceSPETemplateFiles();
void SourceNoiseTemplateFiles();
void ReadGains(const char* fname);
void BuildExtraFilter(CmplxWaveform_t& xF0, const WfmExtraFilter_t config);
void ComputeExpectedInput(std::vector<double>& s, double nmax);
void CopyToOutput(const std::vector<float>& v, std::vector<float>& target);
Expand Down Expand Up @@ -491,6 +498,11 @@ namespace opdet {
mfi<<"\n";


// prepare channel-to-gain map
if (!pars().ChannelGainFile().empty())
ReadGains(pars().ChannelGainFile().c_str());


// info on ignored channels
mfi<<"Ignoring channels:\n ";
for (auto ch: fIgnoreChannels)
Expand Down Expand Up @@ -700,6 +712,15 @@ namespace opdet {
}
//

// Apply gains if available
if (!fChannelToGainMap.empty()) {
// if gains are available then the new scale is normalised to the template's amplitude and then scaled to the requested gain.
//
// there should be gain specified for each channel
// only a single template may be used for all channels - hence the effChannel
scale *= fChannelToGainMap[channel] / fSinglePEAmplitudes[fChannelToTemplateMap[effChannel]];
}

// Apply pedestal after post-filter
for (int i=0; i<fSamples; i++){
out_recob_float[i] = (xvdec[i]-decPedestal)*scale;
Expand Down Expand Up @@ -1014,6 +1035,34 @@ namespace opdet {
return N_COLUMNS;
}


void Deconvolution::ReadGains(const char* fname) {
std::string full_path;
cet::search_path sp("FW_SEARCH_PATH");
sp.find_file(fname, full_path);
MF_LOG_DEBUG("Deconvolution::ReadGains()")<<"Found SPE template file "<<full_path;


std::ifstream file_;
file_.open(full_path);

if (!file_.is_open()) {
mf::LogError("Deconvolution::ReadGains()")
<<"Unable to open file "<<fname;
throw art::Exception(art::errors::FileOpenError);
}

std::string temp_str;
unsigned int channel;
double gain;
while (std::getline(file_, temp_str)) {
std::stringstream ss; ss << temp_str;
ss >> channel >> gain;
fChannelToGainMap[channel] = gain;
}
}


/**
* @brief Compute normalization factor for a given filter
*
Expand Down