ChimeraTK · mhier · Apr 7, 2025 · Apr 7, 2025
diff --git a/examples/cosade/IndependentControlCore.h b/examples/cosade/IndependentControlCore.h
@@ -5,10 +5,10 @@
 
 // FIXME: in a real example an installed version of the adapter has to be used,
 // which has the headers installed under the namespace folder
-//#include <ControlSystemAdapter/DevicePVManager.h>
-//#include <ControlSystemAdapter/ProcessScalar.h>
-//#include <ControlSystemAdapter/DeviceSynchronizationUtility.h>
-//#include <ControlSystemAdapter/SynchronizationDirection.h>
+// #include <ControlSystemAdapter/DevicePVManager.h>
+// #include <ControlSystemAdapter/ProcessScalar.h>
+// #include <ControlSystemAdapter/DeviceSynchronizationUtility.h>
+// #include <ControlSystemAdapter/SynchronizationDirection.h>
 #include <ChimeraTK/ControlSystemAdapter/DevicePVManager.h>
 #include <ChimeraTK/ControlSystemAdapter/DeviceSynchronizationUtility.h>
 #include <ChimeraTK/ControlSystemAdapter/ProcessScalar.h>
@@ -53,9 +53,8 @@ class IndependentControlCore {
    */
   IndependentControlCore(boost::shared_ptr<ChimeraTK::DevicePVManager> const& processVariableManager)
   // initialise all process variables, using the factory
-  : _processVariableManager(processVariableManager),
-    _targetVoltage(
-        processVariableManager->createProcessScalar<int>(ChimeraTK::controlSystemToDevice, "TARGET_VOLTAGE")),
+  : _processVariableManager(processVariableManager), _targetVoltage(processVariableManager->createProcessScalar<int>(
+                                                         ChimeraTK::controlSystemToDevice, "TARGET_VOLTAGE")),
     _monitorVoltage(
         processVariableManager->createProcessScalar<int>(ChimeraTK::deviceToControlSystem, "MONITOR_VOLTAGE")) {
     // initialise the hardware here

diff --git a/examples/cosade/testIndependentControlCore.cpp b/examples/cosade/testIndependentControlCore.cpp
@@ -2,11 +2,11 @@
 
 #define BOOST_TEST_MODULE IndependentControlCoreTest
 // Only after defining the name include the unit test header.
-#include <boost/test/included/unit_test.hpp>
+#include "IndependentControlCore.h"
 
 #include <ChimeraTK/ControlSystemAdapter/ControlSystemSynchronizationUtility.h>
 
-#include "IndependentControlCore.h"
+#include <boost/test/included/unit_test.hpp>
 
 using namespace boost::unit_test_framework;
 using namespace ChimeraTK;

diff --git a/include/ChimeraTK/ControlSystemAdapter/ApplicationBase.h b/include/ChimeraTK/ControlSystemAdapter/ApplicationBase.h
@@ -4,10 +4,10 @@
 #ifndef CHIMERA_TK_CONTROL_SYSTEM_ADAPTER_APPLICATION_BASE_H
 #define CHIMERA_TK_CONTROL_SYSTEM_ADAPTER_APPLICATION_BASE_H
 
-#include <mutex>
-
 #include "DevicePVManager.h"
 
+#include <mutex>
+
 namespace ChimeraTK {
 
   /** Base class for applications. Note: The class intended for use by the
@@ -39,10 +39,10 @@ namespace ChimeraTK {
 
     /** Optimise unmapped variables to avoid unnecessary copies. The application must implement this function. The
      *  ControlSystemAdapter implementation should call it with a list of PV names which are not mapped, i.e. the
-     *  Application does not need to update the values of these PVs. If this function is not called, no such optimisation
-     *  can be done and the application may have an increased CPU usage. If the function is called, it must be called
-     *  after initialise() and before run(). */
-    virtual void optimiseUnmappedVariables(const std::set<std::string> &unmappedVariables) { (void)unmappedVariables; }
+     *  Application does not need to update the values of these PVs. If this function is not called, no such
+     * optimisation can be done and the application may have an increased CPU usage. If the function is called, it must
+     * be called after initialise() and before run(). */
+    virtual void optimiseUnmappedVariables(const std::set<std::string>& unmappedVariables) { (void)unmappedVariables; }
 
     /** Run the application. This function must be implemented by the application
      * programmer. It will be called after initialise() and after all process
@@ -75,7 +75,8 @@ namespace ChimeraTK {
     [[nodiscard]] const std::string& getName() const { return _applicationName; }
 
     /** Obtain the PersistentDataStorage object. You can specify the write interval in seconds. */
-    boost::shared_ptr<PersistentDataStorage> getPersistentDataStorage(unsigned int writeInterval = PersistentDataStorage::DEFAULT_WRITE_INTERVAL) {
+    boost::shared_ptr<PersistentDataStorage> getPersistentDataStorage(
+        unsigned int writeInterval = PersistentDataStorage::DEFAULT_WRITE_INTERVAL) {
       if(!_persistentDataStorage) {
         _persistentDataStorage.reset(new PersistentDataStorage(_applicationName, writeInterval));
       }

diff --git a/include/ChimeraTK/ControlSystemAdapter/BidirectionalProcessArray.h b/include/ChimeraTK/ControlSystemAdapter/BidirectionalProcessArray.h
@@ -1,17 +1,17 @@
 #ifndef CHIMERA_TK_CONTROL_SYSTEM_ADAPTER_BIDIRECTIONAL_PROCESS_ARRAY_H
 #define CHIMERA_TK_CONTROL_SYSTEM_ADAPTER_BIDIRECTIONAL_PROCESS_ARRAY_H
 
+#include "PersistentDataStorage.h"
+#include "UnidirectionalProcessArray.h"
+
+#include <boost/shared_ptr.hpp>
+
 #include <limits>
 #include <stdexcept>
 #include <typeinfo>
 #include <utility>
 #include <vector>
 
-#include <boost/shared_ptr.hpp>
-
-#include "PersistentDataStorage.h"
-#include "UnidirectionalProcessArray.h"
-
 namespace ChimeraTK {
 
   /**
@@ -85,8 +85,7 @@ namespace ChimeraTK {
   std::pair<typename ProcessArray<T>::SharedPtr, typename ProcessArray<T>::SharedPtr>
       createBidirectionalSynchronizedProcessArray(const std::vector<T>& initialValue,
           const ChimeraTK::RegisterPath& name = "", const std::string& unit = "", const std::string& description = "",
-          std::size_t numberOfBuffers = 3,
-          const AccessModeFlags& flags = {AccessMode::wait_for_new_data});
+          std::size_t numberOfBuffers = 3, const AccessModeFlags& flags = {AccessMode::wait_for_new_data});
 
   /**
    * Implementation of the process array that transports data in both

diff --git a/include/ChimeraTK/ControlSystemAdapter/ControlSystemPVManager.h b/include/ChimeraTK/ControlSystemAdapter/ControlSystemPVManager.h
@@ -1,13 +1,13 @@
 #ifndef CHIMERA_TK_CONTROL_SYSTEM_ADAPTER_CONTROL_SYSTEM_PV_MANAGER_H
 #define CHIMERA_TK_CONTROL_SYSTEM_ADAPTER_CONTROL_SYSTEM_PV_MANAGER_H
 
-#include <list>
-#include <map>
+#include "ApplicationBase.h"
+#include "PVManager.h"
 
 #include <boost/shared_ptr.hpp>
 
-#include "ApplicationBase.h"
-#include "PVManager.h"
+#include <list>
+#include <map>
 
 namespace ChimeraTK {
 
@@ -59,7 +59,7 @@ namespace ChimeraTK {
      * std::string&, T, bool, std::size_t, const AccessModeFlags&) or
      * DevicePVManager::createProcessArray(SynchronizationDirection, const
      * ChimeraTK::RegisterPath&, const std::vector<T>&, const std::string&, const
-     * std::string&, bool, std::size_t, const AccessModeFlags&) method. 
+     * std::string&, bool, std::size_t, const AccessModeFlags&) method.
      * Throws logic_error if there is no process scalar or array with
      * the specified name. Also throws a logic_error if there is a process
      * scalar or array with the specified name but its type does not match.

diff --git a/include/ChimeraTK/ControlSystemAdapter/DevicePVManager.h b/include/ChimeraTK/ControlSystemAdapter/DevicePVManager.h
@@ -5,13 +5,13 @@ namespace ChimeraTK {
   class DevicePVManager;
 } // namespace ChimeraTK
 
-#include <map>
-#include <string>
+#include "PVManager.h"
+#include "SynchronizationDirection.h"
 
 #include <boost/shared_ptr.hpp>
 
-#include "PVManager.h"
-#include "SynchronizationDirection.h"
+#include <map>
+#include <string>
 
 namespace ChimeraTK {
 
@@ -111,7 +111,7 @@ namespace ChimeraTK {
      * std::string&, T, bool, std::size_t, const AccessModeFlags&) or
      * createProcessArray(SynchronizationDirection, const
      * ChimeraTK::RegisterPath&, const std::vector<T>&, const std::string&, const
-     * std::string&, bool, std::size_t, const AccessModeFlags&) method. 
+     * std::string&, bool, std::size_t, const AccessModeFlags&) method.
      * Throws a logic_error if there is no process scalar or array with
      * the specified name. Also throws logic_error if there is a process
      * scalar or array with the specified name but its type does not match.
@@ -127,7 +127,7 @@ namespace ChimeraTK {
      * std::string&, T, bool, std::size_t, const AccessModeFlags&), or
      * createProcessArray(SynchronizationDirection, const
      * ChimeraTK::RegisterPath&, const std::vector<T>&, const std::string&, const
-     * std::string&, bool, std::size_t, const AccessModeFlags&) method. 
+     * std::string&, bool, std::size_t, const AccessModeFlags&) method.
      * Throws a logic_error if there is no process scalar or array with
      * the specified name. Also throws logic_error if there is a process
      * scalar or array with the specified name but its type does not match.

diff --git a/include/ChimeraTK/ControlSystemAdapter/PVManager.h b/include/ChimeraTK/ControlSystemAdapter/PVManager.h
@@ -1,20 +1,20 @@
 #ifndef CHIMERA_TK_CONTROL_SYSTEM_ADAPTER_PV_MANAGER_H
 #define CHIMERA_TK_CONTROL_SYSTEM_ADAPTER_PV_MANAGER_H
 
-#include <list>
-#include <utility>
+#include "BidirectionalProcessArray.h"
+#include "ProcessVariable.h"
+#include "PVManagerDecl.h"
+#include "UnidirectionalProcessArray.h"
+
+#include <ChimeraTK/RegisterPath.h>
 
 #include <boost/lockfree/queue.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
-#include <map>
 
-#include <ChimeraTK/RegisterPath.h>
-
-#include "BidirectionalProcessArray.h"
-#include "PVManagerDecl.h"
-#include "UnidirectionalProcessArray.h"
-#include "ProcessVariable.h"
+#include <list>
+#include <map>
+#include <utility>
 
 namespace ChimeraTK {
 
@@ -149,7 +149,7 @@ namespace ChimeraTK {
 
     /**
      * Returns a reference to a process array that has been created earlier
-     * using one of the <code>createProcessArray...</code> methods. 
+     * using one of the <code>createProcessArray...</code> methods.
      * Throws a logic_error if there is a process scalar or array with the specified name but its type does not match.
      * A pair of two process arrays is returned: The first member of the pair is
      * a reference to the instance intended for the control system and the

diff --git a/include/ChimeraTK/ControlSystemAdapter/PersistentDataStorage.h b/include/ChimeraTK/ControlSystemAdapter/PersistentDataStorage.h
@@ -1,20 +1,20 @@
 #ifndef CHIMERA_TK_CONTROL_SYSTEM_ADAPTER_PERSISTENT_DATA_STORAGE_H
 #define CHIMERA_TK_CONTROL_SYSTEM_ADAPTER_PERSISTENT_DATA_STORAGE_H
 
+#include <ChimeraTK/cppext/future_queue.hpp>
+#include <ChimeraTK/RegisterPath.h>
+#include <ChimeraTK/SupportedUserTypes.h>
+
+#include <boost/fusion/include/for_each.hpp>
+#include <boost/thread.hpp>
+
 #include <algorithm>
 #include <iostream>
 #include <map>
 #include <string>
 #include <typeinfo>
 #include <vector>
 
-#include <boost/fusion/include/for_each.hpp>
-#include <boost/thread.hpp>
-
-#include <ChimeraTK/RegisterPath.h>
-#include <ChimeraTK/SupportedUserTypes.h>
-#include <ChimeraTK/cppext/future_queue.hpp>
-
 namespace xmlpp {
   class Element;
 } // namespace xmlpp
@@ -45,7 +45,6 @@ namespace ChimeraTK {
    */
   class PersistentDataStorage {
    public:
-
     /** unit in seconds */
     static const unsigned int DEFAULT_WRITE_INTERVAL{30}; // 30 seconds
 
@@ -107,18 +106,19 @@ namespace ChimeraTK {
     std::vector<std::type_info const*> _variableTypes;
 
     /** Thread safe queue for write to file thread. */
-    template <typename DataType> class Queue {
+    template<typename DataType>
+    class Queue {
       cppext::future_queue<std::vector<DataType>> _q;
       std::vector<DataType> _latestValue{};
 
-    public:
-     explicit Queue(size_t queueSize = 2) : _q(queueSize) {}
-     void pushOverwrite(const std::vector<DataType>& e) { _q.push_overwrite(e); }
-     std::vector<DataType>& readLatest() {
-       while(_q.pop(_latestValue)) {
-       }
-       return _latestValue;
-     }
+     public:
+      explicit Queue(size_t queueSize = 2) : _q(queueSize) {}
+      void pushOverwrite(const std::vector<DataType>& e) { _q.push_overwrite(e); }
+      std::vector<DataType>& readLatest() {
+        while(_q.pop(_latestValue)) {
+        }
+        return _latestValue;
+      }
     };
 
     /** Type definition for the map holding the values for one specific data type.
@@ -244,7 +244,7 @@ namespace ChimeraTK {
   /*********************************************************************************************************************/
 
   template<typename DataType>
-  void PersistentDataStorage::updateValue(int id, std::vector<DataType> const &value) {
+  void PersistentDataStorage::updateValue(int id, std::vector<DataType> const& value) {
     boost::fusion::at_key<DataType>(_dataMap.table)[id].pushOverwrite(value);
   }
 

diff --git a/include/ChimeraTK/ControlSystemAdapter/ProcessArray.h b/include/ChimeraTK/ControlSystemAdapter/ProcessArray.h
@@ -1,19 +1,19 @@
 #ifndef CHIMERA_TK_CONTROL_SYSTEM_ADAPTER_PROCESS_ARRAY_H
 #define CHIMERA_TK_CONTROL_SYSTEM_ADAPTER_PROCESS_ARRAY_H
 
+#include "PersistentDataStorage.h"
+
+#include <ChimeraTK/NDRegisterAccessor.h>
+#include <ChimeraTK/VersionNumber.h>
+
+#include <boost/shared_ptr.hpp>
+
 #include <limits>
 #include <stdexcept>
 #include <typeinfo>
 #include <utility>
 #include <vector>
 
-#include <boost/shared_ptr.hpp>
-
-#include <ChimeraTK/NDRegisterAccessor.h>
-#include <ChimeraTK/VersionNumber.h>
-
-#include "PersistentDataStorage.h"
-
 namespace ChimeraTK {
 
   /**

diff --git a/include/ChimeraTK/ControlSystemAdapter/StatusAccessorBase.h b/include/ChimeraTK/ControlSystemAdapter/StatusAccessorBase.h
@@ -1,16 +1,17 @@
 #pragma once
 
+#include <assert.h>
+
 #include <cstdint>
 #include <string>
-#include <assert.h>
 
 namespace ChimeraTK {
 
   /** Base class - used to avoid code duplication in StatusOutput, StatusPushInput and StatusPollInput. */
   struct StatusAccessorBase {
     /**
      *  These are the states which can be reported.
-     *  
+     *
      *  Note: The values are exposed to the control system and hence are part of the public interface!
      */
     enum class Status : int32_t { OK = 0, FAULT = 1, OFF = 2, WARNING = 3 };

diff --git a/include/ChimeraTK/ControlSystemAdapter/StatusWithMessageReader.h b/include/ChimeraTK/ControlSystemAdapter/StatusWithMessageReader.h
@@ -1,11 +1,11 @@
 #pragma once
 
+#include "StatusAccessorBase.h"
+
+#include <ChimeraTK/DataConsistencyGroup.h>
 #include <ChimeraTK/ForwardDeclarations.h>
 #include <ChimeraTK/RegisterPath.h>
 #include <ChimeraTK/ScalarRegisterAccessor.h>
-#include <ChimeraTK/DataConsistencyGroup.h>
-
-#include "StatusAccessorBase.h"
 
 namespace ChimeraTK {
 
@@ -66,7 +66,7 @@ namespace ChimeraTK {
 
   /**
    * This is for consistent readout of StatusWithMessage - DeviceAccess version.
-   *  It can be instantiated wih or without message string. 
+   *  It can be instantiated wih or without message string.
    *  If instantiated without message, the message is generated automatically from the status.
    */
   struct StatusWithMessageReader : StatusWithMessageReaderBase<StatusWithMessageReader> {