Skip to content

Feature/icarus bnb only #523

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 33 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
1df3234
initial commit
Oct 9, 2024
357c6e5
Develop change not in release 09_91_02_02
Oct 10, 2024
b205ea9
Builds and runs
Oct 15, 2024
225eaf9
debug and cache changes
Oct 21, 2024
030248d
Fill cache
Oct 25, 2024
076033d
Get timestamp from PTB
Oct 28, 2024
8b5216d
Refactor PTB ts extraction
Oct 28, 2024
574348a
Add TDC Timestamp func
Nov 1, 2024
fc0776a
Add prev ptb timestamp
Nov 11, 2024
c5aaeb9
Cleaning print statements
Nov 11, 2024
f528857
Undo build fix, get rid of junk
Nov 11, 2024
8a7fbf8
Moving fcls to jobs
Nov 12, 2024
12b93b4
Rename ICARUS module
Nov 12, 2024
3742907
Build issues returned to match branch
Nov 12, 2024
1656232
Rename icarusspillinfo.fcl to icarusbnbspillinfo.fcl
nathanielerowe Nov 13, 2024
6e3023f
New producer modules
Nov 22, 2024
e2d8f6a
Rename EXT producers, add catch for TDC
Nov 26, 2024
96682e9
Temp debug lines, TDC catch
Nov 27, 2024
83f8895
remove scaling, add debug
Dec 6, 2024
de192fe
Merge branch 'develop' into feature/SBNDBNB_Retriever
ibsafa Dec 11, 2024
749e031
Merge pull request #505 from SBNSoftware/develop
nathanielerowe Feb 14, 2025
448561a
Remove SBND modules
Feb 14, 2025
0aef7af
$1D offset was hardcoded! Change BES offset to fcl param.
Feb 14, 2025
00c4192
Merge pull request #520 from SBNSoftware/develop
nathanielerowe Mar 18, 2025
34c8218
Merge branch 'develop' into feature/icarus_bnb_only
nathanielerowe Mar 18, 2025
f1a7e63
remove newly-duplicate code in icarus
Mar 18, 2025
bbb400f
rename POTTools
Mar 18, 2025
631dc9f
matchMultiWire changes
Mar 19, 2025
858a129
Merge branch 'develop' into feature/icarus_bnb_only
nathanielerowe Apr 3, 2025
f5403aa
Remove extra fcl
Apr 3, 2025
1e60e40
Doxygen+namespace updates
Apr 7, 2025
0d1282e
Merge branch 'develop' into feature/icarus_bnb_only
kjplows Apr 25, 2025
d9cdf7d
Merge pull request #539 from SBNSoftware/develop
nathanielerowe May 4, 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
781 changes: 0 additions & 781 deletions sbncode/BeamSpillInfoRetriever/BNBRetriever/BNBRetriever_module.cc

This file was deleted.

34 changes: 0 additions & 34 deletions sbncode/BeamSpillInfoRetriever/BNBRetriever/CMakeLists.txt

This file was deleted.

71 changes: 0 additions & 71 deletions sbncode/BeamSpillInfoRetriever/BNBRetriever/MWRData.cpp

This file was deleted.

39 changes: 0 additions & 39 deletions sbncode/BeamSpillInfoRetriever/BNBRetriever/MWRData.h

This file was deleted.

10 changes: 5 additions & 5 deletions sbncode/BeamSpillInfoRetriever/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
add_subdirectory(BNBRetriever)
add_subdirectory(ICARUSBNBRetriever)
add_subdirectory(ICARUSBNBEXTRetriever)
add_subdirectory(SBNDBNBRetriever)
add_subdirectory(SBNDBNBZEROBIASRetriever)
add_subdirectory(SBNDBNBEXTRetriever)
add_subdirectory(SBNDBNBZEROBIASRetriever)
add_subdirectory(NuMIRetriever)
add_subdirectory(BNBEXTRetriever)
add_subdirectory(NuMIEXTRetriever)
add_subdirectory(job)

Expand All @@ -27,8 +27,8 @@ art_make_library(
sbn_MWRData
larcorealg::CoreUtils

LIBRARY_NAME sbn_SBNDPOTTools
SOURCE SBNDPOTTools.cpp
LIBRARY_NAME sbn_POTTools
SOURCE POTTools.cpp
)

install_headers()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

