612 Commits

Author SHA1 Message Date
688fe4e3f7 fix zmqport and rx_zmqport, must restart zmq streaming 2020-10-07 14:17:34 +02:00
a730a13cbe wip 2020-10-01 17:57:07 +02:00
f31260030b bugfix: cannot stop detector if rxr crashed 2020-10-01 17:54:08 +02:00
91d688f18c minor doc 2020-10-01 11:47:08 +02:00
3a3c5b0a6e minor readframefromrxr using unique ptrs 2020-09-29 14:37:43 +02:00
603ddb0d75 updated docs, execcommand multiple words 2020-09-25 19:24:26 +02:00
Dhanya Thattil
fe81963873
rxr: udp socket size max of INT_MAX/2 (#191) 2020-09-25 10:15:39 +02:00
Dhanya Thattil
2c1fddee84
Cmddacs (#189)
Moved dacs to it's own command for command line. 
Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
2020-09-24 17:16:34 +02:00
Erik Frojdh
0b0f5c94d5 master file no index 2020-09-23 16:28:50 +02:00
750adffe6a wip, doc 2020-09-23 15:07:03 +02:00
40a1d27e3a wip, doc 2020-09-23 14:58:30 +02:00
b23410bc5e wip, doc 2020-09-23 14:58:25 +02:00
e786b9f037 wip, doc 2020-09-23 13:15:53 +02:00
bd4299fd15 Wip, doc 2020-09-23 12:32:51 +02:00
a4bdffd0b9 Merge branch 'eigerserverlock' into developer 2020-09-22 18:48:35 +02:00
bb575c6017 wip, doc 2020-09-22 18:39:46 +02:00
65da9e701b wip, doc 2020-09-21 18:30:33 +02:00
804ad0997c wip, doc 2020-09-21 18:20:59 +02:00
2fc0768ad1 minor warning fix 2020-09-21 17:57:31 +02:00
4ad486fda0 Merge branch 'developer' into eigerserverlock 2020-09-21 17:28:38 +02:00
a8cc47d25c wip, doc 2020-09-21 17:27:49 +02:00
54ca9f7ebb wip, doc 2020-09-21 17:09:39 +02:00
569c014d3c WIP, doc 2020-09-21 11:23:46 +02:00
0906efaf31 moving temp_fpgafl and temp_fpgafr back to the stop server 2020-09-18 14:09:23 +02:00
Erik Frojdh
6d01348bf4 removed setClockFrequency and added some python commands 2020-09-17 16:03:58 +02:00
Dhanya Thattil
b0dd82c667
removing sem_wait in acquire (#182) 2020-09-17 13:55:20 +02:00
Erik Frojdh
2d2e80469c format 2020-09-17 12:18:34 +02:00
Erik Frojdh
5d648443fa replaced remaning {} 2020-09-17 12:18:08 +02:00
Erik Frojdh
511c206787 replaced initializer list with vector for CmdProxy 2020-09-17 12:11:19 +02:00
3376f7fa37 wip, doc 2020-09-14 15:39:21 +02:00
f061d2273a wip, doc 2020-09-14 15:18:48 +02:00
01921bc016 WIp, doc 2020-09-11 16:05:53 +02:00
f644cba244 wip, doc 2020-09-11 15:19:22 +02:00
3b071cc43f WIP doc 2020-09-11 09:30:30 +02:00
a4926e6ae1 help fix for cmd line 2020-09-10 17:04:08 +02:00
be8284f5c2 nmod added to command line 2020-09-10 16:57:30 +02:00
a0f915316e rx_readfreq to rx_zmqfreq and rx_datastream to rx_zmqstream 2020-09-10 14:11:21 +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
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
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