From b8a8e7463e46418df8f13961e5f068c4e3ddccb8 Mon Sep 17 00:00:00 2001
From: Thomas Owen James <tjames@cmd-scouting-ctrlhub.dyndns.cern.ch>
Date: Tue, 13 Sep 2022 21:11:40 +0200
Subject: [PATCH] removed sort of bx numbers and fixed typo in scdaq-calo.conf
---
src/processor.cc | 2 +-
test/config/scdaq-calo.conf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/processor.cc b/src/processor.cc
index 70914d0f..68b936a5 100644
--- a/src/processor.cc
+++ b/src/processor.cc
@@ -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;
return;
}
- std::sort(bx_vect.begin(), bx_vect.end());
+ //std::sort(bx_vect.begin(), bx_vect.end());
if (processorType == ProcessorType::GMT) {
meta = FillOrbitMuon(bx_vect, rd_ptr, wr_ptr);
orbitCount = meta.counts;
diff --git a/test/config/scdaq-calo.conf b/test/config/scdaq-calo.conf
index 20d074b6..7a5c4a4f 100644
--- a/test/config/scdaq-calo.conf
+++ b/test/config/scdaq-calo.conf
@@ -10,7 +10,7 @@
# "filedma" for reading from file and simulating DMA
# "micronDMA" for PICO driver
#
-input:fit/config/scdaq-calo.confedma
+input:filedma
# Settings for Micron board only
loadBitFile:yes
--
GitLab