Skip to content

Move PMTBeamSignal data product from icaruscode to sbnobj #832

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

Open
wants to merge 10 commits into
base: develop
Choose a base branch
from
Open

Move PMTBeamSignal data product from icaruscode to sbnobj #832

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
790445e
move PMTBeamSignal data product from icaruscode/IcarusObj to sbnobj/C…
aheggest Jun 2, 2025
ffbcc35
remove old PMTBeamSignal definition
aheggest Jun 2, 2025
4b44b74
remove "#include icaruscode/IcarusObj/PMTBeamSignal.h" from classes.h
aheggest Jun 2, 2025
8a5a79b
keep icarus::timing namespace in PMTBeamSignalsExtractor_module
aheggest Jun 2, 2025
0ec30cd
fix typo in comment for PMTBeamSignalsExtractor producer namespace
aheggest Jun 2, 2025
12f66d1
Revert "remove old PMTBeamSignal definition"
aheggest Jun 3, 2025
2f6a05d
keep PMTBeamSignal defined in icaruscode for backward compatibility
aheggest Jun 3, 2025
4023a32
fix typo and add information in comment
aheggest Jun 3, 2025
e695592
add simple producer module to convert PMTBeamSignal namespace from ic…
aheggest Jun 6, 2025
2e7c592
keep producer general to also convert the beamTime:EW product if needed
aheggest Jun 9, 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
69 changes: 0 additions & 69 deletions icaruscode/IcarusObj/PMTBeamSignal.h
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion icaruscode/IcarusObj/classes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "icaruscode/IcarusObj/CRTTPCMatchingInfo.h"
#include "icaruscode/IcarusObj/OpDetWaveformMeta.h"
#include "icaruscode/IcarusObj/PMTWaveformTimeCorrection.h"
#include "icaruscode/IcarusObj/PMTBeamSignal.h"

#include "icaruscode/IcarusObj/Hit.h"
//#include "icaruscode/IcarusObj/CRTPMTMatching.h"

Expand Down
6 changes: 0 additions & 6 deletions icaruscode/IcarusObj/classes_def.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,6 @@
<class name="std::vector<icarus::timing::PMTWaveformTimeCorrection>"/>
<class name="art::Wrapper<std::vector<icarus::timing::PMTWaveformTimeCorrection> >"/>

<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- icarus::timing::PMTBeamSignal -->
<class name="art::Wrapper<vector<icarus::timing::PMTBeamSignal> >"/>
<class name="icarus::timing::PMTBeamSignal"/>
<class name="vector<icarus::timing::PMTBeamSignal>"/>

<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- LArSoft object associations that are missing from LArSoft -->

Expand Down
24 changes: 12 additions & 12 deletions icaruscode/PMT/OpReco/ICARUSBeamStructureAna_module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#include "sbnobj/Common/Trigger/ExtraTriggerInfo.h"
#include "icaruscode/CRT/CRTUtils/CRTPMTMatchingUtils.h"
#include "sbnobj/Common/CRT/CRTPMTMatching.hh"
#include "icaruscode/IcarusObj/PMTBeamSignal.h"
#include "sbnobj/Common/PMT/Data/PMTBeamSignal.hh"

// ROOT libraries
#include "TTree.h"
Expand Down Expand Up @@ -156,7 +156,7 @@ class opana::ICARUSBeamStructureAna : public art::EDAnalyzer
std::vector<int> m_crtregion;

// RWM times
std::vector<icarus::timing::PMTBeamSignal> fRWMTimes;
std::vector<sbn::timing::PMTBeamSignal> fRWMTimes;
};

// --------------------------------------------------------------------------
Expand Down Expand Up @@ -289,9 +289,9 @@ void opana::ICARUSBeamStructureAna::analyze(art::Event const &e)
// ----
// RWM times

fRWMTimes = e.getProduct<std::vector<icarus::timing::PMTBeamSignal>>(fRWMLabel);
fRWMTimes = e.getProduct<std::vector<sbn::timing::PMTBeamSignal>>(fRWMLabel);
if (fRWMTimes.empty())
mf::LogTrace("ICARUSBeamStructureAna") << "Data product std::vector<icarus::timing::PMTBeamSignal> for '" << fRWMLabel.label()
mf::LogTrace("ICARUSBeamStructureAna") << "Data product std::vector<sbn::timing::PMTBeamSignal> for '" << fRWMLabel.label()
<< "' is empty in " << m_gate_name << " event!";

