From 23a1201c29c92599b025265e3249561e49f50aac Mon Sep 17 00:00:00 2001
From: Lamar Moore <lamar.moore@stfc.ac.uk>
Date: Mon, 13 Jan 2020 15:04:36 +0000
Subject: [PATCH] clang and revert Facilities.xml to remove DENEX
---
.../src/Kafka/KafkaEventStreamDecoder.cpp | 22 +++++++++----------
instrument/Facilities.xml | 8 -------
2 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/Framework/LiveData/src/Kafka/KafkaEventStreamDecoder.cpp b/Framework/LiveData/src/Kafka/KafkaEventStreamDecoder.cpp
index cc255883d9e..cc947286a85 100644
--- a/Framework/LiveData/src/Kafka/KafkaEventStreamDecoder.cpp
+++ b/Framework/LiveData/src/Kafka/KafkaEventStreamDecoder.cpp
@@ -631,19 +631,19 @@ void KafkaEventStreamDecoder::initLocalCaches(
// Buffers for each period
size_t nperiods = runStartData.nPeriods;
if (nperiods == 0) {
- g_log.warning(
- "KafkaEventStreamDecoder - Stream reports 0 periods. This is "
- "an error by the data producer. Number of periods being set to 1.");
- nperiods = 1;
+ g_log.warning(
+ "KafkaEventStreamDecoder - Stream reports 0 periods. This is "
+ "an error by the data producer. Number of periods being set to 1.");
+ nperiods = 1;
}
{
- std::lock_guard<std::mutex> workspaceLock(m_mutex);
- m_localEvents.resize(nperiods);
- m_localEvents[0] = eventBuffer;
- for (size_t i = 1; i < nperiods; ++i) {
- // A clone should be cheap here as there are no events yet
- m_localEvents[i] = eventBuffer->clone();
- }
+ std::lock_guard<std::mutex> workspaceLock(m_mutex);
+ m_localEvents.resize(nperiods);
+ m_localEvents[0] = eventBuffer;
+ for (size_t i = 1; i < nperiods; ++i) {
+ // A clone should be cheap here as there are no events yet
+ m_localEvents[i] = eventBuffer->clone();
+ }
}
// New caches so LoadLiveData's output workspace needs to be replaced
diff --git a/instrument/Facilities.xml b/instrument/Facilities.xml
index 29557a1c7e6..bb12995ac2e 100644
--- a/instrument/Facilities.xml
+++ b/instrument/Facilities.xml
@@ -50,14 +50,6 @@
<connection name="event" address="NDXENGINX:10000" listener="ISISLiveEventDataListener" />
</livedata>
</instrument>
-
- <instrument name="DENEX" shortname="DENEX" >
- <zeropadding size="8" />
- <technique>Neutron Diffraction</technique>
- <livedata default="event">
- <connection name="event" address="sakura:9092" listener="KafkaEventListener" />
- </livedata>
- </instrument>
<instrument name="GEM">
<technique>Neutron Diffraction</technique>
--
GitLab