|
|
11e7d89da3
|
Merge branch 'developer' into pydoc
|
2020-09-10 12:01:38 +02:00 |
|
Erik Frojdh
|
34043c358f
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2020-09-10 11:53:31 +02:00 |
|
Erik Frojdh
|
da9c7c354e
|
adc-
|
2020-09-10 11:53:17 +02:00 |
|
Dhanya Thattil
|
4d499e231d
|
Merge pull request #178 from slsdetectorgroup/eigertempblockingfix
eiger temp fix: tempfpgafl and tempfpgafr cannot be used during block…
|
2020-09-10 11:48:31 +02:00 |
|
|
|
0a7809286b
|
eiger temp fix: tempfpgafl and tempfpgafr cannot be used during blocking acquire as it goes through control server now
|
2020-09-10 11:47:42 +02:00 |
|
Dhanya Thattil
|
3cd4f3897b
|
M3: software trigger (#175)
|
2020-09-10 10:15:45 +02:00 |
|
|
|
02d4769f6a
|
WIP
|
2020-09-09 16:39:48 +02:00 |
|
|
|
67f1f9924a
|
m3:software trigger
|
2020-09-08 15:45:35 +02:00 |
|
|
|
8e49a114db
|
moench: removed api that goes only to processor (future: one has to use rX_jsonaddheader or rx_jsonpara to set key and values)
|
2020-09-08 12:34:56 +02:00 |
|
|
|
311cebcd00
|
m3:added parallel mode
|
2020-09-08 12:16:02 +02:00 |
|
|
|
503f83e8e3
|
Merge branch 'developer' into g2continuous
|
2020-09-07 17:07:09 +02:00 |
|
|
|
a77833b4c7
|
Merge branch 'developer' into g2continuous
|
2020-09-07 16:36:00 +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 |
|
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
|
514346c3ba
|
static support lib
|
2020-09-04 11:00:34 +02:00 |
|
|
|
abe34d573c
|
WIP
|
2020-09-02 16:15:33 +02:00 |
|
|
|
42b5ff3a62
|
WIP, doc
|
2020-09-02 10:25:36 +02:00 |
|
|
|
e4274e3f95
|
WIP, doc
|
2020-08-31 14:17:09 +02:00 |
|
|
|
e0df9fcd99
|
wip, doc
|
2020-08-28 19:47:19 +02:00 |
|
|
|
30307220e3
|
QIP, doc
|
2020-08-28 18:12:08 +02:00 |
|
|
|
b5669dc921
|
WIP, doc
|
2020-08-28 10:57:21 +02:00 |
|
|
|
abd2808924
|
WIP, doc
|
2020-08-27 18:00:19 +02:00 |
|
|
|
786b14e88b
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2020-08-27 17:58:21 +02:00 |
|
|
|
f19799343e
|
WIP, doc
|
2020-08-27 17:58:15 +02:00 |
|
Erik Frojdh
|
2e4783f296
|
sort and remove duplicates before sending rxdbitlist
|
2020-08-27 17:08:53 +02:00 |
|
Erik Fröjdh
|
7eafceb0f9
|
Exposing vector of strings for loading parameters (#147)
|
2020-08-27 16:17:56 +02:00 |
|
|
|
27c1916d63
|
WIP, doc
|
2020-08-26 17:45:12 +02:00 |
|
|
|
6d8168722a
|
WIP, doc
|
2020-08-26 11:11:51 +02:00 |
|
|
|
d44388a44e
|
mv to mV
|
2020-08-25 17:27:29 +02:00 |
|
Erik Frojdh
|
0253933271
|
newline in command docs
|
2020-08-25 14:46:06 +02:00 |
|
|
|
bc09b8bfb9
|
WIP doc
|
2020-08-21 17:13:43 +02:00 |
|
|
|
e85326d415
|
WIP doc
|
2020-08-21 16:00:33 +02:00 |
|
|
|
396685e6a9
|
WIP doc
|
2020-08-21 15:25:47 +02:00 |
|
|
|
cf6a48d7a9
|
WIP doc
|
2020-08-21 13:20:32 +02:00 |
|
|
|
4f45110cda
|
WIP doc
|
2020-08-21 13:05:33 +02:00 |
|
|
|
550ab51f34
|
wip doc
|
2020-08-20 16:59:38 +02:00 |
|
|
|
ffd694eda1
|
temlist and tempvalues added
|
2020-08-20 15:16:28 +02:00 |
|
|
|
429eb8da53
|
doc wip
|
2020-08-20 12:58:17 +02:00 |
|
|
|
5f23a664fa
|
wip doc
|
2020-08-19 18:45:39 +02:00 |
|
|
|
42067b3de3
|
WIP doc
|
2020-08-19 17:27:04 +02:00 |
|
|
|
a287ce46b1
|
WIP doc
|
2020-08-19 17:13:39 +02:00 |
|
|
|
9bae97ec4c
|
doc update, 1st trial
|
2020-08-19 16:37:21 +02:00 |
|
|
|
096b0c424d
|
spaces in percentage printout for python
|
2020-08-19 12:56:22 +02:00 |
|
|
|
eeb386fef5
|
mythen3: txndelay frame added
|
2020-08-18 15:27:30 +02:00 |
|
|
|
d4e11e56ea
|
added drlist and timinglist, moved daclist and settingslist from cmdprozy.cpp to .h
|
2020-08-14 15:47:39 +02:00 |
|
|
|
de69e666a9
|
progress changed to double
|
2020-08-14 12:16:35 +02:00 |
|
