|
|
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 |
|
|
|
a654febb7e
|
merge from 3.0.1 parallalize dr
|
2018-02-07 15:48:39 +01:00 |
|
|
|
94b61ea2c4
|
parallelized setting dynamic range
|
2018-02-07 15:45:59 +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 |
|
|
|
c520f10409
|
jungfrau server binaries
|
2018-02-02 15:19:10 +01:00 |
|
|
|
1872deb1dd
|
fix for temperature workaround for fpga
|
2018-02-02 15:17:40 +01:00 |
|
|
|
e6f475d7c4
|
jungfrau server changes in temperature control for fpga bug: default temp threshold and temp event cleared at start and power reg only reads enable and not status
|
2018-02-02 12:37:52 +01:00 |
|
Dhanya Maliakal
|
aebc423fb2
|
Merge branch '3.0.1' into jungfrauchanges
|
2018-02-02 10:25:45 +01:00 |
|
Dhanya Maliakal
|
08fda2b662
|
in between in terms of mythen3 server, done with setdac and set power
|
2018-02-01 17:48:43 +01:00 |
|
Andrä Marie
|
6af3a6d33a
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2018-01-31 11:46:17 +01:00 |
|
Andrä Marie
|
b11b2dcfa9
|
in between stage
|
2018-01-31 11:45:34 +01:00 |
|
Erik Frojdh
|
ee9996908a
|
test
|
2018-01-30 11:24:50 +01:00 |
|
Erik Frojdh
|
caf2548391
|
path
|
2018-01-30 11:15:31 +01:00 |
|
Erik Frojdh
|
8778fa0aca
|
all files in bin
|
2018-01-30 11:05:43 +01:00 |
|
Andrä Marie
|
3782a56ef2
|
second My3 commit
|
2018-01-30 11:02:08 +01:00 |
|
|
|
e95b444908
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2018-01-30 10:25:21 +01:00 |
|
|
|
d1ef6bf94b
|
some fixes in the cluster finder
|
2018-01-30 10:24:56 +01:00 |
|
Erik Frojdh
|
d15fd90e8d
|
hejhej
|
2018-01-29 17:31:32 +01:00 |
|
Erik Frojdh
|
633284cbdd
|
hej
|
2018-01-29 17:28:54 +01:00 |
|
Erik Frojdh
|
a3293f4335
|
more headers
|
2018-01-29 17:27:32 +01:00 |
|
Erik Frojdh
|
3d0d86eb19
|
another
|
2018-01-29 17:22:15 +01:00 |
|
Erik Frojdh
|
915e0d19ca
|
more
|
2018-01-29 17:20:44 +01:00 |
|
Erik Frojdh
|
44b8f482f0
|
multiheader
|
2018-01-29 17:17:43 +01:00 |
|
Erik Frojdh
|
e32a5263e8
|
file io stat
|
2018-01-29 17:15:00 +01:00 |
|
Erik Frojdh
|
e8d0bea1a0
|
file io
|
2018-01-29 17:13:39 +01:00 |
|
Erik Frojdh
|
1ecc194bf8
|
bc
|
2018-01-29 17:10:39 +01:00 |
|
Erik Frojdh
|
fbb8efa5f4
|
angular static
|
2018-01-29 17:07:24 +01:00 |
|
Erik Frojdh
|
b78b2bb678
|
angularConversion
|
2018-01-29 17:05:51 +01:00 |
|
Erik Frojdh
|
d9116ec0b9
|
detectorData.h
|
2018-01-29 17:03:46 +01:00 |
|
Erik Frojdh
|
b6f6122656
|
post processing header
|
2018-01-29 17:00:40 +01:00 |
|
Erik Frojdh
|
80c301f88e
|
oj
|
2018-01-29 16:58:31 +01:00 |
|
Erik Frojdh
|
2feaa27c74
|
more
|
2018-01-29 16:56:27 +01:00 |
|
Erik Frojdh
|
b398322fd2
|
det base
|
2018-01-29 16:54:34 +01:00 |
|
Erik Frojdh
|
66e0049ded
|
set of headers
|
2018-01-29 16:52:17 +01:00 |
|
Erik Frojdh
|
7d48c2f8ee
|
actions
|
2018-01-29 16:48:22 +01:00 |
|
Erik Frojdh
|
988baca7f6
|
more inc
|
2018-01-29 16:46:03 +01:00 |
|
Erik Frojdh
|
afd2cd1923
|
fimnc
|
2018-01-29 16:40:37 +01:00 |
|
Erik Frojdh
|
2963d5c401
|
detector defs
|
2018-01-29 16:38:26 +01:00 |
|
Erik Frojdh
|
2f59d58a50
|
receiver funcs
|
2018-01-29 16:33:35 +01:00 |
|
Erik Frojdh
|
ca059db4e9
|
path
|
2018-01-29 16:30:44 +01:00 |
|
