Skip to content

Output the correct pedestal to RawDigits #838

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.

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

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion icaruscode/Decode/DaqDecoderICARUSTPCwROI_module.cc
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,7 @@ void DaqDecoderICARUSTPCwROI::processSingleFragment(size_t

ConcurrentRawDigitCol::iterator newObjItr = concurrentRawDigitCol.emplace_back(channel,wvfm.size(),wvfm);

newObjItr->SetPedestal(localPedestal,localFullRMS);
newObjItr->SetPedestal(decoderTool->getPedestalVals()[chanIdx]+localPedestal,localFullRMS);

// And, finally, the ROIs
const icarus_signal_processing::VectorBool& chanROIs = decoderTool->getROIVals()[chanIdx];
Expand Down
5 changes: 4 additions & 1 deletion icaruscode/Decode/DecoderTools/TPCNoiseFilter1D_tool.cc
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ void TPCNoiseFilter1DMC::process_fragment(detinfo::DetectorClocksData const&,

std::copy(dataArray[idx].begin(),dataArray[idx].end(),rawDataVec.begin());

Eigen::Vector2f meanPos;
Eigen::Vector2f meanPos({0.,0.});
Eigen::Matrix2f eigenVectors {{0.,0.},{0.,0.}};
Eigen::Vector2f eigenValues {0.,0.};

Expand All @@ -395,6 +395,9 @@ void TPCNoiseFilter1DMC::process_fragment(detinfo::DetectorClocksData const&,
fNumTruncBins[idx],
fRangeBins[idx]);

// Make sure we correct for low frequency offset if it was run
fPedestalVals[idx] += meanPos[1];

if (fRemoveBadRMS && (fFullRMSVals[idx] < 2.5 || fFullRMSVals[idx] > 40.)) std::fill(fSelectVals[idx].begin(),fSelectVals[idx].end(),true);

// Convolve with a filter function
Expand Down