Live changes from early July, PX-III #111

Merged
perl_d merged 1 commits from pxiii-live-changes into main 2026-07-27 10:33:43 +02:00
Owner

transferred by hand into the repo as of July 2, rebased on master

transferred by hand into the repo as of July 2, rebased on master
@@ -1447,6 +1396,10 @@ class AareDAQ:
Returns:
CompletedRotationScan result or None if failed
"""
min_exp_time = 0.0011
Author
Owner

this needs fixing per beamline

this needs fixing per beamline
Author
Owner

leaving for feature with beamline specific dispatch

leaving for feature with beamline specific dispatch
@@ -1579,6 +1579,7 @@ class DAQWorker(QObject):
@Slot()
def load_local_contact_config(self):
if self.__base_url is None:
<<<<<<< HEAD
Author
Owner

still has conflicts

still has conflicts
perl_d marked this conversation as resolved
@@ -89,3 +88,1 @@
name = name.replace("{puck}", self.__puck_name)
name = name.replace("{pos}", f"{self.__puck_pos:02d}")
name = name.replace("{sample_id}", f"{self.__sample_id}")
name = name.replace('{date}', self.__formatted_date)
Author
Owner

why is this different from the one in daq

why is this different from the one in daq
perl_d changed target branch from master to main 2026-07-27 09:53:40 +02:00
perl_d force-pushed pxiii-live-changes from 8c20e899a6 to 5bab552403 2026-07-27 09:58:40 +02:00 Compare
perl_d added 1 commit 2026-07-27 10:33:30 +02:00
Live changes from early July, PX-III
Build and Publish / test (pull_request_target) Successful in 2m59s
Build and Publish / build (pull_request_target) Successful in 19s
Build and Publish / Build and Deploy Docs (pull_request_target) Successful in 35s
df3ddc5c84
perl_d force-pushed pxiii-live-changes from 5bab552403 to df3ddc5c84 2026-07-27 10:33:30 +02:00 Compare
perl_d merged commit df3ddc5c84 into main 2026-07-27 10:33:43 +02:00
Sign in to join this conversation.