wip test
This commit is contained in:
@@ -256,8 +256,9 @@ class FalconSuperXASDirect(PSIDeviceBase, FalconControlDirect):
|
||||
|
||||
This method blocks until the acquiring status is DONE.
|
||||
"""
|
||||
CompareStatus(self.acquiring, FalconAcquiringStatus.DONE).wait(self._pv_timeout)
|
||||
logger.info(f"Sending data for {self.name} at {time.time()}")
|
||||
time_started = time.time()
|
||||
# CompareStatus(self.acquiring, FalconAcquiringStatus.DONE).wait(self._pv_timeout)
|
||||
logger.info(f"Sending data for {self.name} at {time_started}")
|
||||
self.icr.put(
|
||||
{self.icr.name: {"value": self.dxp1.input_count_rate.get(), "timestamp": time.time()}}
|
||||
)
|
||||
@@ -288,4 +289,4 @@ class FalconSuperXASDirect(PSIDeviceBase, FalconControlDirect):
|
||||
}
|
||||
}
|
||||
)
|
||||
logger.info(f"Data sent for {self.name} at {time.time()}")
|
||||
logger.info(f"Data sent for {self.name} at {time.time()- time_started}")
|
||||
|
||||
@@ -124,6 +124,7 @@ class Trigger(PSIDeviceBase, TriggerControl):
|
||||
if falcon is not None:
|
||||
falcon: FalconSuperXASDirect
|
||||
falcon.erase_start.put(1)
|
||||
time.sleep(0.4) # Wait for erase to complete
|
||||
logger.info(
|
||||
f"Erase and start acquiring for {falcon.name} at {time.time() - time_started}"
|
||||
)
|
||||
@@ -139,14 +140,14 @@ class Trigger(PSIDeviceBase, TriggerControl):
|
||||
logger.info(f"Sampling done for {self.name} at {time.time() - time_started}")
|
||||
time.sleep(0.4)
|
||||
if falcon is not None:
|
||||
falcon.stop_all.put(1)
|
||||
# falcon.stop_all.put(1)
|
||||
logger.info(
|
||||
f"Waiting for Falcon to be ready after sampling at {time.time() - time_started}"
|
||||
)
|
||||
# Wait for the Falcon to be done with acquiring data
|
||||
CompareStatus(falcon.acquiring, FalconAcquiringStatus.DONE).wait(
|
||||
timeout=self._falcon_ready_timeout
|
||||
)
|
||||
# CompareStatus(falcon.acquiring, FalconAcquiringStatus.DONE).wait(
|
||||
# timeout=self._falcon_ready_timeout
|
||||
# )
|
||||
falcon.send_data()
|
||||
return status_smpl
|
||||
|
||||
|
||||
Reference in New Issue
Block a user