Skip to content
Snippets Groups Projects
Commit b8a8e746 authored by Thomas Owen James's avatar Thomas Owen James
Browse files

removed sort of bx numbers and fixed typo in scdaq-calo.conf

parent f70b121e
No related tags found
No related merge requests found
Pipeline #4488161 passed
...@@ -281,7 +281,7 @@ void StreamProcessor::process(Slice& input, Slice& out) ...@@ -281,7 +281,7 @@ void StreamProcessor::process(Slice& input, Slice& out)
LOG(WARNING) << "Orbit trailer error: orbit trailer not found before end of data packet. Packet will be skipped. Orbit trailer error count = " << control.orbit_trailer_error_count; LOG(WARNING) << "Orbit trailer error: orbit trailer not found before end of data packet. Packet will be skipped. Orbit trailer error count = " << control.orbit_trailer_error_count;
return; return;
} }
std::sort(bx_vect.begin(), bx_vect.end()); //std::sort(bx_vect.begin(), bx_vect.end());
if (processorType == ProcessorType::GMT) { if (processorType == ProcessorType::GMT) {
meta = FillOrbitMuon(bx_vect, rd_ptr, wr_ptr); meta = FillOrbitMuon(bx_vect, rd_ptr, wr_ptr);
orbitCount = meta.counts; orbitCount = meta.counts;
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
# "filedma" for reading from file and simulating DMA # "filedma" for reading from file and simulating DMA
# "micronDMA" for PICO driver # "micronDMA" for PICO driver
# #
input:fit/config/scdaq-calo.confedma input:filedma
# Settings for Micron board only # Settings for Micron board only
loadBitFile:yes loadBitFile:yes
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment