pxiii-live-changes
main
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
this needs fixing per beamline
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
still has conflicts
@@ -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)
why is this different from the one in daq
8c20e899a6
5bab552403
df3ddc5c84
No dependencies set.
The note is not visible to the blocked user.
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.0011this needs fixing per beamline
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:<<<<<<< HEADstill has conflicts
@@ -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)why is this different from the one in daq
8c20e899a6to5bab5524035bab552403todf3ddc5c84