project8 · pkolbeck · Feb 17, 2023 · May 3, 2024 · Dec 13, 2024 · Jan 10, 2025
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -85,9 +85,6 @@ endif( FFTW_FOUND )
 # Boost (1.48 required for container; scarab minimum is 1.46)
 #find_package( Boost 1.48.0 REQUIRED )
 
-# Sandfly
-add_definitions( -DDRIPLINE_AUTH_FILE=~/.project8_authentications.json )
-
 # Included external dependencies
 # Including: tk_spline
 add_subdirectory( external )

diff --git a/Dockerfile b/Dockerfile
@@ -18,7 +18,7 @@ ENV PSYLLID_TAG=${psyllid_tag}
 ENV PSYLLID_INSTALL_PREFIX=${P8_ROOT}/${psyllid_subdir}/${PSYLLID_TAG}
 ENV NARG=${narg}
 
-ENV PATH="${PATH}:${PSYLLID_INSTALL_PREFIX}"
+ENV PATH="${PATH}:${PSYLLID_INSTALL_PREFIX}/bin"
 
 # Build image with dev dependencies
 FROM base AS deps

diff --git a/sandfly b/sandfly
diff --git a/source/applications/psyllid.cc b/source/applications/psyllid.cc
@@ -12,6 +12,7 @@
 #include "conductor.hh"
 #include "sandfly_error.hh"
 #include "server_config.hh"
+#include "slack_relayer.hh"
 
 #include "application.hh"
 #include "logger.hh"
@@ -41,18 +42,20 @@ int main( int argc, char** argv )
         // The application
         scarab::main_app the_main;
         conductor the_conductor;
-        the_conductor.set_rc_creator< daq_control >();
 
         // Default configuration
+        // Same as sandfly, but change the name
         the_main.default_config() = server_config();
+        the_main.default_config()["name"]() = "psyllid";
 
         // The main execution callback
         the_main.callback( [&](){ 
                 scarab::signal_handler t_sig_hand;
                 auto t_cwrap = scarab::wrap_cancelable( the_conductor );
                 t_sig_hand.add_cancelable( t_cwrap );
 
-                the_conductor.execute( the_main.primary_config(), the_main.auth() ); 
+                the_conductor.execute< daq_control >( the_main.primary_config(), the_main.auth(), 
+                                                      std::make_shared< slack_relayer >(the_main.primary_config(), the_main.auth()) ); 
             } );
 
         // Command line options

diff --git a/source/control/daq_control.cc b/source/control/daq_control.cc
@@ -59,7 +59,7 @@ namespace psyllid
             catch( std::exception& e )
             {
                 LERROR( plog, "Unable to start files: " << e.what() );
-                f_msg_relay->slack_error( std::string("Unable to start files: ") + e.what() );
+                f_msg_relay->send_error( std::string("Unable to start files: ") + e.what() );
                 set_status( status::error );
                 LDEBUG( plog, "Canceling midge" );
                 if( f_midge_pkg.have_lock() ) f_midge_pkg->cancel();
@@ -81,7 +81,7 @@ namespace psyllid
             catch( std::exception& e )
             {
                 LERROR( plog, "Unable to finish files: " << e.what() );
-                f_msg_relay->slack_error( std::string("Unable to finish files: ") + e.what() );
+                f_msg_relay->send_error( std::string("Unable to finish files: ") + e.what() );
                 set_status( status::error );
                 LDEBUG( plog, "Canceling midge" );
                 if( f_midge_pkg.have_lock() ) f_midge_pkg->cancel();

diff --git a/source/daq/CMakeLists.txt b/source/daq/CMakeLists.txt
@@ -9,6 +9,7 @@ set( headers
     event_builder.hh
     #single_value_trigger.hh
     frequency_mask_trigger.hh
+    locust_egg_reader.hh
     packet_receiver_socket.hh
     roach_config.hh
     streaming_writer.hh
@@ -25,6 +26,7 @@ set( sources
     event_builder.cc
     #single_value_trigger.cc
     frequency_mask_trigger.cc
+    locust_egg_reader.cc
     packet_receiver_socket.cc
     roach_config.cc
     streaming_writer.cc

diff --git a/source/daq/frequency_mask_trigger.hh b/source/daq/frequency_mask_trigger.hh
@@ -64,7 +64,7 @@ namespace psyllid
      - "threshold-power-snr": float -- The threshold SNR, given as a power SNR
      - "threshold-power-snr-high": float -- A second SNR threshold, given as power SNR
      - "threshold-dB": float -- The threshold SNR, given as a dB factor
-     - "trigger-mode": string -- The trigger mode, can be set to "single-level-trigger" or "two-level-trigger"
+     - "trigger-mode": string -- The trigger mode, can be set to "single-level" or "two-level"
      - "n-spline-points": uint -- The number of points to have in the spline fit for the trigger mask
      - "mask-configuration": string || node -- If a string, path to a yaml file with mask and mask-data arrays to populate the respective vectors; if a node, then contains those arrays of floats.
+1 −1		CMakeLists.txt
+1 −1		dripline-cpp
+13 −18		library/control/conductor.cc
+23 −2		library/control/conductor.hh
+1 −1		library/control/request_receiver.cc
+31 −26		library/control/run_control.cc
+15 −3		library/control/run_control.hh
+5 −3		library/control/server_config.cc
+3 −5		library/control/server_config.hh
+27 −17		library/utility/message_relayer.cc
+42 −9		library/utility/message_relayer.hh
+1 −1		midge