Perpetual development branch #25

Merged
mohacsi_i merged 19 commits from development into main 2025-04-28 17:42:39 +02:00

19 Commits

Author SHA1 Message Date
gac-x05la
b3e0a64bf1 Found out stdDAQ filename problem 2025-04-28 17:37:17 +02:00
gac-x05la
672cb60e72 Works without stdDAQ 2025-04-17 14:21:27 +02:00
gac-x05la
2d23c5e071 Verifying scan compatibility 2025-04-17 13:01:22 +02:00
gac-x05la
9a878db49a Device code to 9.6 2025-04-16 15:47:28 +02:00
gac-x05la
3689ec0677 Merging development 2025-04-16 15:28:54 +02:00
gac-x05la
f3961322e3 WIP 2025-04-16 15:23:25 +02:00
gac-x05la
4437bb13b8 WIP 2025-04-16 15:01:06 +02:00
bea5f95503 Merge branch 'main' into 'feature/revisiting-aerotech'
# Conflicts:
#   tomcat_bec/device_configs/microxas_test_bed.yaml
#   tomcat_bec/devices/aerotech/AerotechDriveDataCollection.py
#   tomcat_bec/devices/gigafrost/gigafrostcamera.py
#   tomcat_bec/devices/gigafrost/pcoedgecamera.py
#   tomcat_bec/scans/__init__.py
#   tomcat_bec/scans/tutorial_fly_scan.py
2025-04-16 14:10:42 +02:00
gac-x05la
56f4a6a61e Cutting back on unittests 2025-04-16 14:03:22 +02:00
gac-x05la
e02bb5892e WIP 2025-03-03 12:20:56 +01:00
gac-x05la
4266798e30 Bump 2025-02-25 14:31:46 +01:00
gac-x05la
f15fd00712 After session with Klaus 2025-02-20 12:42:33 +01:00
gac-x05la
76cf6ac447 New additions from klaus 2025-02-19 16:58:25 +01:00
gac-x05la
0bc3778d3f Before redeployment 2025-02-19 10:18:57 +01:00
gac-x05la
9d104173bd Work on fede scans 2025-02-18 18:50:04 +01:00
gac-x05la
f6fecfdc3f WIP with Fede's scans 2025-02-17 17:46:52 +01:00
gac-x05la
e8b3aedb10 Trigger mode notes 2025-02-14 17:46:27 +01:00
gac-x05la
c3cf12b8e2 SnapNStep works, Sequence fails on Aerotech axis 2025-02-14 17:39:36 +01:00
gac-x05la
d1e072b8d9 Delayed start on Aerotech tasks 2025-02-14 13:48:47 +01:00