 Erik Frojdh
|
f11db00aef
|
removed old typedef
|
2019-04-05 10:14:41 +02:00 |
|
|
Erik Frojdh
|
69a11f8950
|
cleaning up
|
2019-04-03 18:41:21 +02:00 |
|
|
Erik Frojdh
|
0270e18882
|
new tests
|
2019-04-03 18:11:48 +02:00 |
|
|
Erik Frojdh
|
90b257a74d
|
warnings
|
2019-04-03 16:17:09 +02:00 |
|
 maliakal_d
|
c38bebd615
|
jungfrau server: added deg and maxadcphaseshift, ctb & moench server: set adc phase like jungfrau that positive shift is positive, moved conversion between shift to degrees to the common function. receiver: removed unused variables
|
2019-03-28 09:35:53 +01:00 |
|
|
maliakal_d
|
7cd5bc8b2d
|
jungfrau: switching between 2 and 1 interface, implementation for server required when firmware done
|
2019-03-26 15:00:19 +01:00 |
|
|
maliakal_d
|
1eff8485dd
|
receiver listener bug fix from previous commit
|
2019-03-15 10:37:47 +01:00 |
|
|
maliakal_d
|
5fe7a86361
|
switching udpsocketbuffersize from uitn64_t to int64_t, printing socket exception into tcp error mess, changing an exception message
|
2019-03-15 10:00:22 +01:00 |
|
|
Erik Frojdh
|
836eb8cde2
|
explicit override
|
2019-03-14 17:15:58 +01:00 |
|
|
maliakal_d
|
0553755439
|
receiver bug fix: with refactor, the callbacks were getting reset upon initialization. fixed
|
2019-03-08 09:14:29 +01:00 |
|
|
Dhanya Thattil
|
999a2f4d15
|
Merge pull request #8 from slsdetectorgroup/use-unique-ptr
In Listener, remove raw pointers allocations, use `unique_ptr` instead.
|
2019-03-06 17:48:28 +01:00 |
|
|
maliakal_d
|
ca817c6ae9
|
client: update roi on updatedetector, (ctb, moench)moved nchans and databyte calculated to updatenumberofchannels and called for any update in roi, readoutflag or #samples changed (get should not update). ctb,moench server: roi fixed, . gotthard server: bug fix waiting to finish, ad9252 spi call fix. receiver: updated for moench and 10g
|
2019-03-06 17:25:18 +01:00 |
|
|
maliakal_d
|
abc7a9bd2f
|
moench has only analog readout
|
2019-03-06 14:52:21 +01:00 |
|
|
maliakal_d
|
2676e8b43d
|
receiver: readout flag bug fix, clent:send roi for ctb and moench
|
2019-03-06 10:55:51 +01:00 |
|
|
Samuel Debionne
|
db232ad00d
|
in Listener, remove raw pointers allocations, use unique_ptr instead.
Add an overload of sls::make_unique for array types.
|
2019-03-06 09:07:51 +01:00 |
|
|
maliakal_d
|
08bd2378f4
|
slsReceiver bug fix affecting Jungfrau receivers as root (optlen size as int), but setting buffer size is uint32_t size. setting it to uint64_t
|
2019-03-04 09:41:20 +01:00 |
|
|
maliakal_d
|
93192c6e84
|
bugfix receiver: setImagesize only for ctb, moench
|
2019-03-01 15:22:39 +01:00 |
|
|
maliakal_d
|
debf3a1b01
|
ctb readout works with receiver for digital readout, allocate ram in server only if 1g udp, free addr info only when setting new udp detals upon configuring ,brough readout flags to receiver
|
2019-02-28 16:07:47 +01:00 |
|
|
maliakal_d
|
7f2197fc4f
|
slsReceiver & client: 10genable allowed for moench and ctb, ctb server: better way to divide to packets to send via udp
|
2019-02-28 10:09:54 +01:00 |
|
|
maliakal_d
|
966896b942
|
moench: get zmq goes to the receiver instead of shm, setand get threshold energey updates zmq and shm value, setand get roi anyways goes to the ddetector, so only updates zmq or gets it from rxr
|
2019-02-25 12:57:44 +01:00 |
|
|
Samuel Debionne
|
b18391330e
|
Add slsReceiverUsers(int tcpip_port_no) overload
Use std::unique_ptr<> instead of raw pointers
|
2019-02-12 17:01:46 +01:00 |
|
|
maliakal_d
|
a64b34610a
|
merge from developer (without the additional json header implementations)
|
2019-02-12 09:35:24 +01:00 |
|
|
Erik Frojdh
|
c3472f295b
|
split client and server interface
|
2019-01-23 12:07:44 +01:00 |
|
|
Erik Frojdh
|
1b28cc88ff
|
step one project reorganization
|
2019-01-18 14:41:04 +01:00 |
|
|
Erik Frojdh
|
10539f8533
|
new getDetectorType functions
|
2019-01-18 10:53:49 +01:00 |
|
|
Erik Frojdh
|
0841df98d4
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2019-01-11 11:27:52 +01:00 |
|
|
Erik Frojdh
|
1bd0b33806
|
functions not overriding base and unitialized use
|
2019-01-11 11:27:48 +01:00 |
|
|
maliakal_d
|
de2ebad2ed
|
receiver: removed unused silentmode from DataStreamer
|
2019-01-11 11:19:16 +01:00 |
|
|
Erik Frojdh
|
c6a597c3ec
|
minor changes and removed W flag not found
|
2019-01-11 11:07:50 +01:00 |
|
|
maliakal_d
|
8f3f9caf2b
|
almost done with ctb update, need to do slow adcs, split to moench and ctb
|
2018-11-30 10:39:26 +01:00 |
|
|
maliakal_d
|
833f0c164c
|
reciever hdf5 compiling error fixed
|
2018-11-02 14:31:36 +01:00 |
|
|
maliakal_d
|
70a1b87603
|
merge conflict resolved
|
2018-10-30 14:31:20 +01:00 |
|
|
maliakal_d
|
dfa8cf7381
|
runs, prints right in reciever
|
2018-10-30 13:35:20 +01:00 |
|
|
maliakal_d
|
92fc837eb4
|
compiles, but doesnt run
|
2018-10-29 15:23:52 +01:00 |
|
|
maliakal_d
|
33ac63d14a
|
still updating slsdetector.cpp
|
2018-10-26 17:40:18 +02:00 |
|
|
maliakal_d
|
cf87b6ca83
|
still updating slsdetector.cpp
|
2018-10-25 16:24:05 +02:00 |
|
|
maliakal_d
|
86fb843021
|
in the process of rewriting detector client interface
|
2018-10-18 10:58:48 +02:00 |
|
|
Erik Frojdh
|
5c2ff84c0e
|
removed unused variable numberofJobs in receiver implementation
|
2018-10-17 11:39:27 +02:00 |
|
|
Erik Frojdh
|
014dfaa251
|
moved to vector of unique pointer in slsReceiverImplementation
|
2018-10-16 17:30:43 +02:00 |
|
|
maliakal_d
|
8382d0f5f9
|
receiver tcp interface updated
|
2018-10-12 17:03:19 +02:00 |
|
|
maliakal_d
|
c24a9b223c
|
combined all the funcs into one, servers need to be recompiled
|
2018-10-11 13:57:47 +02:00 |
|
|
maliakal_d
|
5a356534e6
|
refactor receiver client interface, moved defs into one sls_detector_defs.h
|
2018-10-11 12:25:18 +02:00 |
|
|
maliakal_d
|
e1d570e8ce
|
client specifies index of receiver returned error, skeleton of including clientinterface in receiver
|
2018-10-10 13:15:16 +02:00 |
|
|
maliakal_d
|
17a6322f7c
|
receiver runs but does not overwrite due to wx, async doesnt seems parallel problem, acquire gets stuck
|
2018-10-10 10:12:58 +02:00 |
|
|
maliakal_d
|
8151f1d5fe
|
receiver compiles
|
2018-10-09 18:02:47 +02:00 |
|
|
maliakal_d
|
100c1b81f8
|
moved all the common header files from receiverSoftware to commonFiles
|
2018-10-02 16:32:37 +02:00 |
|
|
maliakal_d
|
c248b12455
|
refactored ONLY THE CLIENT first stage, compiles
|
2018-10-02 15:15:35 +02:00 |
|
|
maliakal_d
|
e631414526
|
updated version
|
2018-09-27 18:23:08 +02:00 |
|
|
maliakal_d
|
c2db073d5e
|
receiver and client: changed xcoord to row and ycoord to column, zcoord to reserved
|
2018-09-26 15:03:04 +02:00 |
|
|
maliakal_d
|
970d448e73
|
receiver: using namespace std removed from all the headers and the bug fixes for that for hdf5
|
2018-09-26 10:53:45 +02:00 |
|