Merge pull request #272 from sy-c/master

sy-c · web-flow · commit 332472fefab4 · 2023-11-29T17:24:24.000+01:00
v2.21.8
diff --git a/doc/releaseNotes.md b/doc/releaseNotes.md
@@ -603,3 +603,6 @@ This file describes the main feature changes for each readout.exe released versi
 
 ## v2.21.7 - 24/11/2023
 - Minor changes: fix for c++20 compatibility.
+
+## v2.21.8 - 29/11/2023
+- Fixed spurious readout warning("TF non-contiguous ordering") when doing Start/Stop/Start with DD is enabled.
diff --git a/src/ConsumerFMQchannel.cxx b/src/ConsumerFMQchannel.cxx
@@ -1370,6 +1370,8 @@ int ConsumerFMQchannel::start() {
   nIncompleteHBF = 0;
   TFdropped = 0;
 
+  currentTimeframeId = undefinedTimeframeId;
+
   return Consumer::start();
 }
 int ConsumerFMQchannel::stop() {
diff --git a/src/ReadoutVersion.h b/src/ReadoutVersion.h
@@ -9,5 +9,5 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#define READOUT_VERSION "2.21.7"
+#define READOUT_VERSION "2.21.8"
 

Original file line number	Diff line number	Diff line change
`@@ -1370,6 +1370,8 @@ int ConsumerFMQchannel::start() {`
`1370`	`1370`	`nIncompleteHBF = 0;`
`1371`	`1371`	`TFdropped = 0;`
`1372`	`1372`
	`1373`	`+ currentTimeframeId = undefinedTimeframeId;`
	`1374`	`+`
`1373`	`1375`	`return Consumer::start();`
`1374`	`1376`	`}`
`1375`	`1377`	`int ConsumerFMQchannel::stop() {`