 maliakal_d
|
9e8d3e598f
|
added enablegappixels to users class
|
2018-03-28 10:41:52 +02:00 |
|
|
maliakal_d
|
fe2ba8621b
|
updating versioning to only have date
|
2018-03-27 11:00:15 +02:00 |
|
|
maliakal_d
|
b8bdbf4da6
|
updaterev
|
2018-03-26 18:10:14 +02:00 |
|
|
maliakal_d
|
5340b8ef24
|
added error mask for loading/writing config file to be caught by python
|
2018-03-26 18:07:10 +02:00 |
|
|
maliakal_d
|
a1936cb884
|
updated docu
|
2018-03-21 09:10:11 +01:00 |
|
|
maliakal_d
|
a36b715eab
|
resolved conflicts from merging 3.1.1 in here
|
2018-03-21 09:03:31 +01:00 |
|
|
maliakal_d
|
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 |
|
|
maliakal_d
|
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 |
|
|
maliakal_d
|
40210ae26f
|
jungfrauserver adcphase fix: bug was if adcphase was same as previous value, it still shifted
|
2018-03-14 17:20:26 +01:00 |
|
|
maliakal_d
|
dd6301d66d
|
updated for compilation
|
2018-03-14 16:19:30 +01:00 |
|
|
maliakal_d
|
b58c3e8951
|
solving merging conflicts from 3.1.0 to developer
|
2018-03-14 15:45:35 +01:00 |
|
|
maliakal_d
|
258de4947a
|
updated doc
|
2018-03-12 15:46:20 +01:00 |
|
|
maliakal_d
|
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 |
|
|
maliakal_d
|
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 |
|
|
maliakal_d
|
3878212ffd
|
jungfrau server adcphase not responding to a get properly
|
2018-03-08 15:17:14 +01:00 |
|
|
maliakal_d
|
7649865a8f
|
jungfrau bug fix: adc phase corrected to correctly return value in -1
|
2018-03-08 14:02:02 +01:00 |
|
|
Erik Frojdh
|
06cdf8ad92
|
overloading access operator
|
2018-02-28 17:34:55 +01:00 |
|
|
maliakal_d
|
28101bed22
|
updated binaries
|
2018-02-27 14:37:46 +01:00 |
|
|
maliakal_d
|
1f6c289fd4
|
gotthard server : bugfix for getting id
|
2018-02-27 14:33:58 +01:00 |
|
|
maliakal_d
|
61e7c0148f
|
updating versions to 3.1.0
|
2018-02-27 12:40:53 +01:00 |
|
|
maliakal_d
|
5849725b97
|
posisibility to overwrite rx_udpmac even with receiver
|
2018-02-26 18:22:07 +01:00 |
|
|
maliakal_d
|
74f327a959
|
gotthard server: red in stopping server for debugging
|
2018-02-26 17:34:35 +01:00 |
|
|
maliakal_d
|
de3bfd85a1
|
fixed gothard not taking initial images after configuring MAC of detector.
|
2018-02-26 17:07:12 +01:00 |
|
|
maliakal_d
|
d14234ee38
|
jungfrau server bianries
|
2018-02-26 14:43:53 +01:00 |
|
|
maliakal_d
|
a4aa862ee4
|
bugfix jungfrau server : tdma bit also needs to be set to enable
|
2018-02-26 14:43:11 +01:00 |
|
|
maliakal_d
|
0b017b886c
|
added release documentation
|
2018-02-26 13:28:31 +01:00 |
|
|
maliakal_d
|
7859df6aa3
|
bug fix: 1000+ errors on gui startup(setreceiveronline not done), removed gui mesage popup for different output paths, fixed jungfrau to have multiple detectors in x dir in gui
|
2018-02-26 12:44:32 +01:00 |
|
|
maliakal_d
|
ebe1ff4563
|
jungfrau virtual server needed the stop server as well
|
2018-02-23 15:32:05 +01:00 |
|
|
maliakal_d
|
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 |
|
|
maliakal_d
|
1e479a5c77
|
Merge branch '3.0.1' of github.com:slsdetectorgroup/slsDetectorPackage into 3.0.1
|
2018-02-23 12:48:25 +01:00 |
|
|
maliakal_d
|
9322c176f2
|
jungfrau server virtual
|
2018-02-23 12:48:11 +01:00 |
|
|
maliakal_d
|
639fdac232
|
created jungfrau virtual server(in next commit), edited install manual to give out html pages without subsection toc, links, navigaion, spilit into as many sections etc for wiki page
|
2018-02-23 12:45:31 +01:00 |
|
 lopez_c
|
7364f674ed
|
[JUNGFRAU] - Modified memory map address shift for the interface between FPGA and Blackfin SOM. Shift has to be set to 1 since the basic AMC data transfers is 8-bit and not 16-bit.
|
2018-02-22 11:15:24 +01:00 |
|
|
Erik Frojdh
|
76bd2c69bc
|
added vrs to Eiger dacs to interpolate
|
2018-02-19 12:04:05 +01:00 |
|
|
Erik Frojdh
|
77aa3fa215
|
added overloading of call operator for access detector
|
2018-02-16 15:25:35 +01:00 |
|
|
maliakal_d
|
459b588b9f
|
merge from 3.0.1 for gotthard 25um server start acq delay
|
2018-02-08 15:17:52 +01:00 |
|
|
maliakal_d
|
8bf03a7712
|
Merge branch '3.0.1' into developer
|
2018-02-08 15:16:49 +01:00 |
|
|
maliakal_d
|
4338217bda
|
jungfrau 25um server, added start acq delay to server config file
|
2018-02-08 15:16:23 +01:00 |
|
|
maliakal_d
|
895f8ccf81
|
Merge branch '3.0.1' into developer
|
2018-02-08 14:51:20 +01:00 |
|
|
Erik Frojdh
|
0cb5941fc4
|
Merge branch '3.0.1' into condatest
|
2018-02-08 13:52:51 +01:00 |
|
|
maliakal_d
|
f7bf1ae2f1
|
gotthard server simplified trigger, remove synchronization and master for 50um, changed measurement time, fixed compiler bugs
|
2018-02-08 11:40:35 +01:00 |
|
|
Erik Frojdh
|
dde032acc8
|
reverting locations
|
2018-02-08 10:54:07 +01:00 |
|
|
Erik Frojdh
|
23c5a73285
|
Merge branch '3.0.1' into condatest
|
2018-02-08 10:36:06 +01:00 |
|
|
maliakal_d
|
a654febb7e
|
merge from 3.0.1 parallalize dr
|
2018-02-07 15:48:39 +01:00 |
|
|
maliakal_d
|
94b61ea2c4
|
parallelized setting dynamic range
|
2018-02-07 15:45:59 +01:00 |
|