62a88dadba
Merge branch 'jungfraunew' of github.com:slsdetectorgroup/slsDetectorPackage into esrfchanges
2018-04-23 17:45:12 +02:00
d09a1a0a95
esrf changes: users class added API functionality getNMods
2018-04-23 17:38: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
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
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
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
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
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
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
b029f1fa26
Common mode added, working for gotthard double modules
2018-03-26 09:07:27 +02:00
a1936cb884
updated docu
2018-03-21 09:10:11 +01:00
a36b715eab
resolved conflicts from merging 3.1.1 in here
2018-03-21 09:03:31 +01:00
59ad15b54e
eiger server bug fix: in 10giga mode always used the 1g ip (dhcp ip) if detectorip is before tengiga in config file
2018-03-20 16:36:45 +01:00
688dd15fe9
Jungfrau bug fix: cannot give same adcphase value to pll, updated recommended default of adcphase for half speed and quarter speed, updated client manuals for both adcphase and clkdivider
2018-03-20 12:12:38 +01:00
Erik Frojdh
9ba3fb9279
removed using namespace std from multiSlsDetector
2018-03-16 10:51:27 +01:00
Erik Frojdh
50111bcea7
removed unused variable in slsDetector
2018-03-16 10:41:30 +01:00
ab06c33107
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
2018-03-15 12:27:05 +01:00
10209b75df
some changes in slsCalibration for moench
2018-03-15 12:26:45 +01:00
40210ae26f
jungfrauserver adcphase fix: bug was if adcphase was same as previous value, it still shifted
2018-03-14 17:20:26 +01:00
dd6301d66d
updated for compilation
2018-03-14 16:19:30 +01:00
b58c3e8951
solving merging conflicts from 3.1.0 to developer
2018-03-14 15:45:35 +01:00
258de4947a
updated doc
2018-03-12 15:46:20 +01:00
72970c9669
updated binaries, updated manuals, updated git versioning
2018-03-12 14:21:02 +01:00
Erik Frojdh
b389402d64
Merge branch '3.1.0-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 3.1.0-rc
2018-03-08 17:13:20 +01:00
Erik Frojdh
0d2dd93498
changed setBit and getBit to uint32_t
2018-03-08 17:13:13 +01:00
fee6465213
eiger and jungfrau servers int to uint32_t for read and write registers
2018-03-08 16:46:15 +01:00
Erik Frojdh
339956e5de
changed from int to uint32_t in read and writeRegister
2018-03-08 16:08:31 +01:00