// ----
Expand Down Expand Up @@ -420,11 +420,11 @@ void opana::ICARUSBeamStructureAna::analyze(art::Event const &e)
m_hit_rise_time_rwm.push_back(getRWMRelativeTime(ch, risemap[ch]));
m_hit_pe.push_back(pemap[ch]);
}

// get the flash interaction time w.r.t. RWM
// this is currently the mean between the first ophits on opposite walls
m_flash_time_rwm = getFlashBunchTime(m_channel_id, m_hit_rise_time_rwm);

fOpFlashTrees[iFlashLabel]->Fill();

clear();
Expand Down Expand Up @@ -461,7 +461,7 @@ double opana::ICARUSBeamStructureAna::getRWMRelativeTime(int channel, double t)
{

if (fRWMTimes.empty())
return icarus::timing::NoTime;
return sbn::timing::NoTime;

auto rwm = fRWMTimes.at(channel);
if (!rwm.isValid())
Expand All @@ -470,7 +470,7 @@ double opana::ICARUSBeamStructureAna::getRWMRelativeTime(int channel, double t)
<< "(Crate " << rwm.crate << ", Board " << rwm.digitizerLabel
<< ", SpecialChannel " << rwm.specialChannel << ")"
<< " in event " << m_event << " gate " << m_gate_name;
return icarus::timing::NoTime;
return sbn::timing::NoTime;
}

