69d63c4e11
Nevermind! Updated code reference
2025-08-29 09:20:00 +02:00
01dd256858
Minor changes, final backup. It's been real nice here at PSI.
2025-08-29 09:19:07 +02:00
0e01193240
Did some renaming to make things make sense
2025-08-27 14:49:12 +02:00
a590027c44
Added ease-of-access function update_parameters to OTFModule. Updated code reference
2025-08-27 14:26:11 +02:00
558bbfded9
Avoided setup-dependent error (file structuring). Implemented TNMR application search and re-open if it closes. This will not fix any particularly odd situations, but it will recover the majority of TNMR crashes and user error.
2025-08-15 11:15:10 +02:00
bee3f5615a
Figured out the answer to a question posed by one of my comments in the past
2025-08-12 11:33:01 +02:00
f0d83e47d8
Merge remote-tracking branch 'refs/remotes/origin/tnmr' into tnmr
2025-08-12 11:24:04 +02:00
7e5b47d45f
Can now change the number of acquired points. This, with the ability to change the acquisition length, allows one to control dwell time indirectly
2025-08-12 11:23:35 +02:00
97e52fd27c
OTFModule: Forced some status updates
2025-08-06 14:13:06 +02:00
904db04447
Update
2025-08-05 14:31:48 +02:00
7a5694fbe2
Merge branch 'tnmr' of https://gitea.psi.ch/linse/frappy into tnmr
2025-08-05 10:34:02 +02:00
b3d243d831
safety
2025-08-05 10:33:59 +02:00
7bfc6b3cb8
Live data acquisition over SECoP
2025-07-30 13:56:25 +02:00
e77c48ace0
Added functionality for the TNMR module to write partial scans - useful for long experiments with many acquisitions, which might need to be terminated early. Also good for impatient people. Added functionality to the ZVL Network Analyser module to allow for use of inbuilt data correction (calibration).
2025-07-29 14:31:24 +02:00
d5d9d70713
Fixed weird bug where the length of pulse sequences could never increase. Now, they have a hard limit of 100 pulses. Not a big deal.
2025-07-24 11:24:56 +02:00
1777e4b7b1
debug
2025-07-24 10:41:02 +02:00
1990f906a3
debug
2025-07-24 10:39:03 +02:00
c2f4df30eb
debug
2025-07-24 10:27:42 +02:00
1ded495e4a
debug
2025-07-24 10:25:59 +02:00
bdf0d4f8ae
Fix
2025-07-24 09:51:33 +02:00
ef769773f0
Prevented infinite loop
2025-07-24 09:39:25 +02:00
fc44f5597f
Reversed removal of title property from otfmod
2025-07-23 11:47:05 +02:00
ff75c9ecbf
Fixed a bug in the OTFModule
2025-07-23 11:42:30 +02:00
2194085e8e
Merge branch 'tnmr' of https://gitea.psi.ch/linse/frappy into tnmr
2025-07-21 17:10:53 +02:00
7adf4bf452
on the fly
2025-07-21 17:10:50 +02:00
00e662a27f
Added a message to the ZVL net analyser
2025-07-21 15:41:40 +02:00
d7b45cd163
Fixed a bug in tnmr interface, added functionality to load calibration files in ZVL net analyser
2025-07-21 15:38:39 +02:00
730aa61789
Cleaned up
2025-07-21 10:12:47 +02:00
ccd15f50e7
Added the capacitance reading device (based on TSSOP16, paired with an Arduino Nano V3, communication over serial) to the PSI NMR setup
2025-07-11 11:34:48 +02:00
5dfe929da5
Updates to OTF, and added RP100 strain cell power supply, as well as a couple network analysers. Results from the mRS network analyser are questionable at best, and nonsense at worst. Beware.
2025-07-09 13:02:24 +02:00
10acd4a188
TNMR updates: workaround for the hardware module error. Added more dashboard support. Added class definition auto-generated by pycom (NTNMR.py)
2025-06-30 13:55:21 +02:00
388748c995
Fixed hardware issue?
2025-06-24 11:35:32 +02:00
2fce39c381
frappy_psi: Added support for changing the observation frequency & number of scans. Further, added an automatic dashboard load on file setup, and a template dashboard for the Scout device.
2025-06-13 07:58:25 +02:00
365f0a2374
A few things: 1. Got it working again; 2. Renamed files to make more sense; 3. Replaced template tmp.tnt with an emptied out file that previously took data, now data is collected correctly (bug, I'm not sure where this need comes from but this is, as far as I know, a permanent workaround); 4. Added automatic COM interface restart on errors compiling; 5. Implemented variable acquisition times.
2025-06-12 11:04:57 +02:00
05324a8966
frappy_psi.tnmr: added a module (frappy_psi.tnmr.OTFModule) to interface with the Tecmag NMR (TNMR) program from a frappy server.
2025-06-11 08:50:21 +02:00
5436e34179
frappy_psi/ls370res: various bug fixes
...
- avoid some error messages on disabled channels
- update value of channel switcher properly
- fix bug in set_param method
Change-Id: I16f5cf2d7abce0c0fae17266f0c8e949e8416b7a
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/36263
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2025-05-06 14:55:16 +02:00
21b8fd6518
add sim-server again based on socketserver
...
- fix ls370test config file
+ fix issues with frappy_psi.ls370res
+ add frappy_psi.ls370sim
Change-Id: Ie61e3ea01c4b9c7c1286426504e50acf9413a8ba
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34957
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-11-19 08:54:40 +01:00
Jens Krüger
a9636572bb
PSI: Fix import error on ThermoFisher module
...
Change-Id: I691d8f5057fdb19ba14c109399417a7ee9962637
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34954
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-11-14 08:16:50 +01:00
ccc976984d
frappy_psi.sea: bugfix: revert change of updateEvent to udpateItem
...
revert some of change 34813
SeaClient is based on ProxyClient, not SecopClient
-> updateItem is not defined there
Change-Id: Ib3049038481917ec7a11b9fb2d285cedff5febbb
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34873
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-10-24 14:59:00 +02:00
ffe5f52790
frappy_psi.sea: avoid error on import
...
the previous code raised an error when generalConfig.init() was
not called before importing. defer evaluation of seaconfdir to
the time it is used
+ use updateItem instead of updateEvent to avoid pylint complaint
Change-Id: I0da0891a8d4091102d2a149705f5546e2f6fd187
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34813
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2024-10-16 11:15:27 +02:00
Alexander Zaft
e1458471a8
psi: change open calls in sea
...
Change-Id: I4fe235027df4ea935d84e29895eb280f620afbdf
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34665
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-09-23 08:07:23 +02:00
Alexander Zaft
c550721e2d
generalConfig, config: use pathlib
...
- switch to pathlib
- represent multiple confdirs as list of Paths internally, not string
with pathsep
Change-Id: I1418e561641e27cd904af0762be056cd66ee1919
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34464
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-09-19 13:34:14 +02:00
Jens Krüger
fb9e713043
SINQ/SEA: Fix import error due to None value
...
If the environment variable isn't set a None value is returned. Now an
empty string will be returned
Fixes : #4882
Change-Id: I3e319daebf10e2d8ea3ee00f6094e6896e54f51b
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34234
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Reviewed-by: Jens Krueger <jens.krueger@tum.de >
2024-08-05 10:12:38 +02:00
e0e90c4000
frappy_psi.sea: use raise from
...
this was complained by Jenkins after merging (1)
Change-Id: I9e4eb57004d218021978d6e9e06e1cbd42ec5e9c
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34024
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-06-24 17:03:47 +02:00
81002c2568
frappy_psi.sea: use ReadFailedError
...
change error class on reading parameters in SEA from HardwareError
to ReadFailed. This is in most cases more appropriate.
TODO: find errors in SEA that should be should be HardwareErrors
and a mechanism to indicate this
+ for errors related to disabled modules use the DISABLED status
Change-Id: I0342a34185a66dcf874c6ca034b7cefc98bf9c8a
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34022
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-06-24 13:40:33 +02:00
185b47a471
frappy_psi.triton: fix heater output issue
...
when output_module is not HeaterOutputWith range, the heater limit
can not be changed
Change-Id: If25a609e9f9667dc111cb220024388a51df993ec
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33913
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-06-12 11:26:58 +02:00
7dc4cf7029
frappy_psi.sea: various improvments
...
- always open asynio and syncio connections (conenctions for
update and command)
- better synchronization when reconnecting using threading.Event
- nicer error messages
Change-Id: Ia435c3ccfa2732be4aa9f24a3b6e8484fab715a3
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33909
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-06-12 10:54:00 +02:00
924a9a2c7f
frappy_psi.triton: bug fixes
...
- fix channel numbers
- make sure some channels are selected
Change-Id: I11c553805ed5ee6235e54ce56a5ea68160d1d212
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33911
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-06-12 10:53:41 +02:00
36dd7598cc
frappy_psi.picontrol: software control loop
...
example usage: use a temperature controller without changing
the calibration setting:
reading the raw sensor, calibrate by software and use 'manual'
heater output
Change-Id: I3dbcf37e7726b48a0516d7aa30758be52b80fe58
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33910
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-06-12 10:53:18 +02:00
0641bc22c3
frappy_psi.ah2700: auto create loss module with Pinata
...
the loss angle is a separate quantity, which is preferred to
be an extra module. create this automatically.
Change-Id: I97f6be48f3411d8143f2ff85c2c61711fc71e8d6
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33908
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-06-12 10:52:50 +02:00
