|
|
1152555663
|
esrf changes: rx_udpsocksize sets/gets udp socket buffer size to be set, rx_realudpsocksize gets the real udp sock size buffer. At receiver config and at rx_udpsocksize command, dummy udp sockets created to know if set udp sock size fails (if fail, set to previous value), and also to get the real udp sock buffer size
|
2018-05-01 11:55:48 +02:00 |
|
|
|
bc70cc3a26
|
jungfrau server: added storage start, connected auto_comp_disable, changed adcphase, added ADC_PORT_INVERT_VAL, ADC_OFST_HALF_SPEED_VAL, minimum exposure time
|
2018-04-13 17:33:46 +02:00 |
|
|
|
2bd8e6c166
|
zmq fixed to have additional json headers using rx_zmqjsonheader
|
2018-04-09 16:33:14 +02:00 |
|
|
|
b58c3e8951
|
solving merging conflicts from 3.1.0 to developer
|
2018-03-14 15:45:35 +01:00 |
|
Erik Frojdh
|
0d2dd93498
|
changed setBit and getBit to uint32_t
|
2018-03-08 17:13:13 +01:00 |
|
Erik Frojdh
|
339956e5de
|
changed from int to uint32_t in read and writeRegister
|
2018-03-08 16:08:31 +01:00 |
|
|
|
897cbac27d
|
merge from 3.0.1 for server binaries (adcphase,server dates, temp control, settings file
|
2018-02-07 11:02:36 +01:00 |
|
|
|
ecf1e9fac1
|
bugfix: returning pointer to local variable, char* to string in function definition
|
2018-02-07 10:14:52 +01:00 |
|
|
|
3da6a6df65
|
merge conflict removed, jungfrau server and eiger server re compiled
|
2018-02-05 12:33:05 +01:00 |
|
|
|
5d04067973
|
added auto comp disable feature
|
2018-02-02 18:01:01 +01:00 |
|
Dhanya Maliakal
|
2d6e4c95a2
|
temp_threshold, temp_control, temp_event done
|
2018-01-11 15:37:24 +01:00 |
|
Dhanya Maliakal
|
12348ac76c
|
merge conflict fix
|
2017-12-01 09:20:44 +01:00 |
|
Dhanya Maliakal
|
18422ce215
|
setbit and clear bit moved to slsdet, readreg, writereg,setbit,clearbit in multi cannot give -1, instead api gives error if checked
|
2017-12-01 09:18:42 +01:00 |
|
Dhanya Maliakal
|
5b88203bd9
|
merge conflict from 3.0.1 to restream stop from recieveR
|
2017-11-30 19:05:35 +01:00 |
|
Dhanya Maliakal
|
ca855e6d39
|
restream stop from receiver
|
2017-11-30 18:37:11 +01:00 |
|
Dhanya Maliakal
|
2227265357
|
removed external gui flag, acquiring flag is now not reset in stop acquisition, slsdet does not have acquiring flag anymore, busy accomodating acquiringflag, acquire cleanup, in acquire made lock for receiver more local, moved setacquiringflag false to bottom of acquire
|
2017-11-30 16:25:23 +01:00 |
|
Dhanya Maliakal
|
ca19993149
|
makng the zmq work without external flag
|
2017-11-27 17:06:18 +01:00 |
|
Dhanya Maliakal
|
386ef7766c
|
zmq streaming should work with external gui now
|
2017-11-27 16:01:12 +01:00 |
|
Dhanya Maliakal
|
3439ccbec9
|
updates for merge for r_readfreq without reciever
|
2017-11-23 18:30:48 +01:00 |
|
Dhanya Maliakal
|
16e4fbf8dd
|
receiver read freq should save value in shm even if no receiver present
|
2017-11-23 18:21:54 +01:00 |
|
Dhanya Maliakal
|
b7ca7f5319
|
just cleanuped code
|
2017-11-20 17:15:13 +01:00 |
|
Dhanya Maliakal
|
99037449f4
|
in between moench stuff
|
2017-11-20 14:23:32 +01:00 |
|
Dhanya Maliakal
|
c5c23e73d5
|
works zmq separated for client and rx, ports and ip included in expert advanced mode
|
2017-11-17 17:39:04 +01:00 |
|
Dhanya Maliakal
|
51499fa503
|
merge conflict from 3.0.1
|
2017-11-17 11:35:02 +01:00 |
|
Dhanya Maliakal
|
f647bdaa48
|
updated users class to reflect zmq changes (separation), fixed warnings
|
2017-11-17 08:46:43 +01:00 |
|
Dhanya Maliakal
|
4097c37b31
|
in between
|
2017-11-16 16:01:31 +01:00 |
|
Dhanya Maliakal
|
8e0414d1b9
|
separating zmqport, enabling in client and receiver works
|
2017-11-16 15:01:22 +01:00 |
|
Dhanya Maliakal
|
2b0d07387a
|
in between separating datastreaming in client and receiver
|
2017-11-15 17:16:47 +01:00 |
|
Dhanya Maliakal
|
dda86cfe9b
|
somewhere in separating zmq rxr and client
|
2017-11-14 16:26:17 +01:00 |
|
Dhanya Maliakal
|
82f503aa09
|
dynamic range also updates offsets, 4 bit mode gap pixels work in call back from gui
|
2017-10-31 12:50:31 +01:00 |
|
Dhanya Maliakal
|
812606a7b4
|
conflict resolution with developer
|
2017-10-03 15:12:49 +02:00 |
|
Dhanya Maliakal
|
03a2f979a9
|
fixing merge conflict in error_Defs
|
2017-10-03 14:32:30 +02:00 |
|
Dhanya Maliakal
|
bb817733ff
|
changes upto the receiver, not incl gui
|
2017-10-03 10:44:05 +02:00 |
|
Dhanya Maliakal
|
352ade6457
|
just skeleton of gappixels
|
2017-09-27 17:08:00 +02:00 |
|
Dhanya Maliakal
|
af98d2bb53
|
added silent mode in receiver during real time acquisition, doesnt print packet loss regularly or file name created each time
|
2017-09-27 10:09:02 +02:00 |
|
Dhanya Maliakal
|
ab27437604
|
removed setframeindexenable from going to the receiver, it can figure it out on its own now
|
2017-09-22 12:23:39 +02:00 |
|
Dhanya Maliakal
|
092487c08e
|
Merge branch '3.0.1' into developer
|
2017-09-19 17:19:36 +02:00 |
|
Dhanya Maliakal
|
a95e2efdb0
|
parallelized settimer, setfileindex, setonline, setreceiveronline, getreceiverstatus, resetframescaught, setFrameIndex, setFileName, getFramesCaughtByReceiver; added getFramesCaughtbyAnyreceiver to avoid threadpool and to use in post processing
|
2017-09-18 16:47:22 +02:00 |
|
Dhanya Maliakal
|
49378e6d09
|
added streamsrcip command to be able to change the interface from which receiver streams data from
|
2017-09-12 14:33:11 +02:00 |
|
Dhanya Maliakal
|
0bea688a83
|
changes for external gui
|
2017-08-23 19:06:40 +02:00 |
|
Dhanya Maliakal
|
bdccddfe97
|
in between
|
2017-08-23 18:24:48 +02:00 |
|
Dhanya Maliakal
|
e8d83a085f
|
moved receiver start to status start and to startandreadall (acquire), parallelized status start, moved prepare and clean up to multi level and called by start and stop receiver for gotthard, moench and propix
|
2017-08-10 18:46:10 +02:00 |
|
Dhanya Maliakal
|
e3667f6827
|
can set zmqport from receiver
|
2017-07-13 12:18:07 +02:00 |
|
Dhanya Maliakal
|
b4309a9f60
|
changed jungfrau temperature conversion but binary to follow
|
2017-07-03 14:45:44 +02:00 |
|
Dhanya Maliakal
|
c2980b3c44
|
changes for setting threshold without trimbits for eiger
|
2017-06-28 10:24:07 +02:00 |
|
Dhanya Maliakal
|
e2e25f6e62
|
changed API for setting network parameter to remove memory leak, fixed lock issues in streaming print outs to gui, deleted return from threadpool in the right place
|
2017-06-19 14:29:45 +02:00 |
|
Dhanya Maliakal
|
445da80df8
|
resolved warnings, also from esrf: todo: include changes in zmq
|
2017-05-01 13:11:10 +02:00 |
|
Dhanya Maliakal
|
7e00d9f395
|
Merge branch 'developer' into hdf5
|
2017-03-03 10:06:34 +01:00 |
|
Dhanya Maliakal
|
19460a03f5
|
sending position id and num detectors in x and y dir
|
2017-02-21 15:13:27 +01:00 |
|
Dhanya Maliakal
|
9b3f4a3a66
|
commonFiles/error_defs.h
|
2017-02-03 14:34:05 +01:00 |
|
