JCF: clang format the code

include/trigger/AlgorithmPlugins.hpp

@@ -11,10 +11,10 @@
 #ifndef TRIGGER_INCLUDE_TRIGGER_ALGORITHMPLUGINS_HPP_
 #define TRIGGER_INCLUDE_TRIGGER_ALGORITHMPLUGINS_HPP_
 
-#include "triggeralgs/TriggerDecisionMaker.hpp"
+#include "trigger/Issues.hpp"
 #include "triggeralgs/TriggerActivityFactory.hpp"
 #include "triggeralgs/TriggerCandidateFactory.hpp"
-#include "trigger/Issues.hpp"
+#include "triggeralgs/TriggerDecisionMaker.hpp"
 
 #include "cetlib/BasicPluginFactory.h"
 
@@ -71,7 +71,7 @@ make_tc_maker(std::string const& plugin_name)
   {                                                                                                                    \
     std::unique_ptr<triggeralgs::TriggerDecisionMaker> make()                                                          \
     {                                                                                                                  \
-      return std::unique_ptr<triggeralgs::TriggerDecisionMaker>(new klass());                                            \
+      return std::unique_ptr<triggeralgs::TriggerDecisionMaker>(new klass());                                          \
     }                                                                                                                  \
   }
 

include/trigger/Issues.hpp

@@ -13,12 +13,12 @@
 #include "daqdataformats/SourceID.hpp"
 #include "daqdataformats/Types.hpp"
 #include "ers/Issue.hpp"
-#include "triggeralgs/Types.hpp"
-#include "trigger/serialize.hpp"
 #include "logging/Logging.hpp" // NOTE: if ISSUES ARE DECLARED BEFORE include logging/Logging.hpp, TLOG_DEBUG<<issue wont work.
+#include "trigger/serialize.hpp"
+#include "triggeralgs/Types.hpp"
 
-#include <string>
 #include <bitset>
+#include <string>
 
 // NOLINTNEXTLINE(build/define_used)
 #define TLVL_ENTER_EXIT_METHODS 10
@@ -161,19 +161,19 @@ ERS_DECLARE_ISSUE_BASE(trigger,
 ERS_DECLARE_ISSUE_BASE(trigger,
                        TCOutOfTimeout,
                        appfwk::GeneralDAQModuleIssue,
-                       "TC of type " << tc_type << ", timestamp " << tc_timestamp << " overlaps with previous TD readout window: [" << td_start << ", " << td_end << "]",
+                       "TC of type " << tc_type << ", timestamp " << tc_timestamp
+                                     << " overlaps with previous TD readout window: [" << td_start << ", " << td_end
+                                     << "]",
                        ((std::string)name),
-                       ((int)tc_type)
-                       ((triggeralgs::timestamp_t)tc_timestamp)
-                       ((triggeralgs::timestamp_t)td_start)
-                       ((triggeralgs::timestamp_t)td_end))
+                       ((int)tc_type)((triggeralgs::timestamp_t)tc_timestamp)((triggeralgs::timestamp_t)td_start)(
+                         (triggeralgs::timestamp_t)td_end))
 
 ERS_DECLARE_ISSUE_BASE(trigger,
                        TCTimestampsSizeError,
                        appfwk::GeneralDAQModuleIssue,
                        "There are no next timestamps!",
                        ((std::string)name),
-		       ((int)size))
+                       ((int)size))
 
 ERS_DECLARE_ISSUE_BASE(trigger,
                        InvalidHSIEventRunNumber,
@@ -194,17 +194,11 @@ ERS_DECLARE_ISSUE_BASE(trigger,
 ERS_DECLARE_ISSUE(trigger,
                   TADropped,
                   "TA timestamp " << time << " for channel " << channel,
-                  ((uint64_t)time) ((uint64_t)channel))
+                  ((uint64_t)time)((uint64_t)channel))
 
-ERS_DECLARE_ISSUE(trigger,
-                  TCDropped,
-                  "TC timestamp " << time << " for src " << src,
-                  ((uint64_t)time) ((uint64_t)src))
+ERS_DECLARE_ISSUE(trigger, TCDropped, "TC timestamp " << time << " for src " << src, ((uint64_t)time)((uint64_t)src))
 
-ERS_DECLARE_ISSUE(trigger,
-                  TDDropped,
-                  "TD trigger number " << tn << " time stamp  " << ts,
-                  ((uint64_t)tn) ((uint64_t)ts))
+ERS_DECLARE_ISSUE(trigger, TDDropped, "TD trigger number " << tn << " time stamp  " << ts, ((uint64_t)tn)((uint64_t)ts))
 
 ERS_DECLARE_ISSUE_BASE(trigger,
                        MLTConfigurationProblem,
@@ -267,7 +261,7 @@ ERS_DECLARE_ISSUE_BASE(trigger,
                        appfwk::GeneralDAQModuleIssue,
                        "No valid files to use!",
                        ((std::string)name),
-		       ERS_EMPTY)
+                       ERS_EMPTY)
 
 ERS_DECLARE_ISSUE_BASE(trigger,
                        ReplayNoValidTPs,
@@ -279,9 +273,8 @@ ERS_DECLARE_ISSUE_BASE(trigger,
 ERS_DECLARE_ISSUE_BASE(trigger,
                        ReplayStreamFileError,
                        appfwk::GeneralDAQModuleIssue,
-                       "Duplicate stream index " << index
-                         << " for file: " << filename
-                         << " (original: " << original << ")",
+                       "Duplicate stream index " << index << " for file: " << filename << " (original: " << original
+                                                 << ")",
                        ((std::string)name),
                        ((int)index)((std::string)filename)((std::string)original))
 

include/trigger/Set.hpp

@@ -43,10 +43,10 @@ class Set
 
   // The current run number
   daqdataformats::run_number_t run_number{ 0 };
-  
+
   // Identify the instance creator/stream/source of this set.
   origin_t origin{ daqdataformats::SourceID(daqdataformats::SourceID::Subsystem::kTrigger,
-                                         daqdataformats::SourceID::s_invalid_id) };
+                                            daqdataformats::SourceID::s_invalid_id) };
 
   // Whether this Set is a regular bag-of-objects or a heartbeat
   Type type{ kUnknown };

include/trigger/TASet.hpp

@@ -22,6 +22,14 @@ using TASet = Set<triggeralgs::TriggerActivity>;
 } // namespace dunedaq::trigger
 
 DUNE_DAQ_SERIALIZE_ENUM(dunedaq::trigger::TASet::Type)
