Commit Graph

255 Commits

Author SHA1 Message Date
augustin_s b32ef07cfd catch KeyboardInterrupt in the direct call case 2020-07-04 20:33:12 +02:00
augustin_s 78e36d1be6 try/finally in DAQTask.wait() to make sure task.filenames is also set after a ctrl-c 2020-07-04 20:28:28 +02:00
augustin_s 5f68de3eef commented scan num, step num and sub-folder logic 2020-07-04 20:24:42 +02:00
augustin_s 263d13f08b make TaskError a ChainedException 2020-07-04 16:18:52 +02:00
augustin_s 42a9b672e3 added ChainedExceptions, which print their cause as well 2020-07-04 16:17:34 +02:00
augustin_s 5a1b152679 allow scan to stop if the task caught the ctrl-c: re-raise KeyboardInterrupt in Task.wait(), catch and re-raise (instead of only printing it) KeyboardInterrupt in wait_for_all(tasks) 2020-07-04 13:47:26 +02:00
augustin_s cd0cfef0b1 moved progress bar update before break (in order to see the final update) 2020-07-04 12:54:57 +02:00
augustin_s c2c4fcfe87 Release v0.0.2 0.0.2 2020-07-03 18:37:06 +02:00
augustin_s 1976607254 adopt sf_daq name: renamed "NuDIAr" to "SF" 2020-07-03 18:09:45 +02:00
augustin_s a40f83dfe5 align pids also when stopped early 2020-07-03 11:22:43 +02:00
augustin_s 4c2ec2aa6e made it possible to stop task.wait() via ctrl-c 2020-07-03 11:20:55 +02:00
augustin_s fb2f2afe53 Added wait=bool argument to acquisitions (default: True). If a static acquire() is directly called, the task is waiting (/blocking) now. This allows to see the result or an exceptions without the need for calling wait() manually. For scans, acquire_all() sets wait=False such that tasks can still run in parallel. 2020-07-03 00:07:13 +02:00
augustin_s 65f8bfd4ed clamp the elapsed of the progress bar between 0 and total 2020-07-02 20:48:00 +02:00
augustin_s 5f72517aac prefix for name generator from "run" to "scan" 2020-07-02 20:26:03 +02:00
augustin_s 5d1b54c34a current_tasks defaults to empty list instead of None 2020-07-02 12:31:32 +02:00
augustin_s d4515028ef no data means no good data 2020-07-02 12:30:54 +02:00
augustin_s 06eb8bae7b allow to gracefully stop a scan via ctrl-c 2020-07-02 12:11:45 +02:00
augustin_s fec670734c wrapped client.start such that the pattern of created files is returned (in order to update DAQTask.filenames) 2020-07-02 10:43:27 +02:00
augustin_s 26860e221f DAQTask updates filenames list from result of target function at the end of wait() 2020-07-02 10:42:14 +02:00
augustin_s 2c0cddc54f commented output data folder creation (does not work for NuDIA) 2020-07-02 10:40:43 +02:00
augustin_s 7f7cdccc46 fixed oversight in set_config (cf. c583187b71) 2020-07-01 17:09:58 +02:00
augustin_s 506222bcb8 moved the calc. of the progress bar pos. into a separate class 2020-07-01 11:27:28 +02:00
augustin_s 6121c7f408 cleaned up prog. bar calc. a bit 2020-07-01 00:25:48 +02:00
augustin_s c583187b71 workaround for oversight in set_config 2020-06-30 23:47:39 +02:00
augustin_s e0ab620809 corrected calc. of progress bar for rate_multiplicator and wrong start at -1 2020-06-30 23:45:31 +02:00
augustin_s cdd085eabc added check on empty sequence to maxlen() 2020-06-30 21:10:40 +02:00
augustin_s 52e8ae0c57 collect filenames after waiting for all tasks (in nuDIA the run number is needed for the filenames but is only available after sending out the request, which is only possible after the stop pid is through 2020-06-28 18:53:35 +02:00
augustin_s d37c237095 re-factored BrokerClient 2020-06-28 15:33:22 +02:00
augustin_s 08f74f309d calculate start and stop pids that are correctly aligned to rep rate 2020-06-14 23:27:55 +02:00
augustin_s 090188f7c6 don't retrieve for empty filename or if filename is /dev/null; added a tqdm progress bar for the waiting; store the run number and print it in Acq. status 2020-06-08 22:16:56 +02:00
augustin_s 2220d9ac22 PIDs should probably be ints 2020-06-08 16:39:59 +02:00
augustin_s dea48732f7 added an Acquistion under the placeholder name: "New unnamed DIA replacement" (NuDIAr) 2020-06-08 15:44:07 +02:00
augustin_s 3aff2cfab4 added start/stop logic to BrokerClient prototype 2020-06-08 15:07:53 +02:00
augustin_s 1fec281360 added some tools for the broker DAQ 2020-06-08 14:19:20 +02:00
augustin_s ecb2c6ff22 added a BrokerClient prototype (see also https://github.com/paulscherrerinstitute/sf_databuffer_writer/blob/c8e0553ecb6f7ee207c18ba2b6e5f21ff6d6dfae/client/README.md) 2020-06-07 20:58:07 +02:00
augustin_s 742013703a slightly more verbose installation instructions 2020-06-07 20:13:22 +02:00
augustin_s 2b1153829b changed order of "create new conda env" and "install into current conda env" 2020-06-07 20:08:48 +02:00
augustin_s 98a7dfdeef added cam_server as dependency (Qt makes this a quite large dep.) 2020-06-07 20:04:06 +02:00
augustin_s 0aa1342937 updated readme with conda installation method 2020-06-05 17:54:17 +02:00
augustin_s 7218b45471 added imports to several __init__.py files 2020-06-05 15:53:34 +02:00
augustin_s 5e556443d3 added some comments to travis yml 2020-06-04 22:10:26 +02:00
augustin_s 217e476e6f replace sourcing conda.sh with export PATH 0.0.1 2020-06-04 19:45:28 +02:00
augustin_s 8a6a38360c remove miniconda.sh from Travis after installing it, added conda-verify 2020-06-04 19:35:19 +02:00
augustin_s ca8b92ab76 missed a dot 2020-06-04 19:09:56 +02:00
augustin_s 3469a38d58 added files for packaging: setuptools, travis, conda 2020-06-04 18:51:21 +02:00
augustin_s 4fc34270de fixed typo "epics" -> "pyepics" in package names. 2020-06-04 18:32:08 +02:00
augustin_s 9061fe782f headline formatting fixed 2020-06-02 23:36:14 +02:00
augustin_s a7357c3d3c added readme 2020-06-02 23:33:48 +02:00
augustin_s 4f180dd305 moved eco init to eco_components 2020-05-27 20:09:30 +02:00
augustin_s 307ba4d9c9 added a .gitignore 2020-05-27 20:09:18 +02:00