e22d03a744
WIP
2019-07-02 09:13:47 +02:00
bd3e439d87
Merge branch 'developer' into gui
2019-06-25 10:51:17 +02:00
7c18ad3c53
removed Critical and Noncritical exceptions
2019-06-25 10:50:52 +02:00
3c1df02414
merge resolved
2019-06-11 15:56:13 +02:00
Erik Frojdh
1fed3553b9
cleaning up tcp
2019-06-07 16:13:34 +02:00
Erik Frojdh
170aca0e1f
zmqip now uint
2019-06-06 18:17:04 +02:00
Erik Frojdh
c86a1e7d48
WIP
2019-06-06 17:00:05 +02:00
ffbc0a0fc3
Merge branch 'developer' into gui
2019-06-04 12:18:20 +02:00
b74ce95b24
removed colon in commands. affects dac, adc and extsig
2019-06-04 12:10:26 +02:00
e7c164fb24
Merge branch 'developer' into gui
2019-06-03 11:13:03 +02:00
Dhanya Thattil
29141ac1a6
set starting frame number of next acquisition for both jungfrau and e… ( #27 )
...
* set starting frame number of next acquisition for both jungfrau and eiger. firmware has not implemented a get, so workaround. tests included. frame number 0 not allowed due to Eiger. Eiger max frame is 48 bit, while jungfrau is 64 bit
* made argument of setstartingframenumber const
2019-06-03 11:07:53 +02:00
Erik Frojdh
7a9dbd8b76
WIP
2019-05-28 15:43:20 +02:00
a0f697ce71
jungfrau feature change: outer is default and connects to bottom, inner is secondary but connects to top
2019-05-28 10:31:36 +02:00
Erik Frojdh
0972b803dd
Merge branch 'developer' into mysocket
2019-05-27 09:12:10 +02:00
1a1c6b9b42
jungfrau server: feature finish: switching between 2 interfaces
2019-05-17 19:19:03 +02:00
Erik Frojdh
415567006f
non used header
2019-05-16 15:16:11 +02:00
Erik Frojdh
c6651df1b2
remove mySock
2019-05-16 11:14:03 +02:00
Erik Fröjdh
877bdb8979
Using FixedCapacityContainer for rxDbitList ( #22 )
...
* fixed capacity container
* changed shm date
2019-05-15 09:16:18 +02:00
Erik Frojdh
bf0847e967
removed ClientInterface
2019-05-15 08:38:49 +02:00
97dd329a7b
client: zmqip bug fix (typo with strlen)
2019-05-14 18:57:39 +02:00
Erik Frojdh
7314c52c63
removed unneccecary includes
2019-05-14 17:32:21 +02:00
c30485a65b
advanced down
2019-05-08 16:44:08 +02:00
Erik Fröjdh
2a1c89f712
Fixed container ( #19 )
...
* added FixedCapacityContainer
* added empty to FixedCapacityContainer
* removed commented out section
* added FixedCapacityContainer to public headers
2019-05-08 12:34:45 +02:00
df938c2535
review: removing size in sendtoDetector
2019-05-07 09:47:53 +02:00
932e377765
review fdback: using sendtoReceiver, not using size of for specifyng arguments to sendtodetector
2019-05-06 19:13:31 +02:00
20720bc073
Merge branch 'developer' into rxctb
2019-05-03 20:38:32 +02:00
e14519c236
slsReceiver: removed special receiver config, added rx_dbitlist, rx_dbitoffset to put bits together in file, connected adcinvert, extsamplingsrc and extsampling properly to the detector, added tests
2019-05-03 20:37:40 +02:00
Erik Frojdh
181ac4f509
small renaming
2019-05-03 16:13:32 +02:00
Erik Frojdh
aaa7576f7d
clang-tidy
2019-05-03 14:15:13 +02:00
Erik Frojdh
4f13b29c7f
fixed copyserver bug
2019-05-02 18:18:49 +02:00
2f3b0e0b06
ctb:separated analog and digital samples in server and send analog and digital data packed separately per frame to reciever
2019-04-30 18:55:32 +02:00
b0cffcd570
master file option, adcdisable changed to adcenable
2019-04-30 12:13:28 +02:00
668cff1c65
fix for corrupt merge
2019-04-29 11:30:19 +02:00
06d4c7ce37
client: finishing up of gotthard for roi and ctb and moench for setting adcenablemask
2019-04-29 09:10:17 +02:00
Erik Frojdh
c0f06fcfca
fix reset frames caught
2019-04-26 17:11:32 +02:00
Erik Frojdh
33efd42bdc
fix merge
2019-04-26 17:06:59 +02:00
af5eb9fc12
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
2019-04-26 16:53:35 +02:00
61a939ef53
ctb: removed setroi, instead using adcenablemask
2019-04-26 16:53:23 +02:00
Erik Frojdh
a3342f86d8
names
2019-04-26 16:47:08 +02:00
Erik Frojdh
554f9dc2ee
minor
2019-04-26 16:28:21 +02:00
Erik Frojdh
c4aa5ef7bb
sendToDetectorStop
2019-04-26 15:15:56 +02:00
Erik Frojdh
d7eadd5782
sendToReceiver
2019-04-26 12:58:40 +02:00
Erik Frojdh
b76d123df1
shorter functino
2019-04-25 17:56:20 +02:00
Erik Frojdh
b853bd92c8
template for sending to detector
2019-04-25 17:01:04 +02:00
Erik Frojdh
4da85b15a0
cleaning
2019-04-25 13:55:45 +02:00
Erik Frojdh
8cc8b58b05
sendToDetector
2019-04-24 15:24:56 +02:00
Erik Frojdh
dbf927901f
more of sendToDetector
2019-04-24 14:39:08 +02:00
Erik Frojdh
834b1e58ea
cleaning slsDetector
2019-04-24 10:57:02 +02:00
Erik Frojdh
02fd4b356e
adding config for tests
2019-04-23 17:37:02 +02:00
1bc6e7f978
conflict resolved
2019-04-18 15:32:07 +02:00