cet_build_plugin(BNBEXTRetriever art::module
cet_build_plugin(ICARUSBNBEXTRetriever art::module
LIBRARIES
art::Persistency_Common
art::Utilities canvas::canvas
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
////////////////////////////////////////////////////////////////////////
// Class: BNBEXTRetriever
// Class: ICARUSBNBEXTRetriever
// Plugin Type: producer
// File: BNBEXTRetriever_module.cc
// File: ICARUSBNBEXTRetriever_module.cc
//
// Created by hand Thurs June 24th 2021 by J. Zennamo (FNAL)
//
Expand Down Expand Up @@ -36,10 +36,10 @@
#include <time.h>

namespace sbn {
class BNBEXTRetriever;
class ICARUSBNBEXTRetriever;
}

class sbn::BNBEXTRetriever : public art::EDProducer {
class sbn::ICARUSBNBEXTRetriever : public art::EDProducer {
public:

struct Config {
Expand All @@ -57,15 +57,15 @@ class sbn::BNBEXTRetriever : public art::EDProducer {
using Parameters = art::EDProducer::Table<Config>;


explicit BNBEXTRetriever(Parameters const& params);
explicit ICARUSBNBEXTRetriever(Parameters const& params);
// The compiler-generated destructor is fine for non-base
// classes without bare pointers or other resource use.

// Plugins should not be copied or assigned.
BNBEXTRetriever(BNBEXTRetriever const&) = delete;
BNBEXTRetriever(BNBEXTRetriever&&) = delete;
BNBEXTRetriever& operator=(BNBEXTRetriever const&) = delete;
BNBEXTRetriever& operator=(BNBEXTRetriever&&) = delete;
ICARUSBNBEXTRetriever(ICARUSBNBEXTRetriever const&) = delete;
ICARUSBNBEXTRetriever(ICARUSBNBEXTRetriever&&) = delete;
ICARUSBNBEXTRetriever& operator=(ICARUSBNBEXTRetriever const&) = delete;
ICARUSBNBEXTRetriever& operator=(ICARUSBNBEXTRetriever&&) = delete;

// Required functions.
void produce(art::Event& e) override;
Expand All @@ -85,7 +85,7 @@ class sbn::BNBEXTRetriever : public art::EDProducer {
};


sbn::BNBEXTRetriever::BNBEXTRetriever(Parameters const& params)
sbn::ICARUSBNBEXTRetriever::ICARUSBNBEXTRetriever(Parameters const& params)
: EDProducer{params},
raw_data_label_(params().RawDataLabel())
{
Expand All @@ -97,7 +97,7 @@ sbn::BNBEXTRetriever::BNBEXTRetriever(Parameters const& params)
scale_factor = 0;
}

void sbn::BNBEXTRetriever::produce(art::Event& e)
void sbn::ICARUSBNBEXTRetriever::produce(art::Event& e)
{

//Here we read in the artdaq Fragments and extract three pieces of information:
Expand Down Expand Up @@ -152,7 +152,7 @@ void sbn::BNBEXTRetriever::produce(art::Event& e)
} //end loop over events


void sbn::BNBEXTRetriever::beginSubRun(art::SubRun& sr)
void sbn::ICARUSBNBEXTRetriever::beginSubRun(art::SubRun& sr)
{
TotalEXTCounts = 0;
totalMinBias = 0;
Expand All @@ -162,7 +162,7 @@ void sbn::BNBEXTRetriever::beginSubRun(art::SubRun& sr)
}

//____________________________________________________________________________
void sbn::BNBEXTRetriever::endSubRun(art::SubRun& sr)
void sbn::ICARUSBNBEXTRetriever::endSubRun(art::SubRun& sr)
{
// We will add all of the EXTCountInfo data-products to the
// art::SubRun so it persists
Expand All @@ -186,4 +186,4 @@ void sbn::BNBEXTRetriever::endSubRun(art::SubRun& sr)
return;
}

DEFINE_ART_MODULE(sbn::BNBEXTRetriever)
DEFINE_ART_MODULE(sbn::ICARUSBNBEXTRetriever)
12 changes: 12 additions & 0 deletions sbncode/BeamSpillInfoRetriever/ICARUSBNBRetriever/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
find_package(ifbeam)
find_package(ifdh_art)

cet_build_plugin(ICARUSBNBRetriever art::module
LIBRARIES
sbn_POTTools
SQLite::SQLite3
)

install_headers()
install_fhicl()
install_source()
Loading