Merge branch 'dev' into frib-daq-readout

Author: flueke

extras/dev-tools/mvlc_init_daq_repeat.cc

@@ -1,13 +1,12 @@
 #include <mesytec-mvlc/mesytec-mvlc.h>
 #include <argh.h>
-#include <signal.h>
 #include <system_error>
 
 using namespace mesytec::mvlc;
 
 int main(int argc, char *argv[])
 {
-    setup_signal_handlers();
+    util::setup_signal_handlers();
 
     spdlog::set_level(spdlog::level::info);
     mesytec::mvlc::set_global_log_level(spdlog::level::info);
@@ -70,7 +69,7 @@ int main(int argc, char *argv[])
         size_t cycleNumber = 0;
         size_t lastCycleNumber = 0;
 
-        while (!signal_received())
+        while (!util::signal_received())
         {
             auto initResults = init_readout(mvlc, crateConfig, {});
 

extras/dev-tools/mvlc_register_rw_loop.cc

@@ -165,14 +165,14 @@ int main(int argc, char *argv[])
     u16 registerAddress = 0x600E; // fw revision register. no effect when written to
     if (parser("--register-address") >> str)
     {
-        if (auto val = parse_unsigned<u16>(str))
+        if (auto val = util::parse_unsigned<u16>(str))
             registerAddress = *val;
     }
 
     u32 registerValue = 1;
     if (parser("--register-value") >> str)
     {
-        if (auto val = parse_unsigned<u32>(str))
+        if (auto val = util::parse_unsigned<u32>(str))
             registerValue = *val;
     }
 

extras/mini-daq/src/mdpp16-readout-example1.cc

@@ -182,7 +182,7 @@ class ReadoutHelper
 };
 
 void handle_event_data(void *userContext, int crateIndex, int eventIndex,
-                       const ModuleData *moduleDataList, unsigned moduleCount)
+                       const readout_parser::ModuleData *moduleDataList, unsigned moduleCount)
 {
     spdlog::info("handle_event_data: {} {}", fmt::ptr(moduleDataList), moduleCount);
     for (unsigned mi=0; mi<moduleCount; ++mi)

extras/mini-daq/src/mini_daq_main.cc

@@ -35,13 +35,13 @@ StackErrorCounters delta_counters(const StackErrorCounters &prev, const StackErr
                    std::begin(result.stackErrors),
                    util::delta_map<ErrorInfoCounts>);
 
-    result.nonErrorFrames = calc_delta0(curr.nonErrorFrames, prev.nonErrorFrames);
-    result.nonErrorHeaderCounts = delta_map(prev.nonErrorHeaderCounts, curr.nonErrorHeaderCounts);
+    result.nonErrorFrames = util::calc_delta0(curr.nonErrorFrames, prev.nonErrorFrames);
+    result.nonErrorHeaderCounts = util::delta_map(prev.nonErrorHeaderCounts, curr.nonErrorHeaderCounts);
 
     return result;
 }
 
-#define CALC_DELTA0(member) result.member = calc_delta0(curr.member, prev.member)
+#define CALC_DELTA0(member) result.member = util::calc_delta0(curr.member, prev.member)
 
 ReadoutWorker::Counters delta_counters(const ReadoutWorker::Counters &prev, const ReadoutWorker::Counters &curr)
 {
@@ -59,7 +59,7 @@ ReadoutWorker::Counters delta_counters(const ReadoutWorker::Counters &prev, cons
     std::transform(std::begin(prev.stackHits), std::end(prev.stackHits),
                    std::begin(curr.stackHits),
                    std::begin(result.stackHits),
-                   calc_delta0<size_t>);
+                   util::calc_delta0<size_t>);
 
     // TODO eth::PipeStats
     // TODO ListfileWriterCounters
@@ -328,7 +328,7 @@ int main(int argc, char *argv[])
 
         // positional args
         | lyra::arg(opt_crateConfig, "crateConfig")
-            ("crate config yaml file").required()
+            ("crate config YAML or JSON file").required()
 
         | lyra::arg(opt_secondsToRun, "secondsToRun")
             ("duration the DAQ should run in seconds").optional()
@@ -365,15 +365,6 @@ int main(int argc, char *argv[])
     if (opt_logTrace)
         set_global_log_level(spdlog::level::trace);
 
-
-    std::ifstream inConfig(opt_crateConfig);
-
-    if (!inConfig.is_open())
-    {
-        cerr << "Error opening crate config " << argv[1] << " for reading." << endl;
-        return 1;
-    }
-
     try
     {
         auto timeToRun = std::chrono::seconds(opt_secondsToRun);
@@ -382,11 +373,11 @@ int main(int argc, char *argv[])
 
         try
         {
-            crateConfig = crate_config_from_yaml(inConfig);
+            crateConfig = crate_config_from_file(opt_crateConfig);
         }
         catch (const std::runtime_error &e)
         {
-            cerr << "Error parsing CrateConfig: " << e.what() << endl;
+            cerr << fmt::format("Error loading CrateConfig from '{}': {}\n", opt_crateConfig, e.what());
             return 1;
         }
 
@@ -515,7 +506,7 @@ int main(int argc, char *argv[])
         }
 
         MiniDaqCountersUpdate counters;
-        Stopwatch sw;
+        util::Stopwatch sw;
 
         while (!rdo.finished())
         {