renamed: --peakfinder_parameters -> --config_file, etc.

dap/worker.py

@@ -20,7 +20,7 @@ def main():
     parser.add_argument("--accumulator_port", type=int, default=13000)
     parser.add_argument("--visualisation_host", default="localhost")
     parser.add_argument("--visualisation_port", type=int, default=12000)
-    parser.add_argument("--peakfinder_parameters", default=None, help="json file with peakfinder parameters")
+    parser.add_argument("--config_file", default=None, help="json file with configuration parameters")
     parser.add_argument("--skip_frames_rate", type=int, default=1, help="skip (approximately) skip_frames_rate %% of pulses")
 
     clargs = parser.parse_args()
@@ -33,14 +33,14 @@ def main():
         backend_addr,
         accumulator_addr,
         visualisation_addr,
-        clargs.peakfinder_parameters,
+        clargs.config_file,
         clargs.skip_frames_rate
     )
 
 
 
-def work(backend_addr, accumulator_addr, visualisation_addr, fn_peakfinder_parameters, skip_frames_rate):
-    bj_peakfinder_parameters = BufferedJSON(fn_peakfinder_parameters)
+def work(backend_addr, accumulator_addr, visualisation_addr, fn_config, skip_frames_rate):
+    config_file = BufferedJSON(fn_config)
 
     jfdata = JFData()
 
@@ -66,13 +66,13 @@ def work(backend_addr, accumulator_addr, visualisation_addr, fn_peakfinder_param
         pulse_id = metadata.get("pulse_id", 0)
 
         try:
-            peakfinder_parameters = bj_peakfinder_parameters.load()
+            config = config_file.load()
         except Exception as e:
             print(f"({pulse_id}) cannot read peakfinder parameters file: {e}", flush=True) #TODO: logging?
 
 
         results = metadata.copy()
-        results.update(peakfinder_parameters)
+        results.update(config)
 
         results["timestamp"] = make_bsread_timestamp(timestamp, pulse_id)
         results["number_of_spots"] = 0