- Aug 02, 2024
-
-
- May 13, 2024
-
-
- Dec 21, 2023
-
-
David Hammer authored
-
- Nov 08, 2023
-
-
David Hammer authored
commit c7e948a9 Author: David Hammer <dhammer@mailbox.org> Date: Wed Sep 13 14:59:07 2023 +0200 Overhaul context warning lamps, add to arbiter kernel commit 08353704 Author: David Hammer <dhammer@mailbox.org> Date: Tue Sep 12 09:56:11 2023 +0200 Arbiter kernels call super().__init__ commit d113cd10 Merge: 8e1508ca fbe20f97 Author: David Hammer <dhammer@mailbox.org> Date: Tue Sep 12 09:54:34 2023 +0200 Merge branch 'master' into train-picker-device commit 8e1508ca Merge: 45cb6810 fe4589be Author: David Hammer <david.hammer@xfel.eu> Date: Thu Sep 7 11:23:34 2023 +0200 Merge branch 'feed-parameter-optimizer' into 'train-picker-device' Interface CrystFEL with Karabo and allow automatic parameter tunning with rcrystfel See merge request !59 commit 45cb6810 Author: David Hammer <dhammer@mailbox.org> Date: Wed Sep 6 13:36:15 2023 +0200 PickyBoi goes to another repository commit fe4589be Author: David Hammer <dhammer@mailbox.org> Date: Wed Sep 6 11:02:34 2023 +0200 Move PickyBoi to own repository commit 4ed8c643 Author: David Hammer <dhammer@mailbox.org> Date: Wed Sep 6 10:56:44 2023 +0200 Move CrystfelRunner to crystfel-integration commit 2e29b821 Author: Danilo Ferreira de Lima <danilo.enoque.ferreira.de.lima@xfel.de> Date: Tue Sep 5 17:22:36 2023 +0200 Using get instead of unsafe_get commit 4db44ada Merge: 91232763 e3d4a37f Author: Danilo Ferreira de Lima <danilo.enoque.ferreira.de.lima@xfel.de> Date: Tue Sep 5 17:16:03 2023 +0200 Merged. commit 91232763 Author: Danilo Ferreira de Lima <danilo.enoque.ferreira.de.lima@xfel.de> Date: Tue Sep 5 17:12:46 2023 +0200 Filter data by source in PickyBoi. commit e3d4a37f Author: David Hammer <dhammer@mailbox.org> Date: Tue Sep 5 17:04:29 2023 +0200 PickyBoi: add source filter, format commit 1bc121cf Author: Danilo Ferreira de Lima <danilo.enoque.ferreira.de.lima@xfel.de> Date: Tue Sep 5 16:40:30 2023 +0200 Removed the CrystfelORchestrator: rcrystfel is interacting with all devices directly. commit f6a7655e Author: Danilo Ferreira de Lima <danilo.enoque.ferreira.de.lima@xfel.de> Date: Tue Sep 5 16:16:20 2023 +0200 Re-create the ZMQ server to be sure everything has been processed. commit d371317d Author: Danilo Ferreira de Lima <danilo.enoque.ferreira.de.lima@xfel.de> Date: Tue Sep 5 15:09:38 2023 +0200 Be less verbose. commit e06ba684 Author: Danilo Ferreira de Lima <danilo.enoque.ferreira.de.lima@xfel.de> Date: Tue Sep 5 14:16:06 2023 +0200 Avoid setting NDARRAY properties: they cannot be serialized in JSON. commit 0e8aee4c Author: Danilo Ferreira de Lima <danilo.enoque.ferreira.de.lima@xfel.de> Date: Tue Sep 5 13:33:30 2023 +0200 Make breakStreamAfterEnd reconfigurable. commit 7920c582 Author: Danilo Ferreira de Lima <danilo.enoque.ferreira.de.lima@xfel.de> Date: Tue Sep 5 13:19:44 2023 +0200 Send end of stream signal when all trains were caught too. commit 93e276c3 Author: Danilo Ferreira de Lima <danilo.enoque.ferreira.de.lima@xfel.de> Date: Tue Sep 5 13:19:24 2023 +0200 Clean up before shut down and don't start streaming by default. commit 36bcf881 Author: Danilo Ferreira de Lima <danilo.enoque.ferreira.de.lima@xfel.de> Date: Tue Sep 5 11:40:07 2023 +0200 Use USR1 to end CrystFEL instead. commit 72c7a883 Author: Danilo Ferreira de Lima <danilo.enoque.ferreira.de.lima@xfel.de> Date: Tue Sep 5 11:23:50 2023 +0200 Fixed defunct CrystFEL process, by requesting its status code. Added debug messages. Keeping the ZMQ stream open, as it is unnecessary to close it. commit 1f8de2b6 Author: Danilo Ferreira de Lima <danilo.enoque.ferreira.de.lima@xfel.de> Date: Mon Sep 4 18:55:40 2023 +0200 Removed debug message. commit 282b7546 Author: Danilo Ferreira de Lima <danilo.enoque.ferreira.de.lima@xfel.de> Date: Mon Sep 4 18:55:15 2023 +0200 Releasing all resources almost cleanly. commit d49a4f0c Author: Danilo Ferreira de Lima <danilo.enoque.ferreira.de.lima@xfel.de> Date: Mon Sep 4 13:23:40 2023 +0200 Fixed logic for breaking the stream. commit 60350c66 Author: Danilo Ferreira de Lima <danilo.enoque.ferreira.de.lima@xfel.de> Date: Mon Sep 4 11:16:42 2023 +0200 Set state after ending the stream. commit b5856348 Author: Danilo Ferreira de Lima <danilo.enoque.ferreira.de.lima@xfel.de> Date: Mon Sep 4 10:56:14 2023 +0200 Signal end of stream. commit 4569f9bd Author: David Hammer <dhammer@mailbox.org> Date: Thu Aug 31 15:00:01 2023 +0200 Get rid of dataFormat, use shape of data or look at geometry commit 4adafc84 Author: David Hammer <dhammer@mailbox.org> Date: Thu Aug 31 14:58:27 2023 +0200 Improve temporary file handling commit 9a6c6000 Author: David Hammer <dhammer@mailbox.org> Date: Thu Aug 31 11:16:36 2023 +0200 Add buildGeometry slot to CrystfelRunner commit e83011e1 Author: David Hammer <dhammer@mailbox.org> Date: Thu Aug 31 10:24:02 2023 +0200 Only update output channel once per input commit b0b5aad7 Author: Danilo Ferreira de Lima <danilo.enoque.ferreira.de.lima@xfel.de> Date: Wed Aug 30 17:42:20 2023 +0200 Remove tail_proc, as we read the file directly. commit e516c9d2 Author: Danilo Ferreira de Lima <danilo.enoque.ferreira.de.lima@xfel.de> Date: Wed Aug 30 17:38:48 2023 +0200 Allow reconfiguration of CrystFEL parameters without shutting down the device. commit df0f4116 Merge: 89adb332 cbb4a7cf Author: Danilo Ferreira de Lima <danilo.enoque.ferreira.de.lima@xfel.de> Date: Wed Aug 30 17:17:05 2023 +0200 Merge branch 'feed-parameter-optimizer' of ssh://git.xfel.eu:10022/calibration/calng into feed-parameter-optimizer commit 89adb332 Author: Danilo Ferreira de Lima <danilo.enoque.ferreira.de.lima@xfel.de> Date: Wed Aug 30 17:16:40 2023 +0200 Prevent bugfix from messing -j option. commit cbb4a7cf Merge: 1c8f21cb d6cef850 Author: David Hammer <dhammer@mailbox.org> Date: Wed Aug 30 17:10:57 2023 +0200 Merge branch 'feed-parameter-optimizer' of ssh://git.xfel.eu:10022/calibration/calng into feed-parameter-optimizer commit 1c8f21cb Author: David Hammer <dhammer@mailbox.org> Date: Wed Aug 30 17:10:50 2023 +0200 Allow TrainRatioTracker to see the same train again commit d6cef850 Merge: 40c598cf 85ee451d Author: Danilo Ferreira de Lima <danilo.enoque.ferreira.de.lima@xfel.de> Date: Wed Aug 30 17:00:14 2023 +0200 Merge branch 'feed-parameter-optimizer' of ssh://git.xfel.eu:10022/calibration/calng into feed-parameter-optimizer commit 40c598cf Author: Danilo Ferreira de Lima <danilo.enoque.ferreira.de.lima@xfel.de> Date: Wed Aug 30 17:00:09 2023 +0200 Bug fix reading data path: we have to avoid reading spaces and the comment character. commit 85ee451d Author: David Hammer <dhammer@mailbox.org> Date: Wed Aug 30 16:17:13 2023 +0200 Allow PickyBoi to handle multiple data per input commit cf627845 Author: Danilo Ferreira de Lima <danilo.enoque.ferreira.de.lima@xfel.de> Date: Wed Aug 30 15:59:05 2023 +0200 Many bug fixes. commit 8356ad4b Author: Danilo Ferreira de Lima <danilo.enoque.ferreira.de.lima@xfel.de> Date: Wed Aug 30 12:33:53 2023 +0200 Fixed initial NDARRAY setting for cell. commit e35f9a02 Author: Danilo Ferreira de Lima <danilo.enoque.ferreira.de.lima@xfel.de> Date: Wed Aug 30 12:18:10 2023 +0200 ADapted initial value of the detCentre. commit 4f8bce30 Author: Danilo Ferreira de Lima <danilo.enoque.ferreira.de.lima@xfel.de> Date: Wed Aug 30 11:31:28 2023 +0200 Merged output parser. commit 42a7ce6e Author: Danilo Ferreira de Lima <danilo.enoque.ferreira.de.lima@xfel.de> Date: Tue Aug 29 17:12:40 2023 +0200 Added detailed stats output. commit ccae52c5 Author: Danilo Ferreira de Lima <danilo.enoque.ferreira.de.lima@xfel.de> Date: Tue Aug 29 15:35:23 2023 +0200 Removed unitcellPath commit 91138012 Author: Danilo Ferreira de Lima <danilo.enoque.ferreira.de.lima@xfel.de> Date: Tue Aug 29 15:28:34 2023 +0200 Keep only a misc set of parameters and leave indexing and peakfinding to be sent in misc. commit 17c5bded Author: David Hammer <dhammer@mailbox.org> Date: Thu Aug 24 14:29:39 2023 +0200 Start work on CrystfelOrchestrator When behind a WebProxy, this will serve as a single endpoint for a REST API to control the whole CrystFEL setup. commit dc74d5b0 Author: David Hammer <dhammer@mailbox.org> Date: Thu Aug 24 11:08:56 2023 +0200 Removing unuseful test device Testing of the bridge part of the code is much more convenient to (copy-paste into and) run in a notebook; just use a kernel based on the Karabo environment. commit 6b29320f Author: David Hammer <dhammer@mailbox.org> Date: Wed Aug 23 13:37:53 2023 +0200 Fix queue length counting, change name commit 6d26c1e3 Author: David Hammer <dhammer@mailbox.org> Date: Wed Aug 23 13:37:42 2023 +0200 Enable sending image data commit 727d7fd8 Author: David Hammer <dhammer@mailbox.org> Date: Tue Aug 22 22:12:42 2023 +0200 Fix merge errors commit 26d2fee5 Merge: 3f1afea9 02aebda9 Author: David Hammer <dhammer@mailbox.org> Date: Fri Aug 11 18:09:12 2023 +0200 Merge branch 'train-picker-device' into feed-parameter-optimizer commit 3f1afea9 Merge: 619a3d5c 1405aadc Author: David Hammer <dhammer@mailbox.org> Date: Fri Aug 11 18:08:56 2023 +0200 Merge branch 'master' into crystfel-adapter commit 619a3d5c Author: David Hammer <dhammer@mailbox.org> Date: Fri Aug 11 17:53:42 2023 +0200 Fix states, slots, add crystfelStats commit 61f206e1 Author: David Hammer <dhammer@mailbox.org> Date: Fri Aug 11 17:29:16 2023 +0200 Add slots to start, stop CrystFEL and reset queue commit 02aebda9 Author: David Hammer <dhammer@mailbox.org> Date: Wed Aug 2 13:08:15 2023 +0200 Allow selecting one train from range and adding offset to PPU commit 693698c2 Author: David Hammer <dhammer@mailbox.org> Date: Wed Aug 2 12:48:04 2023 +0200 Add error handling when getting initial PPU configuration commit ba108b3c Author: David Hammer <dhammer@mailbox.org> Date: Tue Aug 1 12:48:17 2023 +0200 Revert arbiter use of device client, work with existing matching commit a408d2a8 Author: David Hammer <dhammer@mailbox.org> Date: Mon Jul 31 19:23:58 2023 +0200 PickyBoi: track incoming trains commit 6e799fc7 Author: David Hammer <dhammer@mailbox.org> Date: Mon Jul 31 19:22:48 2023 +0200 PickyBoi: enable following PPU device commit 9c861a3a Author: David Hammer <dhammer@mailbox.org> Date: Wed Jul 26 18:28:44 2023 +0200 Sketch PPU frame selection arbiter kernel commit 9d7454bb Author: David Hammer <dhammer@mailbox.org> Date: Wed Jul 26 18:28:29 2023 +0200 Pass device to arbiter kernels for DeviceClient commit 223ebb7a Merge: 5e4b34aa 26b97f12 Author: David Hammer <dhammer@mailbox.org> Date: Wed Jul 26 17:56:19 2023 +0200 Merge branch 'train-picker-device' of ssh://git.xfel.eu:10022/calibration/calng into train-picker-device commit 5e4b34aa Author: David Hammer <dhammer@mailbox.org> Date: Wed Jul 26 14:57:31 2023 +0200 Minor fixes commit 45556239 Author: David Hammer <dhammer@mailbox.org> Date: Mon Jul 24 17:07:20 2023 +0200 Allow multiple consecutive trains commit 025899b3 Author: David Hammer <dhammer@mailbox.org> Date: Fri Jul 21 19:20:35 2023 +0200 Start sketching changes based on dev meeting commit 7a2231e7 Author: David Hammer <dhammer@mailbox.org> Date: Fri Jul 7 11:18:59 2023 +0200 Add prototype train ID picking device commit 26b97f12 Author: David Hammer <dhammer@mailbox.org> Date: Wed Jul 26 14:57:31 2023 +0200 Minor fixes commit 2bb185c0 Author: David Hammer <dhammer@mailbox.org> Date: Mon Jul 24 17:07:20 2023 +0200 Allow multiple consecutive trains commit ca4f12eb Author: David Hammer <dhammer@mailbox.org> Date: Fri Jul 21 19:20:35 2023 +0200 Start sketching changes based on dev meeting commit a8b13319 Author: David Hammer <dhammer@mailbox.org> Date: Fri Jul 7 11:18:59 2023 +0200 Add prototype train ID picking device commit 97d359d9 Author: David Hammer <dhammer@mailbox.org> Date: Thu Jun 15 16:54:31 2023 +0200 Almost there commit c8e9e133 Author: David Hammer <dhammer@mailbox.org> Date: Wed Jun 14 23:23:58 2023 +0200 Read some things from geometry, filter tail output commit c8c314b7 Author: David Hammer <dhammer@mailbox.org> Date: Wed Jun 14 18:09:55 2023 +0200 WIP closer to running nicely commit 0399c429 Author: David Hammer <dhammer@mailbox.org> Date: Fri Jun 9 16:55:40 2023 +0200 Start working towards streaming to CrystFEL commit 60024124 Author: David Hammer <dhammer@mailbox.org> Date: Fri Apr 14 12:52:20 2023 +0200 Add generic arbiter kernels: reduce-threshold and boolean commit dc2e5e5f Author: David Hammer <dhammer@mailbox.org> Date: Fri Mar 31 12:54:59 2023 +0200 Add post-reshape hook, a few docstrings commit ab9ebc69 Author: David Hammer <dhammer@mailbox.org> Date: Fri Mar 31 09:48:47 2023 +0200 Moving frame selection arbiter kernels to entry point structure commit 57ce4b61 Author: David Hammer <dhammer@mailbox.org> Date: Tue Mar 21 15:34:10 2023 +0100 Hotfix from SPB: always nd.array the mask (can be VECTOR_BOOL) commit c15bbc65 Author: David Hammer <dhammer@mailbox.org> Date: Mon Mar 20 19:26:22 2023 +0100 Add rough peakfinder9 implementation commit 8e51b499 Author: David Hammer <dhammer@mailbox.org> Date: Mon Mar 20 19:25:44 2023 +0100 Fix usage of _enabled_addons, allow time for init commit 8ebc1ff8 Author: David Hammer <dhammer@mailbox.org> Date: Mon Mar 20 19:25:25 2023 +0100 Move grid computation to utils commit 4b550e35 Author: David Hammer <dhammer@mailbox.org> Date: Mon Mar 20 15:42:22 2023 +0100 Fix pep8 warnings for setup.py commit 9d04d20e Author: David Hammer <dhammer@mailbox.org> Date: Fri Mar 17 15:23:06 2023 +0100 (Ab)use entry point extras to specify detectors TODO: add boilerplate to remaining detectors. For now, AGIPD will have both IntetgratedIntensityAddon and RandomFramesAddon whereas DSSC only has RandomFramesAddon. commit e0a8c905 Author: David Hammer <dhammer@mailbox.org> Date: Fri Mar 17 13:51:28 2023 +0100 Provide correction device plugins as entry points commit a2f7534f Author: David Hammer <dhammer@mailbox.org> Date: Fri Mar 17 11:50:46 2023 +0100 Fix device schema injection, add reconfigure hook, add random plugin commit 90a1270f Merge: 14f0b611 ff952c76 Author: David Hammer <dhammer@mailbox.org> Date: Fri Mar 17 09:34:03 2023 +0100 Merge branch 'frame-selection' of ssh://git.xfel.eu:10022/calibration/calng into frame-selection commit 14f0b611 Author: David Hammer <dhammer@mailbox.org> Date: Fri Feb 17 14:59:12 2023 +0100 Make sure the mask is boolean commit 7911e10a Author: David Hammer <dhammer@mailbox.org> Date: Tue Feb 14 15:23:52 2023 +0100 Prototype configurable frame selection arbiter commit 4f78506f Author: David Hammer <dhammer@mailbox.org> Date: Mon Feb 13 19:42:00 2023 +0100 Add sketch of correction device addon structure commit ff952c76 Author: David Hammer <dhammer@mailbox.org> Date: Fri Feb 17 14:59:12 2023 +0100 Make sure the mask is boolean commit c3d2d437 Author: David Hammer <dhammer@mailbox.org> Date: Tue Feb 14 15:23:52 2023 +0100 Prototype configurable frame selection arbiter commit ba6eaa9f Author: David Hammer <dhammer@mailbox.org> Date: Mon Feb 13 19:42:00 2023 +0100 Add sketch of correction device addon structure
-
- Sep 06, 2023
-
-
David Hammer authored
-
- Jul 10, 2023
-
-
David Hammer authored
commit 1a17a737 Author: David Hammer <dhammer@mailbox.org> Date: Wed Jun 28 14:27:53 2023 +0200 Describe arbiter kernel API commit 44abfdb9 Author: David Hammer <dhammer@mailbox.org> Date: Tue Jun 27 14:16:57 2023 +0200 Reorder correct / preview / reshape commit cb902408 Author: David Hammer <dhammer@mailbox.org> Date: Tue Jun 27 11:13:06 2023 +0200 Start documenting correction addons commit 81d95bfb Author: David Hammer <dhammer@mailbox.org> Date: Tue Jun 27 10:36:18 2023 +0200 Move preview generation before addons to avoid interference commit 60024124 Author: David Hammer <dhammer@mailbox.org> Date: Fri Apr 14 12:52:20 2023 +0200 Add generic arbiter kernels: reduce-threshold and boolean commit dc2e5e5f Author: David Hammer <dhammer@mailbox.org> Date: Fri Mar 31 12:54:59 2023 +0200 Add post-reshape hook, a few docstrings commit ab9ebc69 Author: David Hammer <dhammer@mailbox.org> Date: Fri Mar 31 09:48:47 2023 +0200 Moving frame selection arbiter kernels to entry point structure commit 57ce4b61 Author: David Hammer <dhammer@mailbox.org> Date: Tue Mar 21 15:34:10 2023 +0100 Hotfix from SPB: always nd.array the mask (can be VECTOR_BOOL) commit c15bbc65 Author: David Hammer <dhammer@mailbox.org> Date: Mon Mar 20 19:26:22 2023 +0100 Add rough peakfinder9 implementation commit 8e51b499 Author: David Hammer <dhammer@mailbox.org> Date: Mon Mar 20 19:25:44 2023 +0100 Fix usage of _enabled_addons, allow time for init commit 8ebc1ff8 Author: David Hammer <dhammer@mailbox.org> Date: Mon Mar 20 19:25:25 2023 +0100 Move grid computation to utils commit 4b550e35 Author: David Hammer <dhammer@mailbox.org> Date: Mon Mar 20 15:42:22 2023 +0100 Fix pep8 warnings for setup.py commit 9d04d20e Author: David Hammer <dhammer@mailbox.org> Date: Fri Mar 17 15:23:06 2023 +0100 (Ab)use entry point extras to specify detectors TODO: add boilerplate to remaining detectors. For now, AGIPD will have both IntetgratedIntensityAddon and RandomFramesAddon whereas DSSC only has RandomFramesAddon. commit e0a8c905 Author: David Hammer <dhammer@mailbox.org> Date: Fri Mar 17 13:51:28 2023 +0100 Provide correction device plugins as entry points commit a2f7534f Author: David Hammer <dhammer@mailbox.org> Date: Fri Mar 17 11:50:46 2023 +0100 Fix device schema injection, add reconfigure hook, add random plugin commit 90a1270f Merge: 14f0b611 ff952c76 Author: David Hammer <dhammer@mailbox.org> Date: Fri Mar 17 09:34:03 2023 +0100 Merge branch 'frame-selection' of ssh://git.xfel.eu:10022/calibration/calng into frame-selection commit 14f0b611 Author: David Hammer <dhammer@mailbox.org> Date: Fri Feb 17 14:59:12 2023 +0100 Make sure the mask is boolean commit 7911e10a Author: David Hammer <dhammer@mailbox.org> Date: Tue Feb 14 15:23:52 2023 +0100 Prototype configurable frame selection arbiter commit 4f78506f Author: David Hammer <dhammer@mailbox.org> Date: Mon Feb 13 19:42:00 2023 +0100 Add sketch of correction device addon structure commit ff952c76 Author: David Hammer <dhammer@mailbox.org> Date: Fri Feb 17 14:59:12 2023 +0100 Make sure the mask is boolean commit c3d2d437 Author: David Hammer <dhammer@mailbox.org> Date: Tue Feb 14 15:23:52 2023 +0100 Prototype configurable frame selection arbiter commit ba6eaa9f Author: David Hammer <dhammer@mailbox.org> Date: Mon Feb 13 19:42:00 2023 +0100 Add sketch of correction device addon structure
-
- Jun 30, 2023
-
-
David Hammer authored
commit aaa8a45d Merge: 8033df8a c838797b Author: David Hammer <david.hammer@xfel.eu> Date: Fri Jun 30 09:24:26 2023 +0000 Merge branch 'master' into 'pnccd-support' # Conflicts: # setup.py # src/calng/base_geometry.py # src/calng/geometries/__init__.py commit 8033df8a Author: David Hammer <dhammer@mailbox.org> Date: Fri Jun 30 11:19:06 2023 +0200 Fix scene layout commit cb2951a8 Author: David Hammer <dhammer@mailbox.org> Date: Fri Jun 30 11:13:32 2023 +0200 Prefer pass over ellipsis for empty body commit 4eb78216 Author: David Hammer <dhammer@mailbox.org> Date: Tue Jun 27 15:59:21 2023 +0200 Use faster common mode (row / col) for ePix100, too commit df7593ed Author: David Hammer <dhammer@mailbox.org> Date: Tue Jun 27 15:39:40 2023 +0200 Tweak custom common mode implementation, add test commit fcc6a089 Author: David Hammer <dhammer@mailbox.org> Date: Tue Jun 27 14:07:14 2023 +0200 Fix correct/reshape/correct for ePix100, too commit a35ea817 Author: David Hammer <dhammer@mailbox.org> Date: Tue Jun 27 14:04:13 2023 +0200 Fix order of correct, reshape, correct commit bb89405a Author: David Hammer <dhammer@mailbox.org> Date: Tue Jun 27 10:28:41 2023 +0200 Don't always claim to load to GPU commit 156a0793 Author: David Hammer <dhammer@mailbox.org> Date: Mon Jun 26 18:13:03 2023 +0200 Fix miscellaneous issues, properly add geometry commit b773af39 Author: David Hammer <dhammer@mailbox.org> Date: Mon Jun 26 13:47:05 2023 +0200 Add pnCCD geometry class, use Configurable.get_root instead of ad-hoc implementation commit e6c03993 Author: David Hammer <dhammer@mailbox.org> Date: Mon Jun 26 13:46:39 2023 +0200 Fix typo in UINT64_ELEMENT commit 1b408d30 Author: David Hammer <dhammer@mailbox.org> Date: Thu Jun 1 14:43:49 2023 +0200 By default, don't ignore bias voltage commit bdecca45 Author: David Hammer <dhammer@mailbox.org> Date: Fri May 26 17:52:41 2023 +0200 Fix output schema commit b405d5a1 Author: David Hammer <dhammer@mailbox.org> Date: Fri May 26 17:28:32 2023 +0200 Call it ignoreBiasVoltage instead commit 5c45ef92 Author: David Hammer <dhammer@mailbox.org> Date: Fri May 26 15:04:07 2023 +0200 Add faster Cython common mode commit c7c62e2b Author: sqsonc <sqsonc@exflong22.desy.de> Date: Tue May 23 10:43:48 2023 +0200 Put output data in proper hash keys commit 0779b7e5 Author: David Hammer <dhammer@mailbox.org> Date: Fri May 12 14:09:46 2023 +0200 Removing block mode CM for now commit f322ae74 Author: David Hammer <dhammer@mailbox.org> Date: Fri May 12 12:51:45 2023 +0200 Add WIP pnCCD correction device
-
David Hammer authored
-
- Jun 20, 2023
-
-
David Hammer authored
-
- Mar 02, 2023
-
-
David Hammer authored
-
- Feb 07, 2023
-
-
David Hammer authored
-
- Jan 20, 2023
-
-
David Hammer authored
commit dff15c32 Author: David Hammer <dhammer@mailbox.org> Date: Wed Jan 11 14:18:08 2023 +0100 Update tests to cover both, fix CPU kernel bugs discovered commit 5312715f Author: David Hammer <dhammer@mailbox.org> Date: Fri Jan 6 13:24:26 2023 +0100 Remove unnecessary TODOs commit 5789ed83 Author: David Hammer <dhammer@mailbox.org> Date: Fri Jan 6 13:18:13 2023 +0100 Use extra init functions to avoid passing along big __init__ params commit 39f19061 Author: David Hammer <dhammer@mailbox.org> Date: Fri Jan 6 10:07:30 2023 +0100 Fix old tests commit ce294243 Author: David Hammer <dhammer@mailbox.org> Date: Thu Jan 5 16:13:45 2023 +0100 Fix up GH2 correction commit 655562fd Author: David Hammer <dhammer@mailbox.org> Date: Thu Jan 5 16:01:07 2023 +0100 Restructure base kernel runner commit 36b77317 Author: David Hammer <dhammer@mailbox.org> Date: Thu Dec 22 16:48:15 2022 +0100 Start writing basic CPU kernels for fall-back
-
- Jan 19, 2023
-
-
David Hammer authored
-
- Oct 20, 2022
-
-
David Hammer authored
-
- Jul 19, 2022
-
-
David Hammer authored
commit 48c2779b Author: David Hammer <dhammer@mailbox.org> Date: Tue Jun 7 10:43:17 2022 +0200 Fixing bug in set_on_axis, adding a few tests commit 99de26dd Author: David Hammer <dhammer@mailbox.org> Date: Fri Jun 3 12:54:50 2022 +0200 Squashed commit of the following: commit beb32df5 Author: David Hammer <dhammer@mailbox.org> Date: Fri May 13 13:25:10 2022 +0200 Fix reconfigure bug and prevent sources from being sorted commit a79b501a Author: David Hammer <dhammer@mailbox.org> Date: Wed May 11 12:35:09 2022 +0200 Update description of stacking patterns commit 426d707b Merge: 07b6c972 e1b0b8d1 Author: David Hammer <dhammer@mailbox.org> Date: Mon May 9 12:50:30 2022 +0200 Merge branch 'stacking-shmem-matcher' of ssh://git.xfel.eu:10022/karaboDevices/calng into stacking-shmem-matcher commit 07b6c972 Author: David Hammer <dhammer@mailbox.org> Date: Fri May 6 14:53:31 2022 +0200 Adding option to skip Karabo channel output commit 02a4ccd9 Author: David Hammer <dhammer@mailbox.org> Date: Fri May 6 13:27:59 2022 +0200 Allow stacking on other axes, fix thread pool commit b2b5aca1 Author: David Hammer <dhammer@mailbox.org> Date: Thu May 5 16:30:14 2022 +0200 Allow thread pool usage commit f8f380cc Author: David Hammer <dhammer@mailbox.org> Date: Thu May 5 14:49:01 2022 +0200 Use sources list to get source order, cache buffers commit ef898211 Author: David Hammer <dhammer@mailbox.org> Date: Tue May 3 15:49:21 2022 +0200 Adding Philipp's proposed changes to TrainMatcher for merging commit e1b0b8d1 Author: David Hammer <dhammer@mailbox.org> Date: Fri May 6 14:53:31 2022 +0200 Adding option to skip Karabo channel output commit bbb7cee4 Author: David Hammer <dhammer@mailbox.org> Date: Fri May 6 13:27:59 2022 +0200 Allow stacking on other axes, fix thread pool commit b01015c4 Author: David Hammer <dhammer@mailbox.org> Date: Thu May 5 16:30:14 2022 +0200 Allow thread pool usage commit e7f96bae Author: David Hammer <dhammer@mailbox.org> Date: Thu May 5 14:49:01 2022 +0200 Use sources list to get source order, cache buffers commit 193264ed Author: David Hammer <dhammer@mailbox.org> Date: Tue May 3 15:49:21 2022 +0200 Adding Philipp's proposed changes to TrainMatcher for merging commit df209b62 Author: David Hammer <dhammer@mailbox.org> Date: Fri Jun 3 12:36:27 2022 +0200 JF: Add CPU runner version Still to do: speed up preview generation; single-threaded numpy reduction functions are a bit of an issue. commit d234558a Author: David Hammer <dhammer@mailbox.org> Date: Thu Jun 2 15:38:58 2022 +0200 JF: also override shape of gain map (hotfixed at SPB) commit 876fbbe8 Author: David Hammer <dhammer@mailbox.org> Date: Thu Jun 2 15:31:20 2022 +0200 GH/JF: Decrease default shmem buffer size commit 87feec34 Author: David Hammer <dhammer@mailbox.org> Date: Fri May 13 12:28:25 2022 +0200 LPD: switch X/Y order of GainAmpMap, too commit 85292e6c Author: David Hammer <dhammer@mailbox.org> Date: Fri May 13 09:21:23 2022 +0200 LPD: add gain stage preview commit ef67fc89 Author: David Hammer <dhammer@mailbox.org> Date: Thu May 12 10:50:45 2022 +0200 LPD: also check isinf commit 89c1ee03 Author: David Hammer <dhammer@mailbox.org> Date: Thu May 12 10:47:51 2022 +0200 LPD: check gain values, mask extreme / nan values commit 0e210d4b Author: David Hammer <dhammer@mailbox.org> Date: Wed May 11 14:41:32 2022 +0200 LPD: make bad pixel masking value configurable commit 47314d47 Author: David Hammer <dhammer@mailbox.org> Date: Tue May 10 13:18:54 2022 +0200 LPD: DRYing constant loading, swapping axes for FF constants commit 00db322c Author: David Hammer <dhammer@mailbox.org> Date: Mon May 9 16:28:01 2022 +0200 Fix LPD bad pixel mask buffer, update defaults commit 72baa028 Author: David Hammer <dhammer@mailbox.org> Date: Thu May 5 10:15:13 2022 +0200 Fix typo affecting gain amp map / flat field buffers commit f07657ce Author: David Hammer <dhammer@mailbox.org> Date: Tue Apr 26 17:09:26 2022 +0200 Sum along correct axis commit 5eed5939 Author: David Hammer <dhammer@mailbox.org> Date: Tue Apr 26 16:59:43 2022 +0200 Adding GH2 frame sum preview commit f9692483 Merge: cafeb230 29d1db58 Author: David Hammer <dhammer@mailbox.org> Date: Mon Apr 25 22:20:32 2022 +0200 Merge branch 'devel' of ssh://git.xfel.eu:10022/karaboDevices/calng into devel commit 29d1db58 Author: Steffen Hauf <fxeonc@exflong01.desy.de> Date: Mon Apr 25 09:53:33 2022 +0200 Overrides for GOTTHARD-II testing commit cafeb230 Author: David Hammer <dhammer@mailbox.org> Date: Wed Apr 20 15:02:27 2022 +0200 Enable reconfiguration of preview.maxRate commit 62b3ee29 Author: David Hammer <dhammer@mailbox.org> Date: Wed Apr 20 13:48:48 2022 +0200 DSSC: Remove unused constant parameters commit 621041e4 Author: David Hammer <dhammer@mailbox.org> Date: Wed Apr 20 08:57:51 2022 +0200 Set default output axis order for DSSC, make reconfigurable commit b519acc0 Author: David Hammer <dhammer@mailbox.org> Date: Thu Apr 14 13:24:59 2022 +0200 Scene support for geometry file type commit 2df41007 Author: David Hammer <dhammer@mailbox.org> Date: Wed Apr 13 16:16:33 2022 +0200 Enable loading (some) h5 geometry files commit a65e6c04 Author: David Hammer <dhammer@mailbox.org> Date: Wed Apr 13 15:35:43 2022 +0200 Add DAQs to manager overview scene, minor scene improvements commit aeca9080 Author: David Hammer <dhammer@mailbox.org> Date: Tue Apr 12 15:27:16 2022 +0200 Add another __init__.py for pip install to work commit 7b889820 Author: David Hammer <dhammer@mailbox.org> Date: Tue Apr 12 13:16:31 2022 +0200 Allow replacing preview-breaking values for GH2 streak, too commit e12c19d5 Author: David Hammer <dhammer@mailbox.org> Date: Tue Apr 12 13:16:24 2022 +0200 Fix typo commit 97d8e93f Author: David Hammer <dhammer@mailbox.org> Date: Tue Apr 12 12:14:30 2022 +0200 Improve buffer initialization, skip pinning for CPU device commit 5117aadc Author: David Hammer <dhammer@mailbox.org> Date: Tue Apr 12 10:07:44 2022 +0200 GOTTHARD2 streak-style preview, disable cell index warnings commit f9673310 Author: David Hammer <dhammer@mailbox.org> Date: Tue Apr 12 10:07:10 2022 +0200 Preview as float32 without nan, improved scenes commit c0bffab0 Author: David Hammer <dhammer@mailbox.org> Date: Mon Apr 11 13:46:36 2022 +0200 Prototype Cython-based GOTTHARD2 correction device commit 319a0a11 Author: David Hammer <dhammer@mailbox.org> Date: Mon Apr 11 13:46:06 2022 +0200 Enable overriding constant using specific file commit 5a42d5bf Author: David Hammer <dhammer@mailbox.org> Date: Fri Apr 8 14:12:05 2022 +0200 Including the individual geometry devices Wow, I guess this was a slight oversight commit da983bbe Author: David Hammer <dhammer@mailbox.org> Date: Fri Apr 8 12:42:48 2022 +0200 Bump dependencies for updating deployments commit 1e6d7ab7 Author: David Hammer <dhammer@mailbox.org> Date: Thu Apr 7 10:02:24 2022 +0200 Scene links to overview scenes specifically commit cd2dade2 Author: David Hammer <dhammer@mailbox.org> Date: Thu Apr 7 10:02:03 2022 +0200 Switch preview throttling method for DetectorAssembler commit fe3d204b Author: David Hammer <dhammer@mailbox.org> Date: Wed Apr 6 12:25:19 2022 +0200 Switching geom "serialization" to b64 string, move to util file commit 12fc479d Author: David Hammer <dhammer@mailbox.org> Date: Fri Apr 1 18:22:52 2022 +0200 For Karabo 2.14.x: increase instantiation timeout, gather for speed commit adf0f3c5 Author: David Hammer <dhammer@mailbox.org> Date: Fri Apr 1 18:21:39 2022 +0200 Move expensive buffer changes to background to avoid timeouts commit 1a655dcc Author: David Hammer <dhammer@mailbox.org> Date: Fri Apr 1 18:20:30 2022 +0200 New handling of invalid arrays from DAQ (need Karabo >= 2.14.1) commit 385420de Author: David Hammer <dhammer@mailbox.org> Date: Thu Mar 17 14:25:33 2022 +0100 Hopefully better handling of empty DAQ hashes commit f39d435b Author: David Hammer <dhammer@mailbox.org> Date: Thu Mar 17 11:47:00 2022 +0100 Correct details of LPD correction after asking Hazem commit de3cdd9b Author: David Hammer <dhammer@mailbox.org> Date: Thu Mar 17 11:45:01 2022 +0100 Correct call to reset tweaks commit f8d344ed Author: David Hammer <dhammer@mailbox.org> Date: Tue Mar 8 15:37:05 2022 +0100 Configure preview assemblers with new maxIdle parameter commit 5b17e66a Author: David Hammer <dhammer@mailbox.org> Date: Fri Mar 4 18:38:16 2022 +0100 Switch geometry to property (gzipped pickle), add tweak with undo commit 864c803f Author: David Hammer <dhammer@mailbox.org> Date: Wed Mar 2 18:32:56 2022 +0100 Cleanup, only mdl geometries, update scenes commit 579a0d7d Author: David Hammer <dhammer@mailbox.org> Date: Tue Mar 1 14:39:25 2022 +0100 Fix up loading and axis orders (I think) commit 25cbe981 Author: David Hammer <dhammer@mailbox.org> Date: Tue Mar 1 12:07:38 2022 +0100 Revert "Apply md_additional_offset before multiplying in rel gain step" This reverts commit b6111074. commit 41f0d28a Author: David Hammer <dhammer@mailbox.org> Date: Tue Mar 1 11:40:52 2022 +0100 Improve CalCat / debugging parts of schema commit 6ff23bde Author: David Hammer <dhammer@mailbox.org> Date: Mon Feb 28 17:05:42 2022 +0100 Add option to shift entire geometry by offset Suggested by Luca during today's group meeting. It seems the built-in .offset for geometry objects is more than capable of handling this in a neat way. commit f6b94e39 Author: David Hammer <dhammer@mailbox.org> Date: Fri Feb 25 17:04:45 2022 +0100 Add initial incomplete LPD correction device and geometry commit 2022b3c6 Author: David Hammer <dhammer@mailbox.org> Date: Thu Feb 24 15:04:31 2022 +0100 Adding initial middlelayer versions of geometry device classes commit 4dfa248d Author: David Hammer <dhammer@mailbox.org> Date: Thu Feb 24 09:39:25 2022 +0100 Geometry device: overhaul + allow loading CrystFEL commit 2a21de06 Author: David Hammer <dhammer@mailbox.org> Date: Wed Feb 23 11:32:17 2022 +0100 Ravel cell table instead of squeezing it commit b6111074 Author: David Hammer <dhammer@mailbox.org> Date: Tue Feb 22 12:48:14 2022 +0100 Apply md_additional_offset before multiplying in rel gain step commit 52070129 Author: David Hammer <dhammer@mailbox.org> Date: Tue Feb 15 13:01:59 2022 +0100 Fix: drop singleton dimension for DSSC GPU kernel runner image shape commit f67327a9 Author: David Hammer <dhammer@mailbox.org> Date: Tue Feb 15 13:01:28 2022 +0100 Fix: update trainId and sent like regular TrainMatcher commit 84b57a4a Author: David Hammer <dhammer@mailbox.org> Date: Tue Feb 15 13:00:49 2022 +0100 Remove 2.10 compat, remove ModuleStacker, clean up repository commit 3a1a3409 Author: David Hammer <dhammer@mailbox.org> Date: Mon Feb 14 13:02:44 2022 +0100 Attempt to catch more cases of DAQ not sending data commit 836d211f Author: David Hammer <dhammer@mailbox.org> Date: Fri Feb 11 16:55:29 2022 +0100 Enable time of flight measurement on assembler commit 810047ae Author: David Hammer <dhammer@mailbox.org> Date: Fri Feb 11 13:50:22 2022 +0100 Add shmem-aware TrainMatcher, clean up more from merging bridge commit 100581b4 Author: David Hammer <dhammer@mailbox.org> Date: Fri Feb 11 11:50:40 2022 +0100 Bump calngDeps - go to Karabo 2.12.0 commit fed66d78 Author: David Hammer <dhammer@mailbox.org> Date: Thu Feb 10 15:44:15 2022 +0100 Follow some flake8 hints commit 051b2dd2 Author: David Hammer <dhammer@mailbox.org> Date: Thu Feb 10 15:30:21 2022 +0100 Give CuPy head start to clean up memory commit 1b460588 Author: David Hammer <dhammer@mailbox.org> Date: Thu Feb 10 15:29:54 2022 +0100 Remove spurious squeeze commit 5a69abef Author: David Hammer <dhammer@mailbox.org> Date: Thu Feb 10 14:49:45 2022 +0100 Remove a debugging print, add another in case of failure commit 29906ddd Author: David Hammer <dhammer@mailbox.org> Date: Thu Feb 10 14:33:14 2022 +0100 Add regular matched output, zmq output can send any of three options commit e685a56a Author: David Hammer <dhammer@mailbox.org> Date: Thu Feb 10 12:34:27 2022 +0100 Switch to TrainMatcher 2.0.1-2.13.0 with built-in bridge commit 3393558d Author: David Hammer <dhammer@mailbox.org> Date: Thu Feb 10 12:33:31 2022 +0100 Fixes relating to managed -> managedKeys commit 38e2086c Merge: 422e4ad5 042ed810 Author: David Hammer <dhammer@mailbox.org> Date: Thu Feb 10 11:55:39 2022 +0100 Merge branch 'feat/dynamic-manager' into devel commit 422e4ad5 Author: David Hammer <dhammer@mailbox.org> Date: Thu Feb 10 11:43:04 2022 +0100 Handle 2.10.0 not having missingConnections commit ec2c4d83 Author: David Hammer <dhammer@mailbox.org> Date: Wed Feb 9 11:45:02 2022 +0100 Rename SimpleAssember, split output in regular and preview commit 042ed810 Author: Philipp Schmidt <philipp.schmidt@xfel.eu> Date: Tue Feb 8 15:25:11 2022 +0100 manager: Add support to load managed key values from named manager configuration commit a21adaaf Author: David Hammer <dhammer@mailbox.org> Date: Tue Feb 8 13:50:59 2022 +0100 Add useful overview scenes commit f6912087 Author: Philipp Schmidt <philipp.schmidt@xfel.eu> Date: Tue Feb 8 13:45:42 2022 +0100 manager: Move autostart for matcher and bridges to module groups commit b6dc9170 Author: Philipp Schmidt <philipp.schmidt@xfel.eu> Date: Tue Feb 8 13:44:59 2022 +0100 manager: Add generic configuration restore mechanism for managed devices commit 23e2d67e Author: Philipp Schmidt <philipp.schmidt@xfel.eu> Date: Tue Feb 8 11:11:48 2022 +0100 manager: Show tracked devices as a property commit a94b685f Merge: 412a34de 4113bf0c Author: David Hammer <dhammer@mailbox.org> Date: Tue Feb 8 08:57:14 2022 +0100 Merge branch 'deployed/spb-jungfrau' into devel commit 22f5e9e1 Author: Philipp Schmidt <philipp.schmidt@xfel.eu> Date: Mon Feb 7 19:51:54 2022 +0100 manager: Add slot to manually (re)discover managed devices commit 08a48a5e Author: Philipp Schmidt <philipp.schmidt@xfel.eu> Date: Mon Feb 7 19:51:08 2022 +0100 manager: Rework managed DAQ keys and add configurable DAQ device pattern commit 4113bf0c Author: David Hammer <dhammer@mailbox.org> Date: Mon Feb 7 19:37:27 2022 +0100 Validate frame filter in preReconfigure commit 9a439bda Author: David Hammer <dhammer@mailbox.org> Date: Sun Feb 6 20:29:04 2022 +0100 Making downsampling comboboxes editable commit f0d5634e Author: David Hammer <dhammer@mailbox.org> Date: Sat Feb 5 22:24:04 2022 +0100 Improving recursive scene generation, adding downsampling controls for assembler commit e71401fe Author: David Hammer <dhammer@mailbox.org> Date: Sat Feb 5 19:28:27 2022 +0100 Scene generation: use combo box for keys with options commit 9e192a9a Author: David Hammer <dhammer@mailbox.org> Date: Sat Feb 5 19:16:06 2022 +0100 Add preview scene for SimpleAssembler commit 3dcad0a5 Author: David Hammer <dhammer@mailbox.org> Date: Sat Feb 5 18:04:34 2022 +0100 Make SimpleAssembler ask for geometry on init commit 4683ca2f Author: David Hammer <dhammer@mailbox.org> Date: Sat Feb 5 17:55:15 2022 +0100 Update JungfrauCorrection to use unsafe_get commit 2a8fe93e Author: David Hammer <dhammer@mailbox.org> Date: Fri Feb 4 18:48:04 2022 +0100 Remove gain mode from FF constant parameters commit faf79c6d Author: David Hammer <dhammer@mailbox.org> Date: Fri Feb 4 18:39:03 2022 +0100 Make gain mode manageable, use correct value when querying calcat commit 311de5ae Author: David Hammer <dhammer@mailbox.org> Date: Wed Feb 2 16:11:00 2022 +0100 Replace _schema_cache with unsafe_get using _parameters commit 8d3ea1c8 Author: David Hammer <dhammer@mailbox.org> Date: Tue Feb 1 11:41:22 2022 +0100 Revert "Enable transposition from weird DAQ axis order on GPU" This reverts commit c606771a. commit 38f4cd3d Author: David Hammer <dhammer@mailbox.org> Date: Mon Jan 31 12:06:58 2022 +0100 Add measurement of recent trains received commit b4d52c48 Author: David Hammer <dhammer@mailbox.org> Date: Mon Jan 31 10:37:32 2022 +0100 Handle both axis orders in recent constants commit 504021b1 Author: David Hammer <dhammer@mailbox.org> Date: Mon Jan 31 09:27:37 2022 +0100 Only update rates etc when processing commit d1df365e Author: David Hammer <dhammer@mailbox.org> Date: Fri Jan 28 13:50:11 2022 +0100 Allow downsampling like in FemDataAssembler commit c606771a Author: David Hammer <dhammer@mailbox.org> Date: Fri Jan 28 12:30:36 2022 +0100 Enable transposition from weird DAQ axis order on GPU commit 39e35fea Author: David Hammer <dhammer@mailbox.org> Date: Thu Jan 27 16:44:43 2022 +0100 Use cell table rather than image data to guess number of cells commit 73ef58df Author: David Hammer <dhammer@mailbox.org> Date: Thu Jan 27 16:44:10 2022 +0100 Add BadPixelsFF10Hz to JungfrauCorrection commit 0ba33d45 Author: David Hammer <dhammer@mailbox.org> Date: Thu Jan 27 14:31:18 2022 +0100 Query for constants using all possible conditions, not just one commit 84fe0e9f Author: David Hammer <dhammer@mailbox.org> Date: Thu Jan 27 09:52:31 2022 +0100 Add gain map preview layer to JungfrauCorrection commit b586b980 Author: David Hammer <dhammer@mailbox.org> Date: Thu Jan 27 09:47:17 2022 +0100 Fix typo in enum class name commit 30ae788c Author: David Hammer <dhammer@mailbox.org> Date: Wed Jan 26 21:25:52 2022 +0100 Handle cell table being empty bytearray... commit ba181ccf Author: David Hammer <dhammer@mailbox.org> Date: Wed Jan 26 21:19:05 2022 +0100 Better empty cell table detection commit debbe2d5 Author: David Hammer <dhammer@mailbox.org> Date: Wed Jan 26 21:11:19 2022 +0100 Update geom on reconfigure for manual module geom commit 86d2de32 Author: David Hammer <dhammer@mailbox.org> Date: Wed Jan 26 13:01:07 2022 +0100 Tie burst mode more to memory cell count commit 443aa74f Author: David Hammer <dhammer@mailbox.org> Date: Wed Jan 26 12:49:46 2022 +0100 Add gain mode to managed keys commit fba98e89 Author: David Hammer <dhammer@mailbox.org> Date: Wed Jan 26 11:51:23 2022 +0100 Don't transpose JF x/y for preview with extra_geom commit 1ab59fe0 Author: David Hammer <dhammer@mailbox.org> Date: Wed Jan 26 11:42:21 2022 +0100 Remove scene development slot commit ecc1fed9 Author: David Hammer <dhammer@mailbox.org> Date: Wed Jan 26 10:24:10 2022 +0100 Include kernels properly commit fc881d0d Author: David Hammer <dhammer@mailbox.org> Date: Wed Jan 26 09:59:19 2022 +0100 Forgot that 3.6 does not support lru_cache without () commit 6d995115 Author: David Hammer <dhammer@mailbox.org> Date: Wed Jan 26 09:13:22 2022 +0100 Bump calngDeps requirement commit 0db2b1d5 Merge: ede1decd 06b1dfe6 Author: David Hammer <dhammer@mailbox.org> Date: Tue Jan 25 11:19:13 2022 +0100 Merge branch 'add-simple-assembler-geometry' into deployed/spb-jungfrau commit 06b1dfe6 Author: David Hammer <dhammer@mailbox.org> Date: Tue Jan 25 10:42:04 2022 +0100 Tweak manager to support new assembler commit 80ded351 Merge: 800075f3 2db2a659 Author: David Hammer <dhammer@mailbox.org> Date: Tue Jan 25 10:36:30 2022 +0100 Merge branch 'add-simple-assembler-geometry' of ssh://git.xfel.eu:10022/karaboDevices/calng into add-simple-assembler-geometry commit 800075f3 Author: David Hammer <dhammer@mailbox.org> Date: Mon Jan 24 10:20:17 2022 +0100 Overhaul geometry device classes, initial Jungfrau support commit ace4eb6e Author: David Hammer <dhammer@mailbox.org> Date: Thu Jan 6 16:20:47 2022 +0100 Add prototype assembler and manual geometry devices Copied over from my hacky utils; have used these in my development Karabo environment for a while. Devices here (and corresponding changes to manager) sketch how I interpret our plan for the next step in online calibration topology; manual geometry devices to be later supplanted by or supplemented with something using encoders or such. commit 2db2a659 Author: David Hammer <dhammer@mailbox.org> Date: Mon Jan 24 10:20:17 2022 +0100 Overhaul geometry device classes, initial Jungfrau support commit b247bf99 Merge: 7922eb17 a39751af Author: David Hammer <dhammer@mailbox.org> Date: Mon Jan 24 10:09:56 2022 +0100 Merge branch 'add-simple-assembler-geometry' of ssh://git.xfel.eu:10022/karaboDevices/calng into add-simple-assembler-geometry commit ede1decd Merge: 30a97949 12d333b5 Author: David Hammer <dhammer@mailbox.org> Date: Mon Jan 24 10:05:32 2022 +0100 Merge branch 'add-jungfrau-device' of ssh://git.xfel.eu:10022/karaboDevices/calng into add-jungfrau-device commit 30a97949 Author: David Hammer <dhammer@mailbox.org> Date: Thu Jan 20 13:42:35 2022 +0100 Remove unnecessary handling of gain mode Assuming the detector sends appropriate data.gain values in fixed gain mode(s), the GPU kernel can just run as normal. Constants will include three gain stages - fixed gain is purely a constant retrieval parameter. commit 091937cd Author: David Hammer <dhammer@mailbox.org> Date: Thu Jan 20 11:57:53 2022 +0100 Use attribute for image data path more consistently commit 86b53334 Author: David Hammer <dhammer@mailbox.org> Date: Wed Jan 19 14:45:24 2022 +0100 Remove debugging spam commit a0b52735 Author: David Hammer <dhammer@mailbox.org> Date: Wed Jan 19 14:43:03 2022 +0100 Fix constant loading, edge cases in kernel commit f69a7790 Author: David Hammer <dhammer@mailbox.org> Date: Tue Jan 18 16:09:25 2022 +0100 Fix map shape commit a2a6ab3b Author: David Hammer <dhammer@mailbox.org> Date: Tue Jan 18 15:09:00 2022 +0100 Jungfrau single cell mode maybe working commit 0949b6dc Author: David Hammer <dhammer@mailbox.org> Date: Tue Jan 18 14:18:00 2022 +0100 Fill in more mandatory methods commit e7ae0277 Author: David Hammer <dhammer@mailbox.org> Date: Tue Jan 18 13:10:53 2022 +0100 Filling out details, enabling different image data path commit 4fead59a Author: David Hammer <dhammer@mailbox.org> Date: Thu Jan 6 14:32:38 2022 +0100 Initial Jungfrau device boilerplate commit ea2939fb Author: David Hammer <dhammer@mailbox.org> Date: Fri Jan 21 16:28:02 2022 +0100 Specify gain mode options via enum commit 26af148a Author: David Hammer <dhammer@mailbox.org> Date: Fri Jan 21 16:24:50 2022 +0100 Wrap frame filter type in enum commit 809d48f9 Merge: 5c21f1cd 48c526c4 Author: David Hammer <dhammer@mailbox.org> Date: Fri Jan 21 11:12:51 2022 +0100 Merge branch 'add-agipd-device' of ssh://git.xfel.eu:10022/karaboDevices/calng into add-agipd-device commit 12d333b5 Author: David Hammer <dhammer@mailbox.org> Date: Thu Jan 20 13:42:35 2022 +0100 Remove unnecessary handling of gain mode Assuming the detector sends appropriate data.gain values in fixed gain mode(s), the GPU kernel can just run as normal. Constants will include three gain stages - fixed gain is purely a constant retrieval parameter. commit cdfe2641 Author: David Hammer <dhammer@mailbox.org> Date: Thu Jan 20 11:57:53 2022 +0100 Use attribute for image data path more consistently commit 71a08250 Author: David Hammer <dhammer@mailbox.org> Date: Wed Jan 19 14:45:24 2022 +0100 Remove debugging spam commit e1d25140 Author: David Hammer <dhammer@mailbox.org> Date: Wed Jan 19 14:43:03 2022 +0100 Fix constant loading, edge cases in kernel commit 0c1717af Author: David Hammer <dhammer@mailbox.org> Date: Tue Jan 18 16:09:25 2022 +0100 Fix map shape commit 40eaf8e0 Author: David Hammer <dhammer@mailbox.org> Date: Tue Jan 18 15:09:00 2022 +0100 Jungfrau single cell mode maybe working commit fc3b3be2 Author: David Hammer <dhammer@mailbox.org> Date: Tue Jan 18 14:18:00 2022 +0100 Fill in more mandatory methods commit 1888eb3d Merge: 1c6cefe9 a3d7b901 Author: David Hammer <dhammer@mailbox.org> Date: Tue Jan 18 13:16:23 2022 +0100 Merge branch 'add-jungfrau-device' of ssh://git.xfel.eu:10022/karaboDevices/calng into add-jungfrau-device commit 1c6cefe9 Author: David Hammer <dhammer@mailbox.org> Date: Tue Jan 18 13:10:53 2022 +0100 Filling out details, enabling different image data path commit 8d26d310 Author: David Hammer <dhammer@mailbox.org> Date: Thu Jan 6 14:32:38 2022 +0100 Initial Jungfrau device boilerplate commit 5c21f1cd Author: David Hammer <dhammer@mailbox.org> Date: Tue Jan 18 13:12:05 2022 +0100 Set more explicit defaults per class commit 48c526c4 Author: David Hammer <dhammer@mailbox.org> Date: Tue Jan 18 13:12:05 2022 +0100 Set more explicit defaults per class commit f8edc53c Author: David Hammer <dhammer@mailbox.org> Date: Tue Jan 18 13:11:26 2022 +0100 Don't overwrite base class managed keys commit 9278d209 Author: David Hammer <dhammer@mailbox.org> Date: Tue Jan 18 13:11:26 2022 +0100 Don't overwrite base class managed keys commit cf20dc74 Author: David Hammer <dhammer@mailbox.org> Date: Tue Jan 11 14:45:43 2022 +0100 Make _update_frame_filter by default call _update_buffers itself commit 99c65ce7 Author: David Hammer <dhammer@mailbox.org> Date: Tue Jan 11 14:45:43 2022 +0100 Make _update_frame_filter by default call _update_buffers itself commit 67e1ba2d Author: David Hammer <dhammer@mailbox.org> Date: Tue Jan 11 14:44:17 2022 +0100 Typos and framework usage fixes suggested by @flucke commit 049d651a Author: David Hammer <dhammer@mailbox.org> Date: Tue Jan 11 14:44:17 2022 +0100 Typos and framework usage fixes suggested by @flucke commit 7922eb17 Author: David Hammer <dhammer@mailbox.org> Date: Thu Jan 6 16:20:47 2022 +0100 Add prototype assembler and manual geometry devices Copied over from my hacky utils; have used these in my development Karabo environment for a while. Devices here (and corresponding changes to manager) sketch how I interpret our plan for the next step in online calibration topology; manual geometry devices to be later supplanted by or supplemented with something using encoders or such. commit a39751af Author: David Hammer <dhammer@mailbox.org> Date: Thu Jan 6 16:20:47 2022 +0100 Add prototype assembler and manual geometry devices Copied over from my hacky utils; have used these in my development Karabo environment for a while. Devices here (and corresponding changes to manager) sketch how I interpret our plan for the next step in online calibration topology; manual geometry devices to be later supplanted by or supplemented with something using encoders or such. commit a3d7b901 Author: David Hammer <dhammer@mailbox.org> Date: Thu Jan 6 14:32:38 2022 +0100 Initial Jungfrau device boilerplate commit 03bd361f Author: David Hammer <dhammer@mailbox.org> Date: Mon Dec 20 16:55:11 2021 +0100 Remove wrong logging call, add notice after pinning shmem commit 2d866bfb Author: David Hammer <dhammer@mailbox.org> Date: Mon Dec 20 16:55:11 2021 +0100 Remove wrong logging call, add notice after pinning shmem commit a987b9ef Author: David Hammer <dhammer@mailbox.org> Date: Mon Dec 20 16:54:44 2021 +0100 Handle fixed gain mode as operating condition, too commit df2666df Author: David Hammer <dhammer@mailbox.org> Date: Mon Dec 20 16:54:44 2021 +0100 Handle fixed gain mode as operating condition, too commit 00231fd2 Author: David Hammer <dhammer@mailbox.org> Date: Mon Dec 20 13:16:55 2021 +0100 Renaming relGainXray to gainXray commit a699405c Author: David Hammer <dhammer@mailbox.org> Date: Mon Dec 20 13:16:55 2021 +0100 Renaming relGainXray to gainXray commit b9630090 Author: David Hammer <dhammer@mailbox.org> Date: Fri Dec 17 17:39:36 2021 +0100 Update tests commit b9b028a7 Author: David Hammer <dhammer@mailbox.org> Date: Fri Dec 17 17:39:36 2021 +0100 Update tests commit e3377901 Author: David Hammer <dhammer@mailbox.org> Date: Fri Dec 17 16:02:53 2021 +0100 Add back slots I accidentally kicked out of init commit bfcd3a8c Author: David Hammer <dhammer@mailbox.org> Date: Fri Dec 17 16:02:16 2021 +0100 Specify frameFilter without eval commit 9e38518f Author: David Hammer <dhammer@mailbox.org> Date: Thu Dec 9 22:18:50 2021 +0100 Move some initialization out of __init__ commit 7cfb2ca6 Author: David Hammer <dhammer@mailbox.org> Date: Thu Dec 9 20:43:26 2021 +0100 Better error message for wrong bad pixel map shape commit fed637da Author: David Hammer <dhammer@mailbox.org> Date: Thu Dec 9 20:42:30 2021 +0100 Use float(...) instead of eval(...) to get badPixelMaskingValue commit 4e18965c Author: David Hammer <dhammer@mailbox.org> Date: Tue Dec 7 20:08:10 2021 +0100 Remove small redundancies commit 8e3a2150 Author: David Hammer <dhammer@mailbox.org> Date: Tue Dec 7 20:04:34 2021 +0100 Fix indentation commit 7e6d6bc9 Author: David Hammer <dhammer@mailbox.org> Date: Thu Dec 2 16:14:59 2021 +0100 Conform to Karabo best practices (round 1 from @flucke's comments) Importing State from bound, using OVERWRITE_ELEMENT, letting framework handle inheriting schemata instead of calling superclass expectedParameters. commit ea33a21e Author: David Hammer <dhammer@mailbox.org> Date: Wed Dec 1 09:42:41 2021 +0100 Reformatting bound schema definitions commit 67a40896 Author: David Hammer <dhammer@mailbox.org> Date: Wed Dec 1 09:33:53 2021 +0100 Restructuring to one .py per detector commit 6e415fb0 Author: David Hammer <dhammer@mailbox.org> Date: Wed Dec 1 09:11:34 2021 +0100 Renaming kernel files commit 8c4d95df Author: David Hammer <dhammer@mailbox.org> Date: Mon Nov 29 15:05:42 2021 +0100 Fix tests commit ce6ff152 Author: David Hammer <dhammer@mailbox.org> Date: Mon Nov 29 15:05:10 2021 +0100 Tidying up, improving documentation for MR commit 7b5a74b5 Author: Philipp Schmidt <philipp.schmidt@xfel.eu> Date: Wed Nov 3 15:34:38 2021 +0100 manager: Apply previous values after proxy creation commit 015dbfc7 Author: David Hammer <dhammer@mailbox.org> Date: Tue Nov 23 18:48:55 2021 +0100 Remove leftovers from sending gain map as full output commit fcc08a7c Author: David Hammer <dhammer@mailbox.org> Date: Tue Nov 23 16:57:03 2021 +0100 DRY preview generation code, AGIPD only preview gain map commit 39ef1be4 Author: David Hammer <dhammer@mailbox.org> Date: Mon Nov 22 18:34:31 2021 +0100 Reimplementing frame filter commit 3de68767 Author: David Hammer <dhammer@mailbox.org> Date: Thu Nov 18 11:04:04 2021 +0100 Using *args for child nodes to clean up indentation commit 20f08b0a Author: David Hammer <dhammer@mailbox.org> Date: Thu Nov 18 00:20:59 2021 +0100 Very fancy scene generation commit e2f42463 Author: David Hammer <dhammer@mailbox.org> Date: Wed Nov 17 23:36:00 2021 +0100 Adding integration time for AGIPD commit 15d2116f Author: David Hammer <dhammer@mailbox.org> Date: Wed Nov 17 23:35:10 2021 +0100 Restructure input handler, DRY slightly commit a041a97c Author: David Hammer <dhammer@mailbox.org> Date: Wed Nov 17 15:54:13 2021 +0100 Fix typo, formatting commit 9e8097bf Author: David Hammer <dhammer@mailbox.org> Date: Wed Nov 17 15:50:24 2021 +0100 Improve shmem cleanup, allow pinning commit 34b915ac Author: David Hammer <dhammer@mailbox.org> Date: Wed Nov 17 12:43:16 2021 +0100 Improving, simplifying timers commit 8b3128b5 Author: David Hammer <dhammer@mailbox.org> Date: Thu Nov 11 13:38:29 2021 +0100 Add links to remaining manged devices, improve layout commit 7a556380 Author: David Hammer <dhammer@mailbox.org> Date: Thu Nov 11 12:36:50 2021 +0100 DRYing, compacting scenes commit 16b41f08 Author: David Hammer <dhammer@mailbox.org> Date: Thu Nov 11 11:26:35 2021 +0100 Add manager status to overview scene commit c73a6987 Author: David Hammer <dhammer@mailbox.org> Date: Wed Nov 10 13:53:00 2021 +0100 Improve scene generation code commit d57d666e Author: David Hammer <dhammer@mailbox.org> Date: Wed Nov 10 13:51:50 2021 +0100 Set default frame selection mode for DSSC, AGIPD commit 9b42aebc Author: David Hammer <dhammer@mailbox.org> Date: Thu Nov 4 11:02:31 2021 +0100 Allow choosing preview index frame / cell / pulse, improve managed_keys commit 412a34de Author: Philipp Schmidt <philipp.schmidt@xfel.eu> Date: Wed Nov 3 15:34:38 2021 +0100 manager: Apply previous values after proxy creation commit 20eb93d9 Author: David Hammer <dhammer@mailbox.org> Date: Wed Nov 3 15:03:09 2021 +0100 Disabling logging of shape override commit f862bb13 Author: David Hammer <dhammer@mailbox.org> Date: Wed Nov 3 14:57:56 2021 +0100 Hotfix: catch exception, skip getting default train stride on init commit 7e9d9579 Author: David Hammer <dhammer@mailbox.org> Date: Wed Nov 3 14:56:23 2021 +0100 Select cell ID to preview instead of pulse commit 15fb4726 Author: David Hammer <dhammer@mailbox.org> Date: Wed Nov 3 12:38:29 2021 +0100 Hotfix: don't do parallel queries to not provoke SSL error commit aeb03f6a Author: David Hammer <dhammer@mailbox.org> Date: Wed Nov 3 10:23:57 2021 +0100 Add override to ignore strange input axis order commit cd39e039 Author: David Hammer <dhammer@mailbox.org> Date: Tue Nov 2 10:42:40 2021 +0100 Karabo 2.10 does not allow slotName for KARABO_SLOT commit 8b5870a9 Author: David Hammer <dhammer@mailbox.org> Date: Tue Nov 2 10:31:53 2021 +0100 No functools.cached_property in Python 3.6 commit ab5fe5ce Author: David Hammer <dhammer@mailbox.org> Date: Tue Nov 2 10:10:44 2021 +0100 Parens needed in Python 3.6 commit b4c12698 Author: David Hammer <dhammer@mailbox.org> Date: Tue Nov 2 10:00:28 2021 +0100 Set calngDeps version for SPB test deployment commit a2c786fe Author: David Hammer <dhammer@mailbox.org> Date: Mon Nov 1 16:00:19 2021 +0100 Fix tests commit 81e6aebf Author: David Hammer <dhammer@mailbox.org> Date: Mon Nov 1 14:32:02 2021 +0100 Abstract receiving, caching of calng shmem handles commit 0ec69b2b Author: David Hammer <dhammer@mailbox.org> Date: Mon Nov 1 14:31:27 2021 +0100 Flake8, isort, black commit 79a30a59 Author: David Hammer <dhammer@mailbox.org> Date: Mon Nov 1 14:28:24 2021 +0100 Automatically reload BadPixel constants if reenabling fields commit ac340545 Author: David Hammer <dhammer@mailbox.org> Date: Fri Oct 29 11:44:03 2021 +0200 Add DEPENDS file commit 14fcb919 Author: David Hammer <dhammer@mailbox.org> Date: Thu Oct 28 20:32:09 2021 +0200 Add links from manager overview to device overviews commit 6929c4e0 Author: David Hammer <dhammer@mailbox.org> Date: Thu Oct 28 19:32:09 2021 +0200 Adding correction step control to scenes commit 9b8eb7f8 Author: David Hammer <dhammer@mailbox.org> Date: Thu Oct 28 18:43:24 2021 +0200 Rudimentary overview scene starting for manager commit 9e1c4a12 Author: David Hammer <dhammer@mailbox.org> Date: Thu Oct 28 12:45:51 2021 +0200 Much better device scene commit b1b330fd Author: David Hammer <dhammer@mailbox.org> Date: Wed Oct 27 16:10:32 2021 +0200 Much more chatty about constant loading commit 5ef4b9f9 Author: David Hammer <dhammer@mailbox.org> Date: Wed Oct 27 15:54:35 2021 +0200 Cleanup commit c0610688 Author: David Hammer <dhammer@mailbox.org> Date: Wed Oct 27 15:54:05 2021 +0200 Properly send gain map as main data / preview commit 317a71c9 Author: David Hammer <dhammer@mailbox.org> Date: Wed Oct 27 14:52:04 2021 +0200 Give schema up front commit 8ecaa1e2 Author: David Hammer <dhammer@mailbox.org> Date: Fri Oct 15 14:53:09 2021 +0200 Small fixes, add more CalCat details commit ac190c2d Author: David Hammer <dhammer@mailbox.org> Date: Tue Oct 12 11:48:46 2021 +0200 Restructure some helper functions commit 0363c184 Author: David Hammer <dhammer@mailbox.org> Date: Tue Oct 12 11:48:02 2021 +0200 Make output axis order fully configurable commit 4fe97baf Author: David Hammer <dhammer@mailbox.org> Date: Mon Oct 11 11:00:06 2021 +0200 Adapt to dynamic manager commit 2d3b0c45 Author: David Hammer <dhammer@mailbox.org> Date: Mon Oct 11 09:01:09 2021 +0200 Fix diff leftover for manager commit 881e00af Merge: dd6a5ecc 885e3464 Author: David Hammer <dhammer@mailbox.org> Date: Mon Oct 11 08:55:41 2021 +0200 Merge branch 'add-agipd-device' of ssh://git.xfel.eu:10022/karaboDevices/calng into add-agipd-device commit dd6a5ecc Author: David Hammer <dhammer@mailbox.org> Date: Fri Oct 8 17:26:32 2021 +0200 Updating correction step configurations for AGIPD commit 35ddb0e6 Author: David Hammer <dhammer@mailbox.org> Date: Fri Oct 8 17:05:58 2021 +0200 flake8, whitespace commit cbeb55dd Author: David Hammer <dhammer@mailbox.org> Date: Fri Oct 8 16:39:13 2021 +0200 Remove incorrect locking commit a017449a Author: David Hammer <dhammer@mailbox.org> Date: Fri Oct 8 16:38:41 2021 +0200 Allow overriding calibration constant ID commit beda6c41 Author: David Hammer <dhammer@mailbox.org> Date: Thu Oct 7 18:02:00 2021 +0200 Removing stale TODOs commit 60f74673 Author: David Hammer <dhammer@mailbox.org> Date: Thu Oct 7 18:01:46 2021 +0200 Setting proper, distinct default values for memoryCells commit 3a29fadf Author: David Hammer <dhammer@mailbox.org> Date: Thu Oct 7 14:41:02 2021 +0200 Clean up, update tests and DSSC device commit 1271d07d Author: David Hammer <dhammer@mailbox.org> Date: Wed Oct 6 13:49:23 2021 +0200 Clean up and remove unused utils commit 6f3026c8 Author: David Hammer <dhammer@mailbox.org> Date: Wed Oct 6 13:41:51 2021 +0200 Clean up rate tracking, state resetting commit f05a2e3c Author: David Hammer <dhammer@mailbox.org> Date: Wed Oct 6 12:40:15 2021 +0200 Add information about found constants, improve loading commit 8620be24 Author: David Hammer <dhammer@mailbox.org> Date: Tue Oct 5 17:02:40 2021 +0200 Start adding scenes commit e1e0cdf4 Author: David Hammer <dhammer@mailbox.org> Date: Tue Oct 5 16:17:59 2021 +0200 Eliminate assignmentMandatory for manager reasons commit 5b1abbb3 Author: David Hammer <dhammer@mailbox.org> Date: Fri Oct 1 11:16:52 2021 +0200 Load calibration_client secrets from very secret JSON file commit 4d5b3072 Author: David Hammer <dhammer@mailbox.org> Date: Thu Sep 30 17:07:39 2021 +0200 WIP replace calibrationBase with CalCat friends commit e6c432a8 Author: David Hammer <dhammer@mailbox.org> Date: Thu Sep 30 13:22:08 2021 +0200 Major WIP: talk to CalCat with tight wrapper around calibration_client commit 028556c5 Author: David Hammer <dhammer@mailbox.org> Date: Mon Sep 27 16:44:13 2021 +0200 Add (re)configurability of bad pixel masking value commit adb87351 Author: David Hammer <dhammer@mailbox.org> Date: Mon Sep 27 13:57:10 2021 +0200 Updating TODOs after discussion with Jola commit 1b40d2ce Author: David Hammer <dhammer@mailbox.org> Date: Thu Sep 23 14:40:59 2021 +0200 Working configurability of bad pixel flags, md_additional_offset commit 276d49b0 Author: David Hammer <dhammer@mailbox.org> Date: Wed Sep 22 15:55:03 2021 +0200 Handle more badpixels shapes commit 14e7737d Author: David Hammer <dhammer@mailbox.org> Date: Wed Sep 22 15:54:30 2021 +0200 Cleanup, update TODOs, docstrings commit 43b679ab Author: David Hammer <dhammer@mailbox.org> Date: Wed Sep 22 15:53:34 2021 +0200 WIP: add handling of fixed gain mode commit 4d38ca5b Author: David Hammer <dhammer@mailbox.org> Date: Wed Sep 22 10:50:05 2021 +0200 Make md_additional_offset configurable commit be61ca63 Author: David Hammer <dhammer@mailbox.org> Date: Tue Sep 21 17:58:07 2021 +0200 Start adding, configuring bad pixel masking commit ab79ee5f Author: David Hammer <dhammer@mailbox.org> Date: Mon Sep 20 15:46:40 2021 +0200 Use explicit cache instead of overriding get commit 02b50039 Author: David Hammer <dhammer@mailbox.org> Date: Fri Sep 17 17:01:02 2021 +0200 Start handling slopes_ff commit 27ff2f6a Author: David Hammer <dhammer@mailbox.org> Date: Fri Sep 17 16:27:51 2021 +0200 Fix test, sanitize slopes_pc constant commit 347dac7c Author: David Hammer <dhammer@mailbox.org> Date: Wed Sep 15 21:31:42 2021 +0200 Improve correction config, constant loading, abstractions, start DRY Quite WIP. Have marked some TODOs. Will add some provisional changes to manager. commit cdacb787 Author: David Hammer <dhammer@mailbox.org> Date: Mon Sep 13 12:32:48 2021 +0200 Reuse correction flag enum definition commit 9c1fee01 Author: David Hammer <dhammer@mailbox.org> Date: Sat Sep 11 00:01:12 2021 +0200 AGIPD device now partially works commit 80f29a07 Author: David Hammer <dhammer@mailbox.org> Date: Fri Sep 10 12:46:52 2021 +0200 Fix offset and rel gain correction + test with real constants commit 3e1522bc Author: David Hammer <dhammer@mailbox.org> Date: Thu Sep 9 15:47:48 2021 +0200 Initial steps towards abstracting base classes, adding AGIPD version commit 885e3464 Author: David Hammer <dhammer@mailbox.org> Date: Fri Oct 8 17:26:32 2021 +0200 Updating correction step configurations for AGIPD commit 24506c46 Author: David Hammer <dhammer@mailbox.org> Date: Fri Oct 8 17:05:58 2021 +0200 flake8, whitespace commit c7924ad8 Author: David Hammer <dhammer@mailbox.org> Date: Fri Oct 8 16:39:13 2021 +0200 Remove incorrect locking commit b0949cb9 Author: David Hammer <dhammer@mailbox.org> Date: Fri Oct 8 16:38:41 2021 +0200 Allow overriding calibration constant ID commit 7bb78f18 Author: Philipp Schmidt <philipp.schmidt@xfel.eu> Date: Fri Oct 8 14:50:49 2021 +0200 manager: Add slot to (re-)apply managed values commit afdb4806 Author: Philipp Schmidt <philipp.schmidt@xfel.eu> Date: Fri Oct 8 14:50:28 2021 +0200 manager: Determine and inject managed correction keys at runtime commit 449d7190 Author: Philipp Schmidt <philipp.schmidt@xfel.eu> Date: Fri Oct 8 14:48:11 2021 +0200 manager: Add fatal device state and minor text fixes commit c8f59f47 Author: Philipp Schmidt <philipp.schmidt@xfel.eu> Date: Fri Oct 8 14:45:10 2021 +0200 manager: Move properties for pipeline instantation to their own node commit 08991599 Author: David Hammer <dhammer@mailbox.org> Date: Thu Oct 7 18:02:00 2021 +0200 Removing stale TODOs commit 631ef106 Author: David Hammer <dhammer@mailbox.org> Date: Thu Oct 7 18:01:46 2021 +0200 Setting proper, distinct default values for memoryCells commit 24328c9a Author: David Hammer <dhammer@mailbox.org> Date: Thu Oct 7 14:41:02 2021 +0200 Clean up, update tests and DSSC device commit b6e1885a Author: David Hammer <dhammer@mailbox.org> Date: Wed Oct 6 13:49:23 2021 +0200 Clean up and remove unused utils commit 33323b67 Author: David Hammer <dhammer@mailbox.org> Date: Wed Oct 6 13:41:51 2021 +0200 Clean up rate tracking, state resetting commit 9248102b Author: David Hammer <dhammer@mailbox.org> Date: Wed Oct 6 12:40:15 2021 +0200 Add information about found constants, improve loading commit fe978184 Author: David Hammer <dhammer@mailbox.org> Date: Tue Oct 5 17:02:40 2021 +0200 Start adding scenes commit beea6b2f Author: David Hammer <dhammer@mailbox.org> Date: Tue Oct 5 16:17:59 2021 +0200 Eliminate assignmentMandatory for manager reasons commit f1e893ee Author: David Hammer <dhammer@mailbox.org> Date: Fri Oct 1 11:16:52 2021 +0200 Load calibration_client secrets from very secret JSON file commit 16b6c16f Author: David Hammer <dhammer@mailbox.org> Date: Thu Sep 30 17:07:39 2021 +0200 WIP replace calibrationBase with CalCat friends commit 59f3935a Author: David Hammer <dhammer@mailbox.org> Date: Thu Sep 30 13:22:08 2021 +0200 Major WIP: talk to CalCat with tight wrapper around calibration_client commit 86c4d7ea Author: David Hammer <dhammer@mailbox.org> Date: Mon Sep 27 16:44:13 2021 +0200 Add (re)configurability of bad pixel masking value commit e092d248 Author: David Hammer <dhammer@mailbox.org> Date: Mon Sep 27 13:57:10 2021 +0200 Updating TODOs after discussion with Jola commit c3a72c6d Author: David Hammer <dhammer@mailbox.org> Date: Thu Sep 23 14:40:59 2021 +0200 Working configurability of bad pixel flags, md_additional_offset commit baab73c1 Author: David Hammer <dhammer@mailbox.org> Date: Wed Sep 22 15:55:03 2021 +0200 Handle more badpixels shapes commit 8cf2dd8d Author: David Hammer <dhammer@mailbox.org> Date: Wed Sep 22 15:54:30 2021 +0200 Cleanup, update TODOs, docstrings commit 8c8319a2 Author: David Hammer <dhammer@mailbox.org> Date: Wed Sep 22 15:53:34 2021 +0200 WIP: add handling of fixed gain mode commit 49240d0d Author: David Hammer <dhammer@mailbox.org> Date: Wed Sep 22 10:50:05 2021 +0200 Make md_additional_offset configurable commit 5275a7a8 Author: David Hammer <dhammer@mailbox.org> Date: Tue Sep 21 17:58:07 2021 +0200 Start adding, configuring bad pixel masking commit 438caf73 Author: David Hammer <dhammer@mailbox.org> Date: Mon Sep 20 15:46:40 2021 +0200 Use explicit cache instead of overriding get commit b54ab5f5 Author: David Hammer <dhammer@mailbox.org> Date: Fri Sep 17 17:01:02 2021 +0200 Start handling slopes_ff commit b7d900af Author: David Hammer <dhammer@mailbox.org> Date: Fri Sep 17 16:27:51 2021 +0200 Fix test, sanitize slopes_pc constant commit b01f4b71 Author: David Hammer <dhammer@mailbox.org> Date: Wed Sep 15 21:31:42 2021 +0200 Improve correction config, constant loading, abstractions, start DRY Quite WIP. Have marked some TODOs. Will add some provisional changes to manager. commit c892b65c Author: David Hammer <dhammer@mailbox.org> Date: Mon Sep 13 12:32:48 2021 +0200 Reuse correction flag enum definition commit c714edee Author: David Hammer <dhammer@mailbox.org> Date: Sat Sep 11 00:01:12 2021 +0200 AGIPD device now partially works commit ad0e189b Author: David Hammer <dhammer@mailbox.org> Date: Fri Sep 10 12:46:52 2021 +0200 Fix offset and rel gain correction + test with real constants commit e3a43d6f Author: David Hammer <dhammer@mailbox.org> Date: Thu Sep 9 15:47:48 2021 +0200 Initial steps towards abstracting base classes, adding AGIPD version commit e3ebc723 Author: David Hammer <dhammer@mailbox.org> Date: Wed Sep 8 10:40:05 2021 +0200 Improve dtype conversion for C(++) code templating commit 44e7fb2f Author: David Hammer <dhammer@mailbox.org> Date: Tue Sep 7 16:09:56 2021 +0200 Send shmem handle paths as part of data commit 41d0cf96 Author: David Hammer <dhammer@mailbox.org> Date: Tue Sep 7 12:22:28 2021 +0200 Use TrainMatcher for groups with support from manager + bridge fix commit f6759a41 Merge: 12e5f41a fe78fd13 Author: David Hammer <dhammer@mailbox.org> Date: Tue Sep 7 12:01:28 2021 +0200 Merge branch 'fix/cleanup-dssc-device' into devel commit 12e5f41a Merge: d780e957 be82ca14 Author: David Hammer <dhammer@mailbox.org> Date: Tue Sep 7 11:59:08 2021 +0200 Merge branch 'fix/deprecate-modulestacker' into devel commit fe78fd13 Author: David Hammer <dhammer@mailbox.org> Date: Tue Sep 7 11:55:29 2021 +0200 Move files, make regular pip installable commit b05f3c07 Author: David Hammer <dhammer@mailbox.org> Date: Tue Sep 7 11:26:44 2021 +0200 Clean up imports, schema commit d780e957 Merge: cba9684c 3cd475c6 Author: David Hammer <dhammer@mailbox.org> Date: Mon Sep 6 16:42:24 2021 +0200 Merge branch 'fix/karabo-2-11-compat' into devel commit cba9684c Author: David Hammer <dhammer@mailbox.org> Date: Mon Sep 6 16:01:21 2021 +0200 Fix: check correct attribute for set on corrections commit 3cd475c6 Author: David Hammer <dhammer@mailbox.org> Date: Fri Sep 3 16:11:27 2021 +0200 Only update output channel part of schema commit be82ca14 Author: David Hammer <dhammer@mailbox.org> Date: Wed Aug 25 20:23:30 2021 +0200 Make ShmemToZMQ compatible with TrainMatcher commit f83d2382 Author: David Hammer <dhammer@mailbox.org> Date: Wed Aug 25 16:58:47 2021 +0200 Add individual source names to their metadata commit 0bbd421a Author: David Hammer <dhammer@mailbox.org> Date: Wed Aug 25 16:48:12 2021 +0200 Add metadata for control sources, too commit f986d186 Author: David Hammer <dhammer@mailbox.org> Date: Thu Sep 2 12:51:46 2021 +0200 Fix two easy bugs before updating deployment In testing, I just found a typo I made yesterday. Also, reopening the SharedMemory even readonly was failing, so I set the bridge to only open once and then change view (as it should, to be fair). Will think about nice encapsulation of this. commit 4ba21910 Merge: df5ff342 9c547e15 Author: David Hammer <dhammer@mailbox.org> Date: Thu Sep 2 12:15:15 2021 +0200 Merge branch 'feat/switch-to-cupy' into devel commit 9c547e15 Author: David Hammer <dhammer@mailbox.org> Date: Wed Sep 1 16:14:57 2021 +0200 Skip redundant call to only_cast, improve warning commit acc84246 Author: David Hammer <dhammer@mailbox.org> Date: Wed Sep 1 13:14:16 2021 +0200 Load cell table for preview correction when main correction is off Was trying to map out behavior of DsscGpuRunner as an FSM and found that this was missing. commit df5ff342 Merge: 78bf590c 29ca3010 Author: David Hammer <dhammer@mailbox.org> Date: Wed Sep 1 12:31:09 2021 +0200 Merge branch 'fix/manager_scs_deploy' into devel commit ffec3d04 Author: David Hammer <dhammer@mailbox.org> Date: Wed Sep 1 11:14:28 2021 +0200 Add configurability to order of output axes commit d2809fca Author: David Hammer <dhammer@mailbox.org> Date: Tue Aug 31 18:37:39 2021 +0200 Additional testing of kernels commit a4afb6d0 Author: David Hammer <dhammer@mailbox.org> Date: Mon Aug 30 20:09:44 2021 +0200 Refactor: correct / cast before reshape commit ca89c24c Author: David Hammer <dhammer@mailbox.org> Date: Mon Aug 30 18:36:41 2021 +0200 Refactor: improve abstractions between device and kernels - Move shared memory buffer from kernel runner / buffer device to correction device itself - Wrap the ring buffer around shmem for convenience - Reused shared memory segment, just change shape of ndarray view of it - Rename kernel runner (was PyCudaPipeline) to DsscGpuRunner - Move all gpu interaction, to DsscGpuRunner - Explicit load methods (should control more FSM-like) - Pulse filter removed temporarily - Part of "splitter" section, gets in the way of next refactoring step - Will add again after switching to correct first, reshape second operation commit 29ca3010 Author: Philipp Schmidt <philipp.schmidt@xfel.eu> Date: Mon Aug 30 15:05:43 2021 +0200 manager: Optionally restore matcher sources and bridge status on instantation commit 2c9caf0f Author: Philipp Schmidt <philipp.schmidt@xfel.eu> Date: Mon Aug 30 15:04:59 2021 +0200 manager: Minor style and formatting fixes commit f5dbfb93 Author: Philipp Schmidt <philipp.schmidt@xfel.eu> Date: Mon Aug 30 15:03:50 2021 +0200 manager: Reset device ID sets before pipeline instantation commit 5bc4774c Author: David Hammer <dhammer@mailbox.org> Date: Thu Aug 26 14:45:55 2021 +0200 Replace PyCUDA calls with naive CuPy alternatives commit 78bf590c Author: David Hammer <dhammer@mailbox.org> Date: Thu Aug 26 09:39:29 2021 +0200 Squashed commit of the following: commit ddc65f71 Author: David Hammer <dhammer@mailbox.org> Date: Wed Aug 25 16:58:47 2021 +0200 Add individual source names to their metadata commit 5ba47ce0 Author: David Hammer <dhammer@mailbox.org> Date: Wed Aug 25 16:48:12 2021 +0200 Add metadata for control sources, too commit 9251066c Merge: d823b6d7 862bac15 Author: David Hammer <dhammer@mailbox.org> Date: Wed Aug 25 13:34:02 2021 +0200 Merge remote-tracking branch 'origin/fix/manager_scs_deploy' into devel commit d823b6d7 Author: David Hammer <dhammer@mailbox.org> Date: Wed Aug 25 13:12:01 2021 +0200 Merge fix to overlap shmem buffers when changing shapes commit 862bac15 Author: Philipp Schmidt <philipp.schmidt@xfel.eu> Date: Tue Aug 24 19:12:11 2021 +0200 manager: Add bridge pattern to module group schema commit 95fc3c3d Merge: 2294ae4d 9890058a Author: David Hammer <dhammer@mailbox.org> Date: Tue Aug 24 13:32:01 2021 +0200 Merge remote-tracking branch 'origin/fix/stacker_timestamp_metadata' into devel commit 9890058a Author: David Hammer <david.hammer@xfel.eu> Date: Tue Aug 24 13:29:17 2021 +0200 Write explicit metadata with timestamp incl. tid commit 2294ae4d Author: Philipp Schmidt <philipp.schmidt@xfel.eu> Date: Tue Aug 24 11:35:47 2021 +0200 manager: Fix key access to possibly not defined modules commit 57af38d6 Author: Philipp Schmidt <philipp.schmidt@xfel.eu> Date: Tue Aug 24 11:35:15 2021 +0200 manager: Fix use of instantiance rather than _instantiate_device commit e9b938a0 Author: Philipp Schmidt <philipp.schmidt@xfel.eu> Date: Tue Aug 24 11:33:55 2021 +0200 manager: Remove erroneous :dataOutput suffix for source names commit 35f2a11c Author: Philipp Schmidt <philipp.schmidt@xfel.eu> Date: Tue Aug 24 08:52:23 2021 +0200 manager: Fix await on no wait functions commit 73838099 Author: David Hammer <dhammer@mailbox.org> Date: Tue Aug 24 08:16:09 2021 +0200 Fix inconsistent casing commit 88fb25bf Author: David Hammer <dhammer@mailbox.org> Date: Mon Aug 23 16:29:25 2021 +0200 Adding additional prototypes used for SQS field test commit 0a03942a Author: David Hammer <dhammer@mailbox.org> Date: Mon Aug 23 09:04:12 2021 +0200 Conforming to Karabo versioning, folder structure commit a867e289 Author: Philipp Schmidt <philipp.schmidt@xfel.eu> Date: Mon Aug 23 16:07:33 2021 +0200 manager: Track all instances of DAQ and calibration devices commit 9a3664e2 Author: Philipp Schmidt <philipp.schmidt@xfel.eu> Date: Mon Aug 23 16:06:04 2021 +0200 manager: Do not wait to set properties and call slots commit 0f1313bd Author: Philipp Schmidt <philipp.schmidt@xfel.eu> Date: Mon Aug 23 16:05:32 2021 +0200 manager: Always wire group bridge up to the matcher commit fde273ed Author: Philipp Schmidt <philipp.schmidt@xfel.eu> Date: Fri Aug 20 19:53:46 2021 +0200 Move CalibrationManager to calng package commit fdd09d1e Merge: 39f2ee37 d492646f Author: Philipp Schmidt <philipp.schmidt@xfel.eu> Date: Fri Aug 20 19:52:00 2021 +0200 Merge branch 'add-manager-device' into 'devel' Add manager device See merge request karaboDevices/calng!2 commit d492646f Author: Philipp Schmidt <philipp.schmidt@xfel.eu> Date: Fri Aug 20 15:13:34 2021 +0200 manager: Minor flake8 fixes and style commit 0cf9539f Author: Philipp Schmidt <philipp.schmidt@xfel.eu> Date: Fri Aug 20 15:10:19 2021 +0200 manager: Ignore instantation exception when device already exists commit 0e7bd357 Author: Philipp Schmidt <philipp.schmidt@xfel.eu> Date: Mon Aug 16 17:26:36 2021 +0200 Add initial manager implementation commit 39f2ee37 Merge: 309df7f8 fed7e76d Author: David Hammer <dhammer@mailbox.org> Date: Fri Aug 20 17:32:54 2021 +0200 Merge branch 'add-dssc-device' of ssh://git.xfel.eu:10022/karaboDevices/calng into add-dssc-device commit 309df7f8 Author: David Hammer <dhammer@mailbox.org> Date: Fri Aug 20 11:39:08 2021 +0200 Removing fields required by old manager commit 36b204df Author: David Hammer <dhammer@mailbox.org> Date: Fri Aug 20 11:20:37 2021 +0200 Update descriptions commit f2fc2e03 Author: David Hammer <dhammer@mailbox.org> Date: Thu Aug 19 11:37:05 2021 +0200 Tuple syntax for schema definition commit 8a43aaa8 Author: David Hammer <dhammer@mailbox.org> Date: Thu Aug 19 11:05:54 2021 +0200 Directly import Karabo symbols commit 4f18e1bb Author: David Hammer <dhammer@mailbox.org> Date: Thu Aug 19 10:54:09 2021 +0200 Adding rudimentary testing of kernels commit bc476c48 Author: David Hammer <dhammer@mailbox.org> Date: Mon Aug 16 16:39:53 2021 +0200 Renaming to DsscCorrection commit 53cca8ca Author: David Hammer <dhammer@mailbox.org> Date: Mon Aug 16 16:35:21 2021 +0200 Hotfixes applied during beamtime at SQS commit d70a481b Author: David Hammer <dhammer@mailbox.org> Date: Tue Aug 10 16:58:33 2021 +0200 Adding new correction device snapshot commit fed7e76d Author: David Hammer <dhammer@mailbox.org> Date: Fri Aug 20 11:39:08 2021 +0200 Removing fields required by old manager commit 60dc9ac9 Author: David Hammer <dhammer@mailbox.org> Date: Fri Aug 20 11:20:37 2021 +0200 Update descriptions commit 3673e6fc Author: David Hammer <dhammer@mailbox.org> Date: Thu Aug 19 11:37:05 2021 +0200 Tuple syntax for schema definition commit fa93b871 Author: David Hammer <dhammer@mailbox.org> Date: Thu Aug 19 11:05:54 2021 +0200 Directly import Karabo symbols commit ac127d01 Author: David Hammer <dhammer@mailbox.org> Date: Thu Aug 19 10:54:09 2021 +0200 Adding rudimentary testing of kernels commit ca294307 Author: David Hammer <dhammer@mailbox.org> Date: Mon Aug 16 16:39:53 2021 +0200 Renaming to DsscCorrection commit 4b6ce2ce Author: David Hammer <dhammer@mailbox.org> Date: Mon Aug 16 16:35:21 2021 +0200 Hotfixes applied during beamtime at SQS commit bcbb87ed Author: David Hammer <dhammer@mailbox.org> Date: Tue Aug 10 16:58:33 2021 +0200 Adding new correction device snapshot
-
- Jun 27, 2022
-
-
David Hammer authored
-