-DUNE_DAQ_SERIALIZE_NON_INTRUSIVE(dunedaq::trigger, TASet, seqno, run_number, origin, type, start_time, end_time, objects)
+DUNE_DAQ_SERIALIZE_NON_INTRUSIVE(dunedaq::trigger,
+                                 TASet,
+                                 seqno,
+                                 run_number,
+                                 origin,
+                                 type,
+                                 start_time,
+                                 end_time,
+                                 objects)
 
 #endif // TRIGGER_INCLUDE_TRIGGER_TASET_HPP_

include/trigger/TAWrapper.hpp

@@ -11,78 +11,72 @@
 
 #include "daqdataformats/Fragment.hpp"
 #include "iomanager/Receiver.hpp"
+#include "triggeralgs/TriggerActivity.hpp"
 #include "triggeralgs/TriggerObjectOverlay.hpp"
 #include "triggeralgs/TriggerPrimitive.hpp"
-#include "triggeralgs/TriggerActivity.hpp"
 
 namespace dunedaq {
 namespace trigger {
-  struct TAWrapper
+struct TAWrapper
+{
+
+  using FrameType = TAWrapper;
+
+  triggeralgs::TriggerActivity activity;
+  std::vector<uint8_t> activity_overlay_buffer;
+
+  // Don't really want this default ctor, but IterableQueueModel requires it
+  // TAWrapper() {}
+
+  TAWrapper(triggeralgs::TriggerActivity a = triggeralgs::TriggerActivity())
+    : activity(a)
+  {
+    populate_buffer();
+  }
+
+  void populate_buffer()
+  {
+    activity_overlay_buffer.resize(triggeralgs::get_overlay_nbytes(activity));
+    triggeralgs::write_overlay(activity, activity_overlay_buffer.data());
+  }
+
+  // comparable based on first timestamp
+  bool operator<(const TAWrapper& other) const
   {
+    return std::tie(this->activity.time_start, this->activity.channel_start) <
+           std::tie(other.activity.time_start, other.activity.channel_start);
+  }
+
+  uint64_t get_timestamp() const // NOLINT(build/unsigned)
+  {
+    return activity.time_start;
+  }
+
+  void set_timestamp(uint64_t ts) // NOLINT(build/unsigned)
+  {
+    activity.time_start = ts;
+  }
+
+  void fake_timestamps(uint64_t first_timestamp, uint64_t /*offset */ = 0) // NOLINT(build/unsigned)
+  {
+    activity.time_start = first_timestamp;
+    populate_buffer();
+  }
+
+  size_t get_payload_size() { return activity_overlay_buffer.size(); }
+
+  size_t get_num_frames() { return 1; }
+
+  size_t get_frame_size() { return get_payload_size(); }
+
+  TAWrapper* begin() { return (TAWrapper*)(activity_overlay_buffer.data()); }
 
-    using FrameType = TAWrapper;
-
-    triggeralgs::TriggerActivity activity;
-    std::vector<uint8_t> activity_overlay_buffer;
-
-    // Don't really want this default ctor, but IterableQueueModel requires it
-    //TAWrapper() {}
-
-    TAWrapper(triggeralgs::TriggerActivity a = triggeralgs::TriggerActivity())
-      : activity(a)
-    {
-      populate_buffer();
-    }
-
-    void populate_buffer()
-    {
-      activity_overlay_buffer.resize(triggeralgs::get_overlay_nbytes(activity));
-      triggeralgs::write_overlay(activity, activity_overlay_buffer.data());
-    }
-
-    // comparable based on first timestamp
-    bool operator<(const TAWrapper& other) const
-    {
-      return std::tie(this->activity.time_start, this->activity.channel_start) < std::tie(other.activity.time_start, other.activity.channel_start);
-    }
-
-    uint64_t get_timestamp() const // NOLINT(build/unsigned)
-    {
-      return activity.time_start;
-    }
-
-    void set_timestamp(uint64_t ts) // NOLINT(build/unsigned)
-    {
-      activity.time_start = ts;
-    }
-
-    void fake_timestamps(uint64_t first_timestamp, uint64_t /*offset */ = 0) // NOLINT(build/unsigned)
-    {
-      activity.time_start = first_timestamp;
-      populate_buffer();
-    }
-
-    size_t get_payload_size() { return activity_overlay_buffer.size(); }
-
-    size_t get_num_frames() { return 1; }
-
-    size_t get_frame_size() { return get_payload_size(); }
-
-    TAWrapper* begin()
-    {
-      return (TAWrapper*)(activity_overlay_buffer.data());
-    }
-
-    TAWrapper* end()
-    {
-      return (TAWrapper*)(activity_overlay_buffer.data()+activity_overlay_buffer.size());
-    }
-
-    static const constexpr daqdataformats::SourceID::Subsystem subsystem = daqdataformats::SourceID::Subsystem::kTrigger;
-    static const constexpr daqdataformats::FragmentType fragment_type = daqdataformats::FragmentType::kTriggerActivity;
-    // No idea what this should really be set to
-    static const constexpr uint64_t expected_tick_difference = 1; // NOLINT(build/unsigned)
+  TAWrapper* end() { return (TAWrapper*)(activity_overlay_buffer.data() + activity_overlay_buffer.size()); }
 
+  static const constexpr daqdataformats::SourceID::Subsystem subsystem = daqdataformats::SourceID::Subsystem::kTrigger;
+  static const constexpr daqdataformats::FragmentType fragment_type = daqdataformats::FragmentType::kTriggerActivity;
+  // No idea what this should really be set to
+  static const constexpr uint64_t expected_tick_difference = 1; // NOLINT(build/unsigned)
 };
 
 } // namespace trigger

include/trigger/TCSet.hpp

@@ -22,6 +22,14 @@ using TCSet = Set<triggeralgs::TriggerCandidate>;
 } // namespace dunedaq::trigger
 
 DUNE_DAQ_SERIALIZE_ENUM(dunedaq::trigger::TCSet::Type)
-DUNE_DAQ_SERIALIZE_NON_INTRUSIVE(dunedaq::trigger, TCSet, seqno, run_number, origin, type, start_time, end_time, objects)
+DUNE_DAQ_SERIALIZE_NON_INTRUSIVE(dunedaq::trigger,
+                                 TCSet,
+                                 seqno,
+                                 run_number,
+                                 origin,
+                                 type,
+                                 start_time,
+                                 end_time,
+                                 objects)
 
 #endif // TRIGGER_INCLUDE_TRIGGER_TCSET_HPP_