35556e96d1
mythen3 channels size
2019-11-11 11:31:03 +01:00
38ad5d7931
mythen3 rxr
2019-11-08 18:11:27 +01:00
18b8720c17
separated parameters and versions
2019-11-06 16:43:59 +01:00
031241ae28
timer split up
2019-11-04 16:40:11 +01:00
fe467cdf70
jungfrau dacs named
2019-10-29 18:11:16 +01:00
925a750f9a
WIP
2019-10-29 14:46:45 +01:00
eb2040f0a7
fixed effects of scan
2019-10-29 14:43:51 +01:00
4b2cb7ecc1
WIP
2019-10-29 11:35:25 +01:00
Dhanya Thattil
995f0924e5
Commandline ( #66 )
...
* WIP
* WIP
* removed status to string from defs
* WIP
* WIP
* WIP removed unused functions in multi
* WIP
* print hex in a terrible way
* WIP, loadconfig error
* WIP, type to string
* WIP
* fix to conversion
* WIP, hostname doesnt work
* WIP
* WIP
* WIP
* WIP, threshold
* WIP, threshold
* WIP
* WIP, triggers
* WIP, cycles to triggers
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* rx_udsocksize fx, WIP
* WIP
* WIP
* WIP
* file index (64 bit), WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* merge
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* New python mod
2019-10-21 10:29:06 +02:00
Dhanya Thattil
ca054626e6
Removeudpcache ( #65 )
...
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* solved eiger 1-10g issue
* some fixes for remove udp cache to work
* bug fix virtual
* removed special handling of rx_udpip
2019-09-30 14:46:25 +02:00
Dhanya Thattil
5bcde789ac
Readoutflags ( #61 )
...
* WIP
* eiger binary back wih versioning
* fixed readout flag in ctbgui, added speedLevel enum
* ctbgui: fixed a print out error
* ctb readout bug fix
* WIP
* WIP
* WIP
2019-09-02 19:27:27 +02:00
a98271f0c2
merge resolved
2019-08-21 14:25:21 +02:00
5c393e6204
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
2019-08-21 13:23:38 +02:00
f0ba8a06ce
ctb 10g fix for old reciever
2019-08-21 13:21:35 +02:00
Erik Fröjdh
b4c207fc4e
Less data race in slsReceiver ( #50 )
...
* removed some data races
* non needed mutex
* removed extra include
2019-08-21 12:02:06 +02:00
422a928be4
ctb rxr: changing to old header (like moench)
2019-08-21 11:13:17 +02:00
11c1fb0e11
Added roi to master file
2019-08-20 13:42:26 +02:00
10ce82fc5f
WIP
2019-08-16 17:07:30 +02:00
e635ff035c
receiver master file includes quad, gap pixels enable, version updated for binary and hdf5, parallel, analog, digital, adc, dbitofset, dbitlist
2019-08-14 21:14:06 +02:00
ba0c6ff286
eiger bug fix: quad gap pixels
2019-08-14 17:49:09 +02:00
d4d8cbe9bc
gotthard fixed roi only xmin and xmax.remove updateoffsets
2019-08-14 09:20:50 +02:00
Dhanya Thattil
98ddf154b2
Partialreadout ( #47 )
...
* eiger server, rxr: partial readout, also gui messages: up last command, down clear command
* added binaries and resolved conflict
* bugfix eiger server: interrupt subframe is bit 2 and not bit number 3
* brackets in defs
2019-08-07 09:08:58 +02:00
Dhanya Thattil
d72b6c3659
eiger server: quad, interrupt subframe, reg left and right ( #45 )
...
* eiger server: quad, interrupt subframe, reg left and right
* eiger server: beb can fail in setting up quad, quad and gap pixels
2019-08-06 10:12:34 +02:00
Dhanya Thattil
e7a76ccea1
Quad ( #39 )
...
* making quad work in developer branch
* binary added
* minor changes
* bug fix to set quad to 0 when more than 1 detector
2019-07-22 16:41:03 +02:00
Erik Fröjdh
1a9755ad0b
New filename structure ( #38 )
...
* WIP
* WIP
* linking names
* define for hdf5
* minor
* addressed comments
2019-07-22 15:52:21 +02:00
8ac7d96ef3
WIP
2019-07-05 08:54:50 +02:00
Erik Frojdh
1fed3553b9
cleaning up tcp
2019-06-07 16:13:34 +02:00
Erik Frojdh
72e0d7e168
clang format on receiver TCP and Implementation
2019-06-06 08:07:40 +02:00
Erik Fröjdh
1db7521cfa
exceptions TCP ( #31 )
...
* WIP
* first test
* format
* test frames
* also 0:
* WIP
* WIP
* first test
* format
* test frames
* also 0:
* test and less local
* pass ret by value
* level
* WIP
* WIP
* cleaning up interface
* removed ref
* another
* updated api version
* cleanup
* cleanup
* WIP
* fixes
* fixed tests
2019-06-05 15:25:18 +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
daa82b91a9
removed comment
2019-05-28 14:44:46 +02:00
Erik Frojdh
8ebc0f2644
uniqe ptr for receiver
2019-05-27 11:28:59 +02:00
Erik Frojdh
0972b803dd
Merge branch 'developer' into mysocket
2019-05-27 09:12:10 +02:00
10f89599e0
bug fix: hdf5 printError still called once. replcaed with printErrorStack
2019-05-22 19:11:35 +02:00
1a1c6b9b42
jungfrau server: feature finish: switching between 2 interfaces
2019-05-17 19:19:03 +02:00
Erik Frojdh
c30c6bb883
fixed uninitialized pointer
2019-05-16 15:00:15 +02:00
Erik Frojdh
1db1b0307c
init
2019-05-16 11:50:35 +02:00
Erik Frojdh
0d98bd0048
init
2019-05-16 11:43:12 +02:00
Erik Frojdh
c6651df1b2
remove mySock
2019-05-16 11:14:03 +02:00
Erik Frojdh
e252b8e0e9
receiver socket
2019-05-15 17:51:48 +02:00
Erik Frojdh
40c2d9f760
try for accept
2019-05-15 12:17:32 +02:00
Erik Frojdh
9d5848d0d6
inprogress
2019-05-15 09:12:14 +02:00
Erik Frojdh
ab5aa78b8a
clang-tidy modernize
2019-05-14 16:53:50 +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
71dd43d252
connected analog databytes
2019-05-01 12:25:21 +02:00
fc7d3bcaea
ctb callback used
2019-05-01 12:10:15 +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
56d1994b8c
ctb file frame header back in
2019-04-30 11:18:09 +02:00
61a939ef53
ctb: removed setroi, instead using adcenablemask
2019-04-26 16:53:23 +02:00