1247f760f2
virtual hdf file mapping fix for fnum-1 images
2018-04-25 17:39:09 +02:00
11475316fd
eiger binary updated
2018-04-25 17:11:52 +02:00
a09c2e38a3
storage cell fix in gui for non jungfrau detectors
2018-04-25 17:03:25 +02:00
1c49fbb090
virtual hdf file mapping fnum-1 images, fixed
2018-04-25 16:52:14 +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
62a88dadba
Merge branch 'jungfraunew' of github.com:slsdetectorgroup/slsDetectorPackage into esrfchanges
2018-04-23 17:45:12 +02:00
e0bb7d74f4
esrf changes: eiver: initialise global optind variable before calling getopt_long: Needed when multiple receivers are instantiated in the same process
2018-04-23 17:43:54 +02:00
d09a1a0a95
esrf changes: users class added API functionality getNMods
2018-04-23 17:38:40 +02:00
d38108e527
esrf changes: slsReceiver: extend CircularFifo to support blocking/non-blocking transfers:
...
* Add blocking push (for performance) and non-blocking pop (for symmetry), default to blocking operations
* Fix memory fault if Fifo allocation fails
* Fix fifoFree initialisation to fifoSize elements (was fifoSize - 1)
2018-04-23 17:32:40 +02:00
c9675d111a
jungfrau server: fixed the settings for gain2 stages
2018-04-23 16:11:04 +02:00
8f9c657fa0
esrf remove changes: VRS to interpolate, not copy
2018-04-23 14:41:01 +02:00
c35203ebfb
fixed gitinfo
2018-04-23 14:19:55 +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
cac913831c
esrf change: CMake: add support for GCC versions older than 6.1
2018-04-23 12:07:13 +02:00
03e781a0ac
subperiod for eiger implemented in client side
2018-04-23 11:03:23 +02:00
a5a3d4bc78
added jungfrau server binary
2018-04-13 17:42:04 +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
e024774323
added storage cells
2018-04-13 15:05:43 +02:00
bdcccb7732
jungfrau server, changed api, fixed regdefs
2018-04-13 11:43:30 +02:00
5ff2e86060
jungfrau server configuring ASIC timer at server startup
2018-04-13 11:07:22 +02:00
70e193b0fd
valgrind leak from tasks not deleting funcs
2018-04-13 09:35:18 +02:00
c3a9d3c342
fixed a valgrind error
2018-04-12 17:38:15 +02:00
d3c807975f
adding a semaphore to handle end of acq
2018-04-12 15:50:27 +02:00
1c5250ea7f
warning
2018-04-11 17:55:42 +02:00
7cb3b3f8de
Merge branch 'developer' into zmqhandler
2018-04-09 18:21:59 +02:00
7cd35f24b8
added to users class receiverfifodepth, flowcontrol10g, 10gbe
2018-04-09 18:21:43 +02:00
28af3c2642
insignificant print
2018-04-09 17:44:55 +02:00
2bd8e6c166
zmq fixed to have additional json headers using rx_zmqjsonheader
2018-04-09 16:33:14 +02:00
ccdc7d22e9
gappixels also work with new zmq handler
2018-04-09 11:19:31 +02:00
3831896a78
Merge branch 'developer' into zmqhandler
2018-04-09 11:13:37 +02:00
9847729f3c
gap pixels included in gui
2018-04-09 11:13:20 +02:00
0eff9e1401
debug print
2018-04-09 10:13:14 +02:00
4323a837ef
Merge branch 'developer' into zmqhandler
2018-04-09 09:19:46 +02:00
649cb0aed9
added reset frames caught in to users class
2018-04-09 09:18:56 +02:00
8cf6e0cbd6
in between
2018-04-06 17:48:10 +02:00
753290b228
Merge branch 'developer' into zmqhandler
2018-04-06 12:19:16 +02:00
d28f293485
jungfrau and eiger server bug fix: module_firmware_version gets stuck as it expects an int, but should have been for module_serial_number
2018-04-06 12:15:57 +02:00
Erik Frojdh
da010a03d7
added -std=c++98 to CXX flags
2018-04-04 18:07:33 +02:00
72b71f3fcd
Merge branch 'developer' into zmqhandler
2018-04-04 14:57:24 +02:00
e4868671ae
bugfix: users api version numbering always gives a -1.
2018-04-04 14:56:55 +02:00
61897cbd41
in between
2018-04-04 14:27:53 +02:00
9e8d3e598f
added enablegappixels to users class
2018-03-28 10:41:52 +02:00
252e924f92
separated start gui button into start and stop to prevent multiple click syndrome
2018-03-27 17:49:01 +02:00
fe2ba8621b
updating versioning to only have date
2018-03-27 11:00:15 +02:00
b8bdbf4da6
updaterev
2018-03-26 18:10:14 +02:00
5340b8ef24
added error mask for loading/writing config file to be caught by python
2018-03-26 18:07:10 +02:00
807189a492
Working for gotthard double modules
2018-03-26 10:30:44 +02:00
593f5b6c65
Working for gotthard double modules
2018-03-26 10:12:04 +02:00
b029f1fa26
Common mode added, working for gotthard double modules
2018-03-26 09:07:27 +02:00
14546247e4
adding a receiver callback to be able to give modified size from the callback
2018-03-22 14:34:03 +01:00
