f26d8e514b
merged with g2continuous
2020-09-08 08:46:37 +02:00
0b9ff70244
binaries in
2020-09-08 08:25:24 +02:00
e82e531fb1
server arguments like linux
2020-09-08 08:18:48 +02:00
503f83e8e3
Merge branch 'developer' into g2continuous
2020-09-07 17:07:09 +02:00
Erik Frojdh
1a90c58d9e
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
2020-09-07 16:52:07 +02:00
Erik Frojdh
c467bd677e
missing file
2020-09-07 16:52:03 +02:00
f280d033b9
binarie sin
2020-09-07 16:44:48 +02:00
c9cf845c9a
WIP
2020-09-07 16:44:26 +02:00
Dhanya Thattil
63bbbfb438
Merge pull request #166 from slsdetectorgroup/rxrmetadata
...
Rxrmetadata
2020-09-07 16:37:55 +02:00
5540f16116
Merge branch 'developer' into g2continuous
2020-09-07 16:36:42 +02:00
a77833b4c7
Merge branch 'developer' into g2continuous
2020-09-07 16:36:00 +02:00
Erik Frojdh
9ee67f2cfa
python rx_jsonpara
2020-09-07 16:23:28 +02:00
cf3758f155
Merge branch 'developer' into rxrmetadata
2020-09-07 16:15:56 +02:00
b20720686e
gotthard2: changed order of burst mode enums, added a 4th burst mode cw internal burst mode
2020-09-07 16:13:33 +02:00
Dhanya Thattil
1edb1e8816
GUI: adding 1D detectors by default in x direction, others in y dir ( #164 )
2020-09-07 13:03:15 +02:00
30e06c6386
Merge branch 'developer' into rxrmetadata
2020-09-07 11:53:41 +02:00
ea601fe1f7
lock to ensure json add header can be updated on the fly
2020-09-07 11:52:51 +02:00
f0c576c779
WIP
2020-09-07 11:15:51 +02:00
Erik Frojdh
fb8842e048
build and libname
2020-09-07 09:14:47 +02:00
5b182469a1
rxr: fixed all updates from rxParameters, connected them in masterAttributes, added json header and scan parametes in metadata
2020-09-04 13:49:30 +02:00
Erik Frojdh
a1b88d3a62
fix
2020-09-04 11:20:33 +02:00
Erik Frojdh
514346c3ba
static support lib
2020-09-04 11:00:34 +02:00
9218ef5a95
Merge branch 'developer' into rxrmetadata
2020-09-03 18:02:05 +02:00
b124cea67b
Merge branch 'developer' into rxrmetadata
2020-09-03 17:48:03 +02:00
Dhanya Thattil
497eff6f04
Merge pull request #163 from slsdetectorgroup/guitrimval
...
gui: enable trimming for m3
2020-09-03 17:38:04 +02:00
92635c5bd3
mythen3 gui: trimbit files feature enabled
2020-09-03 17:36:23 +02:00
a00231dab6
m3 gui: enabled trimval feature
2020-09-03 17:21:37 +02:00
Erik Frojdh
35c7e46d60
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
2020-09-03 17:20:48 +02:00
Erik Frojdh
47da2540af
json
2020-09-03 17:20:38 +02:00
891b8dbd2c
mythen3: wrong hardware version number, so it didnt reboot after programfpga
2020-09-03 17:04:58 +02:00
Erik Frojdh
89f0479318
txndelay in python
2020-09-03 16:30:13 +02:00
Erik Frojdh
7048a75808
triggersl and print fix for acq
2020-09-03 16:21:15 +02:00
a081fbbdaa
Merge branch 'developer' into rxrmetadata
2020-09-03 15:52:01 +02:00
Erik Frojdh
22f14cacb0
virtual and vetofile
2020-09-03 15:33:12 +02:00
Erik Frojdh
6b7dee2631
added versions and parallel to python
2020-09-03 11:49:08 +02:00
Dhanya Thattil
6d1856daa2
gui: added burstmode ( #159 )
...
Added burst mode in the GUI. Visible only for detectors that supports it.
2020-09-03 10:47:02 +02:00
7bb9696151
Merge branch 'developer' into rxrmetadata
2020-09-02 18:07:22 +02:00
Dhanya Thattil
44335f9cf4
Merge pull request #157 from slsdetectorgroup/g2printout
...
G2printout
2020-09-02 17:04:15 +02:00
d62d5ef804
binaries in
2020-09-02 17:03:19 +02:00
dbaab61ea2
g2: print ns in server before converting to freq
2020-09-02 17:02:12 +02:00
Dhanya Thattil
180c7b7191
Gui slot call focus fix ( #150 )
...
* fix for editingFinished for qlineedit using isModified()
* spinbox disable keyboard tracking to use valuechanged so slot called only after editing finished, focus fix
* return pressed forces qtextfield to be set (slot for tab checks for modification flag due to avoid unnecessary set when focus). This is to remove inconsistencies from command line. A return should set even if it looks like no modification in gui
Co-authored-by: Erik Fröjdh <erik.frojdh@gmail.com>
2020-09-02 16:56:57 +02:00
Dhanya Thattil
050f0ff8a0
Merge pull request #156 from slsdetectorgroup/g2clkchange
...
gotthard2: change default clock divider of readout clocks 1 and 2 fro…
2020-09-02 16:50:32 +02:00
658a804cca
gotthard2: change default clock divider of readout clocks 1 and 2 from 8 to 6
2020-09-02 16:48:58 +02:00
Erik Frojdh
73530ddd6f
python udp_srcmac
2020-09-02 16:48:51 +02:00
abe34d573c
WIP
2020-09-02 16:15:33 +02:00
Erik Frojdh
05d5652532
exptime example
2020-09-02 12:32:14 +02:00
Erik Frojdh
38e0351068
zmqports work like command line
2020-09-02 12:20:08 +02:00
Erik Frojdh
e192cad1f2
zmqport fix
2020-09-02 12:07:47 +02:00
Erik Frojdh
b8350b070e
rx_zmqip fix
2020-09-02 11:55:27 +02:00
Erik Frojdh
3ddeea3c2b
minor fix docs
2020-09-02 11:44:13 +02:00
