Skip to content

Commit 2036bd5

Browse files
committed
add caen9 MSUM channel to default config, fix bug with else if block
1 parent d223fe4 commit 2036bd5

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

sbndcode/Decoders/PMT/SBNDPMTDecoder_module.cc

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -589,10 +589,12 @@ void sbndaq::SBNDPMTDecoder::produce(art::Event& evt)
589589
art::Ptr<raw::OpDetWaveform> wvfmPtr = make_fltwvfm_ptr(fltwvfmVec->size()-1);
590590
fltTimingAssns->addSingle(brdTimingInfoPtr, wvfmPtr);
591591
}
592-
else if ((fragid == 8) && (foutput_timing_wvfm) && (std::find(fignore_timing_ch.begin(), fignore_timing_ch.end(), i) == fignore_timing_ch.end())){
593-
timwvfmVec->push_back(waveform);
594-
art::Ptr<raw::OpDetWaveform> wvfmPtr = make_timwvfm_ptr(timwvfmVec->size()-1);
595-
timTimingAssns->addSingle(brdTimingInfoPtr, wvfmPtr);
592+
else if ((fragid == 8)){ // fyi: this hardcodes the timing caen board index
593+
if ((foutput_timing_wvfm) && (std::find(fignore_timing_ch.begin(), fignore_timing_ch.end(), i) == fignore_timing_ch.end())){
594+
timwvfmVec->push_back(waveform);
595+
art::Ptr<raw::OpDetWaveform> wvfmPtr = make_timwvfm_ptr(timwvfmVec->size()-1);
596+
timTimingAssns->addSingle(brdTimingInfoPtr, wvfmPtr);
597+
}
596598
}
597599
else{
598600
pmtwvfmVec->push_back(waveform);

sbndcode/Decoders/PMT/pmtdecoder.fcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ pmtdecoder:
3838
timingInstanceName: "TimingChannels"
3939
output_ftrig_wvfm: true # whether or not to output the ftrig as an opdetwaveform (artroot data product)
4040
output_timing_wvfm: true # whether or not to output the timing caen wvfms as an opdetwaveform (artroot data product)
41-
ignore_timing_ch: [3,4,5,6,7,8,9,10,11,12,13,14] # only ch0, ch1, ch2, and ch15 are used currently in timing caen
41+
ignore_timing_ch: [4,5,6,7,8,9,10,11,12,13,14] # only ch0=BES, ch1=RWM, ch2=ETRIG, ch3=MSUM, ch15=FTRIG
4242

4343
# more detailed configurables
4444
n_maxflashes: 30 # maximum number of flashes anticipated, this is used for memory allocation

0 commit comments

Comments
 (0)