Dhanya Thattil
e71f68d31b
reverted versions as the firmware dont increment ( #590 )
2022-11-29 16:36:54 +01:00
Dhanya Thattil
d431443dda
allowing jungfrau to continue with just a waning if detid.txt file not found ( #589 )
2022-11-29 16:28:55 +01:00
Dhanya Thattil
4ada8c79ed
allowing jungfrau to continue with just a waning if detid.txt file not found ( #589 )
2022-11-29 16:28:24 +01:00
843edfbf06
release notes
2022-11-29 16:12:43 +01:00
a42ef3b591
release notes
2022-11-28 16:25:22 +01:00
44d9294270
release notes
2022-11-28 16:24:56 +01:00
c472a8f547
release notes
2022-11-28 13:52:47 +01:00
aaab1e306c
udate
2022-11-25 17:06:41 +01:00
ae0a54a774
Merge branch 'main' into 6.1.2.rc
2022-11-25 16:12:02 +01:00
Erik Fröjdh
ae33622da2
updated pybind and catch ( #588 )
...
* updated pybind and catch
* added to release notes
Co-authored-by: Erik Frojdh <erik.frojdh@psi.ch>
2022-11-25 16:08:36 +01:00
81cc6b0836
release notes and help on python exptime help
2022-11-25 16:02:59 +01:00
Dhanya Thattil
34acf553a1
updated det spec fields for jungfrau and g2 ( #587 )
2022-11-25 11:00:16 +01:00
Dhanya Thattil
a2f41c13b7
fixed clang compiler warnings ( #586 )
2022-11-25 11:00:02 +01:00
c4a453fdbd
updated release version
2022-11-25 10:31:10 +01:00
672c0f4a07
updated client date
2022-11-25 10:26:23 +01:00
05af370883
update server bin
2022-11-25 10:23:49 +01:00
a6022b7cec
updated release notes and eiger server
2022-11-25 10:18:37 +01:00
72316fa2ce
release notes
2022-11-25 10:09:15 +01:00
65523dcc94
release notes
2022-11-25 10:08:17 +01:00
Erik Fröjdh
255a75a646
merge from 6.1.2.rc for stop detector (eiger)
2022-11-25 09:59:14 +01:00
Erik Fröjdh
df40665c5e
Using a loop to stop ( #585 )
...
* loop for stop, 10 retries
For example, if module A got a "stop" during an acquisition, it stops to an 'Idle' state. If module B gets a "stop" before an acquisition, it will return it is in 'Idle' state and continue to start the next acquisition, but module B then waits for "ready for trigger" synchronization from module A, which it will never get. Since module B missed the asynchronous stop command, the workaround in the client is to send another "stop" command (upto 10 retries) till it returns Idle.
2022-11-25 09:55:51 +01:00
Dhanya Thattil
61c31ed44a
txdelay for all modules ( #584 )
...
* setting txdelay for all modules for eiger, jungfrau and m3
* added txdelay in python and renamed txndelay_ to txdelay_
* call in parallel
2022-11-24 11:57:26 +01:00
928d778fb1
formatting
2022-11-24 11:25:47 +01:00
Dhanya Thattil
2ff5291f48
hardware version ( #580 )
...
* hardware version for all dets except eiger
Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
2022-11-24 11:24:05 +01:00
Dhanya Thattil
cd270160d8
documentation about installation and python getting started ( #582 )
...
* updated installation documention, added Python find virtual env flag
2022-11-23 12:04:45 +01:00
Dhanya Thattil
911b2f678f
jungfrau module id ( #581 )
...
* connected module id to detid_jungfrau.txt
* fixed module id register in jungfrau
2022-11-23 12:01:22 +01:00
Erik Fröjdh
8dbcfc2ca8
Static internal build of qwt ( #583 )
...
* static linking of qwt
* suppressed warning in qwt + added reason
2022-11-23 11:59:22 +01:00
2d6cb52dfa
Modified moenchZmqProcess.cpp to reflect changes made to the detector header (bunchId -> detSpec1; debug -> detSpec3; roundRnumber -> detSpec4)
2022-11-23 10:58:55 +01:00
57e7b51704
Added command line options to plotPattern.py
2022-11-21 12:39:18 +01:00
f6241f7a5e
formatting
2022-11-18 14:26:58 +01:00
2dcf4a7144
fixed warnings
2022-11-18 11:19:01 +01:00
33e2155db1
Added plotPattern.py for the new pattern generator for the new firmware (6 loops, 6 waits)
2022-11-18 10:30:25 +01:00
8472cca81f
naming
2022-11-17 17:15:05 +01:00
39a87ffcd9
release notes
2022-11-17 16:57:35 +01:00
Dhanya Thattil
5ea2cdb83d
fix to allow all clks for pll (totaldiv was float instead of int) ( #579 )
2022-11-17 16:39:17 +01:00
Dhanya Thattil
4bb1a612f1
changed detector header version to detector specific field names and incremented version number, also for zmq ( #574 )
2022-11-17 15:24:12 +01:00
Dhanya Thattil
110e57ff6c
Eiger stop lock ( #576 )
...
* added a lock when stopping or starting state machine in eiger server
* added 5ms right after acq started to make sure it really started
* added 100ms right after acq started to make sure it really started
2022-11-17 15:23:41 +01:00
Dhanya Thattil
f108ec82ea
destruct arping thread in Arping desturctor ( #578 )
2022-11-17 15:22:54 +01:00
Dhanya Thattil
74a2f07c7d
merge from develpoer, locking complete set of start acq steps and stop steps in eiger server as it shouldnt be interrutped, moved prepare into startstatemachine ( #577 )
2022-11-17 14:58:53 +01:00
a921368dea
Updated generator.c: patioctrl, loops and timeouts are only generated if they exist in the pattern source
2022-11-17 10:57:42 +01:00
b432c70076
Moved location of patternGenerator directory.
...
Updated generator.c to include 3 additional timers and loops
2022-11-16 17:47:54 +01:00
fdd6031add
renaming for version
2022-11-15 08:50:39 +01:00
06fc48b115
update release notes
2022-11-11 17:16:34 +01:00
Dhanya Thattil
bf3333b97b
show fpga temp in developer tab in gui, virtual servers just show warning if no temperature file in /tmp to read (dont throw exception) ( #573 )
2022-11-11 17:15:15 +01:00
e7c65f44cb
returning empty fail message for eiger
2022-11-11 16:56:58 +01:00
0063cc8eb2
update release notes
2022-11-11 16:51:20 +01:00
27e6fc3c73
serverbin shortcuts
2022-11-11 16:02:57 +01:00
83e0eb8b01
removed the test for allow update for kernel and server as it is eligible if the kernel is booting up anyway
2022-11-11 16:02:17 +01:00
7f8b5ac6c0
blackfin nCE pin fix for new kernel
2022-11-11 15:31:30 +01:00
Dhanya Thattil
38cd10d4e6
Qt5 built in qwt ( #570 )
...
- qt4->qt5
- in built qt5 6.1.5 because rhel7 is not upto date with qt5, removed findqwt.cmake
- made a fix in qwt lib (qwt_plot_layout.h) to work with 5.15 and lower versions for qrect constr.
- qt5 forms fixed, qt4 many hard coding forms switched to forms including qtabwidget, scrolls etc, fonts moved to forms
- docking option enabled by default, removed option to disable docking feature from "Mode"
- added qVersionResolve utility functions to handle compatibility before and after qt5.12
- qtplots (ian's code) takes in gain mode enable to set some settings within the class, with proper gain plot ticks
- ensure gain plots have no zooming of z axis in 2d and y axis in 1d
- removed placeholder text in qpalette in main window form as its not supportd until 5.12 (so using qt5.9 designer insted of qt5.15 to cope)
- tab order
Servers:
- fixed some error messages that were empty for fail in funcs (mostly minor as if this error, major issues)
2022-11-11 15:15:10 +01:00
