refactor: resolve merge conflict
This commit is contained in:
@@ -13,9 +13,9 @@ def load_data() -> tuple:
|
||||
Returns
|
||||
"""
|
||||
proj_nr = 180
|
||||
basedir = f"/home/appel_c/Documents/test_data/projection_{proj_nr:06d}/"
|
||||
basedir = f"/Users/janwyzula/PSI/test_data_reduced/projection_{proj_nr:06d}/"
|
||||
|
||||
metadata_name = f"/home/appel_c/Documents/test_data/projection_{proj_nr:06d}.json"
|
||||
metadata_name = f"/Users/janwyzula/PSI/test_data_reduced/projection_{proj_nr:06d}.json"
|
||||
with open(metadata_name) as file:
|
||||
metadata = json.load(file)
|
||||
|
||||
@@ -77,6 +77,6 @@ if __name__ == "__main__":
|
||||
proj_nr = 180
|
||||
while True:
|
||||
send_data(data, q, norm_sum, bec_producer, metadata, proj_nr=proj_nr)
|
||||
time.sleep(50)
|
||||
time.sleep(30)
|
||||
bec_producer.delete(topic=f"px_stream/projection_{proj_nr}/data:val")
|
||||
# proj_nr = proj_nr + 1
|
||||
|
||||
Reference in New Issue
Block a user