double rwm_trigger = rwm.startTime; // rwm time w.r.t. trigger time [us]
Expand All @@ -486,9 +486,9 @@ double opana::ICARUSBeamStructureAna::getFlashBunchTime(std::vector<int> channel
double tfirst_right = std::numeric_limits<double>::max();

// if no RWM info available, all pmt_start_time_rwm are invalid
// return icarus::timing::NoTime as well for the flash
// return sbn::timing::NoTime as well for the flash
if (fRWMTimes.empty())
return icarus::timing::NoTime;
return sbn::timing::NoTime;

int nleft = 0;
int nright = 0;
Expand All @@ -501,9 +501,9 @@ double opana::ICARUSBeamStructureAna::getFlashBunchTime(std::vector<int> channel

// if any RWM copy is missing (therefore missing for an entire PMT crate),
// it might not be possible to use the first hits (they might not have a RMW time)
// so return icarus::timing::NoTime as in other bad cases
// so return sbn::timing::NoTime as in other bad cases
if (!fRWMTimes[i].isValid())
return icarus::timing::NoTime;
return sbn::timing::NoTime;

// count hits separetely on the two walls
if (side == 0)
Expand Down
22 changes: 11 additions & 11 deletions icaruscode/PMT/OpReco/ICARUSFlashAssAna_module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#include "lardataobj/Simulation/BeamGateInfo.h"
#include "lardataobj/RawData/TriggerData.h"
#include "sbnobj/Common/Trigger/ExtraTriggerInfo.h"
#include "icaruscode/IcarusObj/PMTBeamSignal.h"
#include "sbnobj/Common/PMT/Data/PMTBeamSignal.hh"
#include "sbnobj/ICARUS/PMT/Data/WaveformBaseline.h"

#include "TTree.h"
Expand Down Expand Up @@ -102,7 +102,7 @@ class opana::ICARUSFlashAssAna : public art::EDAnalyzer

fhicl::Atom<art::InputTag> RWMLabel{
Name("RWMLabel"),
Comment("Tag for the RWM std::vector<icarus::timing::PMTBeamSignal> data product")};
Comment("Tag for the RWM std::vector<sbn::timing::PMTBeamSignal> data product")};

fhicl::Atom<float> PEOpHitThreshold{
Name("PEOpHitThreshold"),
Expand Down Expand Up @@ -251,7 +251,7 @@ class opana::ICARUSFlashAssAna : public art::EDAnalyzer

geo::GeometryCore const* fGeom;
geo::WireReadoutGeom const* fChannelMapAlg;
std::vector<icarus::timing::PMTBeamSignal> fRWMTimes;
std::vector<sbn::timing::PMTBeamSignal> fRWMTimes;
};

// ----------------------------------------------------------------------------
Expand Down Expand Up @@ -485,7 +485,7 @@ float opana::ICARUSFlashAssAna::getRWMRelativeTime(int channel, float t)
{

if (fRWMTimes.empty())
return icarus::timing::NoTime;
return sbn::timing::NoTime;

auto rwm = fRWMTimes.at(channel);
if (!rwm.isValid())
Expand All @@ -494,7 +494,7 @@ float opana::ICARUSFlashAssAna::getRWMRelativeTime(int channel, float t)
<< "(Crate " << rwm.crate << ", Board " << rwm.digitizerLabel
<< ", SpecialChannel " << rwm.specialChannel << ")"
<< " in event " << m_event << " gate " << m_gate_name;
return icarus::timing::NoTime;
return sbn::timing::NoTime;
}

float rwm_trigger = rwm.startTime; // rwm time w.r.t. trigger time [us]
Expand All @@ -511,9 +511,9 @@ float opana::ICARUSFlashAssAna::getFlashBunchTime(std::vector<double> pmt_start_
float tfirst_right = std::numeric_limits<float>::max();

// if no RWM info available, all pmt_start_time_rwm are invalid
// return icarus::timing::NoTime as well for the flash
// return sbn::timing::NoTime as well for the flash
if (fRWMTimes.empty())
return icarus::timing::NoTime;
return sbn::timing::NoTime;

int nleft = 0;
int nright = 0;
Expand All @@ -530,9 +530,9 @@ float opana::ICARUSFlashAssAna::getFlashBunchTime(std::vector<double> pmt_start_

// if any RWM copy is missing (therefore missing for an entire PMT crate),
// it might not be possible to use the first hits (they might not have a RMW time)
// so return icarus::timing::NoTime as in other bad cases
// so return sbn::timing::NoTime as in other bad cases
if (!fRWMTimes[i].isValid())
return icarus::timing::NoTime;
return sbn::timing::NoTime;

// count hits separetely on the two walls
if (side == 0)
Expand Down Expand Up @@ -768,9 +768,9 @@ void opana::ICARUSFlashAssAna::analyze(art::Event const &e)
if (!fRWMLabel.empty())
{

fRWMTimes = e.getProduct<std::vector<icarus::timing::PMTBeamSignal>>(fRWMLabel);
fRWMTimes = e.getProduct<std::vector<sbn::timing::PMTBeamSignal>>(fRWMLabel);
if (fRWMTimes.empty())
mf::LogTrace("ICARUSFlashAssAna") << "Data product std::vector<icarus::timing::PMTBeamSignal> for '"
mf::LogTrace("ICARUSFlashAssAna") << "Data product std::vector<sbn::timing::PMTBeamSignal> for '"
<< fRWMLabel.label() << "' is empty in " << m_gate_name << " event!";
}

Expand Down
24 changes: 12 additions & 12 deletions icaruscode/Timing/PMTBeamSignalsExtractor_module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include "sbnobj/Common/Trigger/ExtraTriggerInfo.h"
#include "icaruscode/Decode/ChannelMapping/IICARUSChannelMap.h"
#include "icaruscode/IcarusObj/PMTWaveformTimeCorrection.h"
#include "icaruscode/IcarusObj/PMTBeamSignal.h"
#include "sbnobj/Common/PMT/Data/PMTBeamSignal.hh"
#include "lardataalg/DetectorInfo/DetectorTimingTypes.h" // electronics_time
#include "lardataalg/Utilities/quantities/spacetime.h"
#include "lardataobj/RawData/OpDetWaveform.h"
Expand Down Expand Up @@ -91,7 +91,7 @@ namespace icarus::timing
* Output products
* -------------------------
*
* This modules produces two `std::vector<icarus::timing::PMTBeamSignal>`
* This modules produces two `std::vector<sbn::timing::PMTBeamSignal>`
* with 360 elements each, representing the relevent RWM or EW time for
* the corresponding PMT channel. When the discrimination algorithm decides
* the "peak" on a waveform to be noise, the corresponding entries are placed
Expand Down Expand Up @@ -208,10 +208,10 @@ class icarus::timing::PMTBeamSignalsExtractor : public art::EDProducer
std::vector<short> m_wf;

// prepare pointers for data products
using BeamSignalCollection = std::vector<icarus::timing::PMTBeamSignal>;
using BeamSignalCollection = std::vector<sbn::timing::PMTBeamSignal>;
using BeamSignalCollectionPtr = std::unique_ptr<BeamSignalCollection>;

std::map<std::string, std::map<std::string, icarus::timing::PMTBeamSignal>> fBeamSignals;
std::map<std::string, std::map<std::string, sbn::timing::PMTBeamSignal>> fBeamSignals;
std::map<std::string, BeamSignalCollectionPtr> fSignalCollection;
};

Expand All @@ -234,8 +234,8 @@ icarus::timing::PMTBeamSignalsExtractor::PMTBeamSignalsExtractor(fhicl::Paramete
consumes<std::vector<raw::OpDetWaveform>>(fRWMlabel);

// Call appropriate produces<>() functions here.
produces<std::vector<PMTBeamSignal>>("RWM");
produces<std::vector<PMTBeamSignal>>("EW");
produces<std::vector<sbn::timing::PMTBeamSignal>>("RWM");
produces<std::vector<sbn::timing::PMTBeamSignal>>("EW");
}

// -----------------------------------------------------------------------------
Expand Down Expand Up @@ -382,7 +382,7 @@ void icarus::timing::PMTBeamSignalsExtractor::extractBeamSignalTime(art::Event &

// get the start sample of the signals, one instance per PMT crate
// use threshold to skip spikes from electric crosstalk see SBN-doc-34928, slides 4-5.
// if no signal is found, set both times to icarus::timing::NoTime
// if no signal is found, set both times to sbn::timing::NoTime
// so that `isValid()` in PMTBeamSignal will complain if someone checks it
for (auto const &wave : waveforms)
{
Expand All @@ -394,12 +394,12 @@ void icarus::timing::PMTBeamSignalsExtractor::extractBeamSignalTime(art::Event &

m_channel = wave.ChannelNumber();
m_wfstart = tstart.value();
m_utime_abs = (m_sample != icarus::timing::NoSample) ? tstart.value() + fPMTsamplingTick * m_sample : icarus::timing::NoTime;
m_time_abs = (m_sample != icarus::timing::NoSample) ? m_utime_abs + getTriggerCorrection(m_channel) : icarus::timing::NoTime;
m_time = (m_sample != icarus::timing::NoSample) ? m_time_abs - ftriggerTime : icarus::timing::NoTime;
m_utime_abs = (m_sample != sbn::timing::NoSample) ? tstart.value() + fPMTsamplingTick * m_sample : sbn::timing::NoTime;
m_time_abs = (m_sample != sbn::timing::NoSample) ? m_utime_abs + getTriggerCorrection(m_channel) : sbn::timing::NoTime;
m_time = (m_sample != sbn::timing::NoSample) ? m_time_abs - ftriggerTime : sbn::timing::NoTime;

std::string crate = getCrate(m_channel);
icarus::timing::PMTBeamSignal beamTime{m_channel, getDigitizerLabel(m_channel), crate, m_sample, m_time_abs, m_time};
sbn::timing::PMTBeamSignal beamTime{m_channel, getDigitizerLabel(m_channel), crate, m_sample, m_time_abs, m_time};
fBeamSignals[l].emplace(crate, std::move(beamTime));

if (fDebugTrees)
Expand Down Expand Up @@ -471,7 +471,7 @@ std::size_t icarus::timing::PMTBeamSignalsExtractor::getStartSample(std::vector<
auto delta = vv[maxbin] - vv[minbin];

if (delta < thres) // just noise
return icarus::timing::NoSample; // return no sample
return sbn::timing::NoSample; // return no sample

for (std::size_t bin = maxbin; bin < minbin; bin++)
{
Expand Down