Skip to content

adjusted to changes in CRV decoders: restoring changes in commit 2231156 #9

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
eflumerf merged 5 commits into from
Feb 24, 2025
Merged

adjusted to changes in CRV decoders: restoring changes in commit 2231156 #9

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
12af619
adjusted to changes in CRV decoders: restoring changes in commit 2231156
rrivera747 Feb 17, 2025
e5bd1a0
Run clang-format on all source files
eflumerf Feb 24, 2025
51d606c
Merge branch 'develop' into scorrodi/patchForV3_04_00
eflumerf Feb 24, 2025
c9c9e13
Fix git-whitespace
eflumerf Feb 24, 2025
7ff3671
Run clang-format on all source files
eflumerf Feb 24, 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
9 changes: 8 additions & 1 deletion otsdaq-mu2e-crv/ArtModules/CrvDQM_module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,14 @@ void CrvDQM::analyze(art::Event const& e)
mu2e::CRVDataDecoder(subevent); // reference
// const auto crvStatus =
// crvData.GetCRVROCStatusPacket(bl);
auto hits = crvData.GetCRVHits(bl);
std::vector<mu2e::CRVDataDecoder::CRVHit> hits;
auto res = crvData.GetCRVHits(bl, hits);
if(!res)
{
TLOG(TLVL_ERROR) << "Unable to get CRV hist!";
continue;
}

for(auto& hit : hits)
{
// Fill histograms
Expand Down
19 changes: 12 additions & 7 deletions otsdaq-mu2e-crv/ArtModules/CrvVstDemoViewer_module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,9 @@ CrvVstDemoViewer::CrvVstDemoViewer(fhicl::ParameterSet const& ps)
//, prescale_ (ps.get<int> ("prescale"))
, current_run_(0)
//, max_num_x_plots_ (ps.get<std::size_t>("num_x_plots",
// std::numeric_limits<std::size_t>::max())) , max_num_y_plots_
//std::numeric_limits<std::size_t>::max())) , max_num_y_plots_
//(ps.get<std::size_t>("num_y_plots", std::numeric_limits<std::size_t>::max())) ,
// num_x_plots_ (0) , num_y_plots_ (0) , raw_data_label_
//num_x_plots_ (0) , num_y_plots_ (0) , raw_data_label_
//(ps.get<std::string>("raw_data_label", "daq"))
, graphs_()
, histograms_()
Expand All @@ -159,10 +159,8 @@ CrvVstDemoViewer::CrvVstDemoViewer(fhicl::ParameterSet const& ps)

// if (ps.has_key("fragment_ids")) {
// auto fragment_ids =
// ps.get<std::vector<artdaq::Fragment::fragment_id_t>>("fragment_ids"); for (auto&
// id
//: fragment_ids) { auto index = id_to_index_.size(); id_to_index_[id] =
//: index;
//ps.get<std::vector<artdaq::Fragment::fragment_id_t>>("fragment_ids"); for (auto& id
//: fragment_ids) { auto index = id_to_index_.size(); id_to_index_[id] = index;
// }
// }
}
Expand Down Expand Up @@ -452,7 +450,14 @@ void CrvVstDemoViewer::analyze(art::Event const& event)
{
auto crvData = mu2e::CRVDataDecoder(subevent); // reference
// const auto crvStatus = crvData.GetCRVROCStatusPacket(bl);
auto hits = crvData.GetCRVHits(bl);
std::vector<mu2e::CRVDataDecoder::CRVHit> hits;
auto res = crvData.GetCRVHits(bl, hits);
if(!res)
{
TLOG(TLVL_ERROR) << "Unable to get CRV hist!";
continue;
}

for(auto& hit : hits)
{
// if (newCanvas_) {
Expand Down
Loading