a0016cb005
sharedmem: working, need to add replace
2018-06-27 10:05:05 +02:00
Erik Frojdh
1dfdcfcb7e
finished removing using namespace std
2018-05-24 15:24:01 +02:00
Erik Frojdh
b78b8425fd
ifstream and ofstream to std::
2018-05-24 14:27:01 +02:00
Erik Frojdh
12832a3a96
adding more std:: in slsDetectorActions.h
2018-05-24 14:24:10 +02:00
Erik Frojdh
621b7cfb2a
adding std:: where needed
2018-05-24 14:11:30 +02:00
Erik Frojdh
a67d9e60da
removing more using namespace std
2018-05-24 13:47:48 +02:00
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
8f9c657fa0
esrf remove changes: VRS to interpolate, not copy
2018-04-23 14:41:01 +02:00
1069bf5979
esrf changes: slsDetector: fix setThresholdEnergy and slsDetectorAnalysis file read:
...
* slsDetector: Proper cleanup and return when no interpolation is possible
* slsDetectorAnalysis: treat CAL DAC as irrelevant when interpolating settings for two energies(do not abort if different), also including VRS in copying
2018-04-23 13:31:05 +02:00
c3a9d3c342
fixed a valgrind error
2018-04-12 17:38:15 +02:00
b58c3e8951
solving merging conflicts from 3.1.0 to developer
2018-03-14 15:45:35 +01:00
Erik Frojdh
76bd2c69bc
added vrs to Eiger dacs to interpolate
2018-02-19 12:04:05 +01:00
Dhanya Maliakal
6e876d79ee
conflict merged fix, lockin in stop and startandreadallnowait, r_restreamstop moved to stop
2017-12-08 11:45:29 +01:00
Dhanya Maliakal
40a7b3983a
put some locking in stop acquisition and startandreadallnowait (bugs threadpool with more evernts than normal due to main and processing thread with no locks for detector releated stuff, zmqthreadpool not required, r_restreamstop moved to status stop when idle
2017-12-08 11:40:07 +01:00
Dhanya Maliakal
6a41b5ce3a
using file index from zmq
2017-11-28 14:45:29 +01:00
Dhanya Maliakal
bca7c649d7
Merge branch '3.0.1' into developer
2017-11-28 09:37:09 +01:00
Dhanya Maliakal
1dd300f713
only call register call back which already enables streaming in client and receiver, added to postprocessing
2017-11-28 09:36:54 +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
dcfa6fb100
Fixed filename problem with CPU readout and trimval command for mythen
2017-11-22 12:34:14 +01:00
Dhanya Maliakal
3c6d572369
including dynamic range in gui call back
2017-11-02 11:02:40 +01:00
Dhanya Maliakal
afc08f8c30
double* changed to char* in gui data call back, decoding to be done by caller. enablegappixels skeleton created
2017-10-02 13:21:38 +02:00
Dhanya Maliakal
1a8b0692fe
works but needs to be verified. the void* in call back
2017-09-29 11:39:10 +02:00
Dhanya Maliakal
6eb5167c70
Merge branch '3.0.1' into developer
2017-09-21 13:35:16 +02:00
Dhanya Maliakal
45ee8b2a2b
changes usleep back to normal in postprocessing
2017-09-20 18:27:54 +02:00
Dhanya Maliakal
fda9c85bb3
included threaded 0 as a possibility
2017-09-20 17:07:51 +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
272167435d
gainplot added, masking done separately before converting to double
2017-09-01 12:04:04 +02:00
Dhanya Maliakal
c2980b3c44
changes for setting threshold without trimbits for eiger
2017-06-28 10:24:07 +02:00
Dhanya Maliakal
15424149cd
removed leak from postprocessing, moved delete task to earlier in threadpool and deleting threadpool
2017-05-12 10:32:16 +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
bd0f72c60e
removed std:: in front of round, else compile error
2017-03-03 09:12:19 +01:00
Dhanya Maliakal
bdff083402
Merge branch '2.3-rc' into hdf5
2017-03-03 09:05:40 +01:00
Erik Frojdh
9e9c109898
adding cmath and std:round interp
2017-02-22 11:31:01 +01:00
Dhanya Maliakal
9b3f4a3a66
commonFiles/error_defs.h
2017-02-03 14:34:05 +01:00
Dhanya Maliakal
87ce1ed736
moved tau to settings file, removed gain and offset, setting threshold loads settings file, setting threshold only sets client variable
2017-02-03 12:29:44 +01:00
Dhanya Maliakal
bd31ac1d52
changes to variable name
2017-01-17 10:55:43 +01:00
987aeda6fb
sorted out problem with CPU read out
2016-12-22 17:24:53 +01:00
3eea80a121
compiles after merging
2016-12-19 13:50:25 +01:00
68b13a0ecd
merged to developer
2016-12-19 12:26:53 +01:00
12cd3d07a2
some changes for jctb
2016-12-19 12:05:59 +01:00
Dhanya Maliakal
e7621a6cd0
moving towards c++ api
2016-12-12 14:24:11 +01:00
Dhanya Maliakal
09d146ee55
changed a printout
2016-11-22 11:39:47 +01:00
cb879c61ca
changes for new chipterboard -now works with reduced dynamic range and analog/digital readout
2016-11-09 11:36:59 +01:00
Dhanya Maliakal
79d5a24af4
debugging
2016-11-04 12:02:37 +01:00
Dhanya Maliakal
754a4f8bdc
q for quit
2016-11-02 16:37:37 +01:00
Thattil Dhanya
40babc23a3
progress uncommented
2016-11-02 16:24:23 +01:00
Dhanya Maliakal
941b3dbb02
progress uncommented
2016-11-02 16:09:22 +01:00
