d09a1a0a95
esrf changes: users class added API functionality getNMods
2018-04-23 17:38:40 +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
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
70e193b0fd
valgrind leak from tasks not deleting funcs
2018-04-13 09:35:18 +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
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
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
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
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
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
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
7649865a8f
jungfrau bug fix: adc phase corrected to correctly return value in -1
2018-03-08 14:02:02 +01:00
61e7c0148f
updating versions to 3.1.0
2018-02-27 12:40:53 +01:00
5849725b97
posisibility to overwrite rx_udpmac even with receiver
2018-02-26 18:22:07 +01:00
c3d6852f97
fixed threshold returning 1 if a trimbit file missing for eiger, it now returns -1, as both values are different
2018-02-23 14:49:18 +01:00
aa190fda7a
merge from 3.0.1: eiger server detip and mac client updated back
2018-02-07 15:24:44 +01:00
a6b917851c
finetuning printout
2018-02-07 15:22:19 +01:00
5198e67dbd
made the detector ip and detector mac update client in configuremac
2018-02-07 15:16:16 +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
618f6291cf
server binaries for all, jungfgrauserver with adcphase returning something, serverclient interface fixed for others not using tempcontrol, detectornumber not used for settings file for non eiger/mythen, server dates removing rev number
2018-02-07 09:23:52 +01:00
3da6a6df65
merge conflict removed, jungfrau server and eiger server re compiled
2018-02-05 12:33:05 +01:00
e6bd874a88
modified jungfrau server and client to make auto_comp_disable a not yet implemented feature as it requires a firmware upgrade
2018-02-05 11:50:22 +01:00
5d04067973
added auto comp disable feature
2018-02-02 18:01:01 +01:00
Andrä Marie
3782a56ef2
second My3 commit
2018-01-30 11:02:08 +01:00
Andrä Marie
3aeb3f58d1
first mythen3Server commit
2018-01-22 14:01:46 +01:00
Dhanya Maliakal
061abf7be0
jungfrau server: changes to ensure no update of detector during this, included power chip to read the status bit and give error if temp event is up
2018-01-11 16:52:08 +01:00
Dhanya Maliakal
2d6e4c95a2
temp_threshold, temp_control, temp_event done
2018-01-11 15:37:24 +01:00
Dhanya Maliakal
d6bdbf8524
Merge branch '3.0.1' into developer
2017-12-11 13:51:20 +01:00
Dhanya Maliakal
bb3e5351b4
solving warnings from latest linux
2017-12-11 13:51:11 +01:00
Dhanya Maliakal
1e849097ea
merge conflict fixed in filename bug
2017-12-08 12:09:10 +01:00
Dhanya Maliakal
e19d564364
bug fix no reciever could not set file name for mythen for eg., also bug fix that did not allow _s, _S, _p, _d as suffix to file name
2017-12-08 12:06:10 +01:00
Dhanya Maliakal
7577d03e75
Merge branch '3.0.1' into developer
2017-12-08 11:50:15 +01:00
