diff --git a/client/daq_client.py b/client/daq_client.py index 73ffc9d..f0f207b 100644 --- a/client/daq_client.py +++ b/client/daq_client.py @@ -157,20 +157,20 @@ def retrieve_data_from_buffer( response = r.json() if "status" in response: if response["status"] == "ok": - message = response.get("message", None) - run_number = response.get("run_number", None) + message = response.get("message") + run_number = response.get("run_number") if run_number is not None: run_number = int(run_number) run_number_print = f"{run_number:04}" else: run_number_print = None - acq_number = response.get("acquisition_number", None) - unq_acq_number = response.get("unique_acquisition_number", None) + acq_number = response.get("acquisition_number") + unq_acq_number = response.get("unique_acquisition_number") files_daq = response.get("files", []) print(f"success: {message=} {run_number=} {acq_number=} {unq_acq_number=}") print(f" these files to expect in raw/{pgroup}/run{run_number_print}/data/ directory : {files_daq}") else: - message = response.get("message", None) + message = response.get("message") print(f" Error, reason : {message=}") print(f" whole response : {response=}") else: diff --git a/sf_daq_broker/broker_manager.py b/sf_daq_broker/broker_manager.py index 35acb14..a698cc8 100644 --- a/sf_daq_broker/broker_manager.py +++ b/sf_daq_broker/broker_manager.py @@ -357,7 +357,7 @@ class BrokerManager: output_run_directory = f"run{run_number:04}" append_user_tag = request.get("append_user_tag_to_data_dir", False) - user_tag = request.get("user_tag", None) + user_tag = request.get("user_tag") if append_user_tag and user_tag is not None and len(user_tag) > 0: cleaned_user_tag = clean_user_tag(user_tag) diff --git a/sf_daq_broker/broker_manager_slow.py b/sf_daq_broker/broker_manager_slow.py index da2f95b..393bf7f 100644 --- a/sf_daq_broker/broker_manager_slow.py +++ b/sf_daq_broker/broker_manager_slow.py @@ -317,7 +317,7 @@ class DetectorManager: changed_parameters = {} for name, new_value in new_parameters.items(): - old_value = dap_config.get(name, None) + old_value = dap_config.get(name) if old_value == new_value: continue changed_parameters[name] = (old_value, new_value) diff --git a/sf_daq_broker/writer/convert_file.py b/sf_daq_broker/writer/convert_file.py index 4502d49..a1177d1 100644 --- a/sf_daq_broker/writer/convert_file.py +++ b/sf_daq_broker/writer/convert_file.py @@ -27,7 +27,7 @@ def convert_file(file_in, file_out, json_run_file, detector_config_file): compression = detector_params.get("compression", False) conversion = detector_params.get("adc_to_energy", False) disabled_modules = detector_params.get("disabled_modules", []) - downsample = detector_params.get("downsample", None) + downsample = detector_params.get("downsample") remove_raw_files = detector_params.get("remove_raw_files", False) if downsample is not None: @@ -39,7 +39,7 @@ def convert_file(file_in, file_out, json_run_file, detector_config_file): if conversion: double_pixels_action = detector_params.get("double_pixels_action", "mask") - factor = detector_params.get("factor", None) + factor = detector_params.get("factor") gap_pixels = detector_params.get("gap_pixels", True) geometry = detector_params.get("geometry", False) mask = detector_params.get("mask", True) @@ -52,7 +52,7 @@ def convert_file(file_in, file_out, json_run_file, detector_config_file): mask = False module_edge_pixels = "keep" - roi = detector_params.get("roi", None) + roi = detector_params.get("roi") save_ppicker_events_only = detector_params.get("save_ppicker_events_only", False) selected_pulse_ids = data.get("selected_pulse_ids", []) diff --git a/sf_daq_broker/writer/detector_writer.py b/sf_daq_broker/writer/detector_writer.py index 7d63a1a..f78a00b 100644 --- a/sf_daq_broker/writer/detector_writer.py +++ b/sf_daq_broker/writer/detector_writer.py @@ -51,9 +51,9 @@ def detector_retrieve(request, output_file_detector): # path_to_pgroup = request["path_to_pgroup"] # run_info_directory = request["run_info_directory"] - beamline = request.get("beamline", None) - pgroup = request.get("pgroup", None) - directory_name = request.get("directory_name", None) + beamline = request.get("beamline") + pgroup = request.get("pgroup") + directory_name = request.get("directory_name") selected_pulse_ids = request.get("selected_pulse_ids", []) detector_params = request["detectors"][detector_name] @@ -416,7 +416,7 @@ def copy_calibration_files(pedestal_file, pixel_mask_file, detector_config_file) det_config = json_load(detector_config_file) detector_name = det_config["detector_name"] - gain_file = det_config.get("gain_file", None) + gain_file = det_config.get("gain_file") if gain_file: os.makedirs(gain_directory, exist_ok=True) diff --git a/sf_daq_broker/writer/start.py b/sf_daq_broker/writer/start.py index 3910b44..0bfd4a8 100644 --- a/sf_daq_broker/writer/start.py +++ b/sf_daq_broker/writer/start.py @@ -95,7 +95,7 @@ def start_service(broker_url, writer_type=0): def on_broker_message(channel, method_frame, header_frame, body, connection, broker_client): try: request = json_str_to_obj(body.decode()) - output_file = request.get("output_file", None) + output_file = request.get("output_file") delivery_tag = method_frame.delivery_tag correlation_id = header_frame.correlation_id @@ -165,7 +165,7 @@ def update_status(channel, correlation_id, timestamp, body, action, fname, messa def process_request(request, broker_client): writer_type = request["writer_type"] - run_log_file = request.get("run_log_file", None) + run_log_file = request.get("run_log_file") run_log_level = request.get("run_log_level") or logging.INFO file_handler = None @@ -203,12 +203,12 @@ def process_request(request, broker_client): def process_request_internal(request, broker_client): writer_type = request["writer_type"] - channels = request.get("channels", None) + channels = request.get("channels") start_pulse_id = request.get("start_pulse_id", 0) stop_pulse_id = request.get("stop_pulse_id", 100) - output_file = request.get("output_file", None) - metadata = request.get("metadata", None) - request_timestamp = request.get("timestamp", None) + output_file = request.get("output_file") + metadata = request.get("metadata") + request_timestamp = request.get("timestamp") _logger.info(f"request for writer type {writer_type}: output file {output_file} from pulse ID {start_pulse_id} to {stop_pulse_id}") @@ -240,8 +240,8 @@ def process_request_internal(request, broker_client): elif writer_type == broker_config.TAG_DETECTOR_POWER_ON: _logger.info("powering on detector") - detector_name = request.get("detector_name", None) - beamline = request.get("beamline", None) + detector_name = request.get("detector_name") + beamline = request.get("beamline") power_on_detector(detector_name, beamline) elif writer_type == broker_config.TAG_DETECTOR_RETRIEVE: @@ -279,7 +279,7 @@ def wait_for_delay(request_timestamp, writer_type): def audit_failed_write_request(write_request): - original_output_file = write_request.get("output_file", None) + original_output_file = write_request.get("output_file") if not original_output_file: return @@ -298,7 +298,7 @@ def audit_failed_write_request(write_request): #TODO: this should probably be in detector_writer.py def detector_pedestal_retrieve(broker_client, request): - output_file_prefix = request.get("output_file_prefix", None) + output_file_prefix = request.get("output_file_prefix") if output_file_prefix is None: msg = "cannot take pedestal due to missing output_file_prefix" _logger.error(msg) @@ -310,7 +310,7 @@ def detector_pedestal_retrieve(broker_client, request): det_start_pulse_id, det_stop_pulse_id = take_pedestal(detectors, rate=rate_multiplicator, pedestalmode=pedestalmode) # overwrite start/stop pulse IDs in run_info json file - run_file_json = request.get("run_file_json", None) + run_file_json = request.get("run_file_json") if run_file_json is not None: run_info = json_load(run_file_json) @@ -324,9 +324,9 @@ def detector_pedestal_retrieve(broker_client, request): "det_start_pulse_id": det_start_pulse_id, "det_stop_pulse_id": det_stop_pulse_id, "rate_multiplicator": request.get("rate_multiplicator", 1), - "run_file_json": request.get("run_file_json", None), - "path_to_pgroup": request.get("path_to_pgroup", None), - "run_info_directory": request.get("run_info_directory", None), + "run_file_json": request.get("run_file_json"), + "path_to_pgroup": request.get("path_to_pgroup"), + "run_info_directory": request.get("run_info_directory"), "directory_name": request.get("directory_name"), "request_time": request.get("request_time", str(datetime.now())) } diff --git a/tools/broker_sim.py b/tools/broker_sim.py index 25410b1..1d765ba 100644 --- a/tools/broker_sim.py +++ b/tools/broker_sim.py @@ -32,12 +32,12 @@ INSTRUMENTS = ( def process_request_internal(request, broker_client): writer_type = request["writer_type"] -# channels = request.get("channels", None) +# channels = request.get("channels") # start_pulse_id = request.get("start_pulse_id", 0) # stop_pulse_id = request.get("stop_pulse_id", 100) -# output_file = request.get("output_file", None) -# metadata = request.get("metadata", None) - request_timestamp = request.get("timestamp", None) +# output_file = request.get("output_file") +# metadata = request.get("metadata") + request_timestamp = request.get("timestamp") # _logger.info(f"request for writer type {writer_type}: output file {output_file} from pulse ID {start_pulse_id} to {stop_pulse_id}") _logger.info(f"request for writer type {writer_type}")