Erik Frojdh
e599bb7c24
format receiver
2020-05-05 10:04:52 +02:00
Erik Fröjdh
c1ae67ac46
Small refactor on ThreadObject and listener ( #93 )
...
* removed pointer, slight cleaning of loop
* removed semaphore, use getters
* removed redundant log msg
* removed comment
* added const
* removed comment
* changed header
2020-04-21 09:45:29 +02:00
Erik Frojdh
815b6a37aa
moved flag to base class
2020-04-16 13:22:51 +02:00
Dhanya Thattil
fdb6e3f3d4
Removeshm ( #90 )
...
* eiger: moved rate correction outside, fixed threshold energy bug in client (binaries not updated yet)
* removed dr and deadtiem from shm
* help for rx_status and status to point them to rx_Start, rx_stop, start and stop
* moved progress to receiver
* removed currentsettings from eiger shm
* updated server binaries, and client api
* moench and ctb virtual servers compile fix
* gui: moved acquire to a concurrent qt thread so it doesnt block updateplot
2020-04-06 10:44:44 +02:00
Dhanya Thattil
d58eb1dc6e
Gappixels ( #89 )
...
* WIP
* WIP virtual delays, imagetest for saturation
* WIP, vertical and horizontal
* WIP
* gap pixels work, fixed 32 bit data out (10gbe=0) for virtual servers
* quad works (also in virtual), handling gappixels and quad
* jungfrau gapppixels work
* jungfrau: done
* complete image or missing packets given in json header and gui
* eiger virtual 4 bit mode bug fix
* working version of zmq add json header, except printout
* printout bug
* fix for json para
* to map WIP
* map done
* map print , mapwith result left
* json result works, testing added
* updated server binaries
* compiling on rhels7, variable size char array iniitalization
* zmqsocket parsing didnt need Document
* const to map, json para is strings not map
* json add header: mapping cleaner without insert make_pair
2020-03-30 14:54:35 +02:00
b608ec6fbd
zmqsocket: fname to string to remove warning in copying maxstr in maxstr in json header
2020-03-19 10:24:08 +01:00
Erik Frojdh
0de0d82a1a
replaced old logger
2020-03-11 12:40:12 +01:00
1a8337540a
rxr: switched to threads for threadObject (from pthread), moved priorities to threadObject, mutex
2019-11-29 16:19:02 +01:00
2ece6b945e
rxr: warnings shouldnt throw exception
2019-11-29 11:09:41 +01:00
1d6be74ee5
rxr: removed return ok or fail and replaced with exceptions
2019-11-29 10:29:36 +01:00
f2c0ff7f98
rxr: removed char array memebers in rxrimplementation
2019-11-18 14:29:01 +01:00
eb2040f0a7
fixed effects of scan
2019-10-29 14:43:51 +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
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
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 Frojdh
24fc5de58d
clang-tidy header include order
2019-05-14 17:34:51 +02:00
Erik Frojdh
97692ae3ab
moved from c headers
2019-05-14 17:17:21 +02:00
Erik Frojdh
74d67261a9
no check for null when deleting
2019-05-14 17:09:24 +02:00
89a06f099c
merging refactor (replacing)
2019-04-12 10:53:09 +02:00
Erik Frojdh
cd738106ec
printf and uninitialized variables
2019-02-08 11:14:16 +01:00
c2db073d5e
receiver and client: changed xcoord to row and ycoord to column, zcoord to reserved
2018-09-26 15:03:04 +02:00
9f84bf7175
gui: crashing when using roi fixed
2018-09-20 18:10:10 +02:00
c784f0f539
client: moved shortenable to roi in reciever, roi not yet written in master file
2018-09-19 17:35:26 +02:00
830f92dedc
client and receiver: silent mode put into shared memory, works properly now
2018-08-15 19:51:04 +02:00
da4253fe13
Exception handling from constructors for slsDetector and multiSlsDetector, zmqsockets deleted first in multi freeshm/constructor, removed unnecessary exceptions from exceptions list, replaced in slsDetector socket assign from NULL to 0
2018-08-10 17:07:29 +02:00
a0512a01d5
Exceptions: zmq socket class descriptors made into its own class for auto destruction upon construction exception, similarly for other try blocks. slsDetector and multislsdetector left to do
2018-08-09 18:12:56 +02:00
c366e94a96
bit field for missing packets, added commands r_padding and r_discardpolicy, hdf5 bitfield metadata left to do
2018-07-05 13:47:20 +02:00
d3a0319863
esrf changes: Listener, DataProcessor, DataStreamer, Fifo, ZmqSocket constructors return an exception when it fails
2018-05-02 16:49:27 +02:00
b5909044f6
slsReceiver: remove static members in Listener, DataProcessing and DataStreamer:
...
* Needed when more than one receiver is created by process
* Replace NumberofXxxx by explicit index in constructor
* Remove Error[Mask], use return value in constructor signature
* Replace RunningMask by individual Running flags
* Remove obsolete Mutex objects
2018-04-25 09:24:39 +02:00
2bd8e6c166
zmq fixed to have additional json headers using rx_zmqjsonheader
2018-04-09 16:33:14 +02:00
8cf6e0cbd6
in between
2018-04-06 17:48:10 +02:00
a74e8f68f7
size change in receiver call back API now streamed, gui allows smaller packet size than expected to be caught and replaced the rest with 0xFF
2018-03-21 17:08:38 +01:00
Dhanya Maliakal
9f152ce1f3
merge conflict resolved
2017-12-01 12:44:34 +01:00
Dhanya Maliakal
a06f29f473
minor cosmetics
2017-12-01 11:23:17 +01:00
Dhanya Maliakal
6f3898441e
merge conflict from 3.0.1 to restream stop from recieveR
2017-11-30 19:05:47 +01:00
Dhanya Maliakal
70bf6eb4cb
restream stop from receiver
2017-11-30 18:39:08 +01:00
Dhanya Maliakal
a89847538d
merge ocnflict for white background
2017-11-28 11:29:15 +01:00
Dhanya Maliakal
a351fa8f28
switching from black to white background for receiver
2017-11-28 11:18:30 +01:00
Dhanya Maliakal
662f502d4c
zmq always needs an ip in header
2017-11-17 17:40:57 +01:00
Dhanya Maliakal
db2fef5d69
conflict resolved in merge from 3.0.1 to include file index in zmq streaming
2017-11-14 12:14:26 +01:00
Dhanya Maliakal
0ae706d9a5
file index sent along with zmq stream
2017-11-14 12:13:06 +01:00
Dhanya Maliakal
2e5f64d9bc
gap pixels for 8, 16, 32 in receiver at udp level
2017-10-05 15:59:07 +02:00
Dhanya Maliakal
e54767b69d
conflict resolution with developer
2017-10-03 15:12:56 +02:00
Dhanya Maliakal
0b82aabd2b
merge with 3.0.1 conflicts resolved
2017-10-03 14:52:53 +02:00
Dhanya Maliakal
4669d408d4
somewhere in between
2017-10-03 12:09:31 +02:00
Dhanya Maliakal
6a8aad4c2b
added silent mode in receiver during real time acquisition, doesnt print packet loss regularly or file name created each time
2017-09-27 10:11:31 +02:00
Dhanya Maliakal
5ff574b33f
made default streamer to be the ip related to hostname, otherwise can be specified from the client, also made it compatible with chip test board detector now
2017-09-12 15:04:56 +02:00
Dhanya Maliakal
77d688e508
changes done
2017-08-14 13:33:11 +02:00
Dhanya Maliakal
0bacb903ea
rest implementation, index issues
2017-07-13 14:44:03 +02:00