|
|
1ecc194bf8
|
bc
|
2018-01-29 17:10:39 +01:00 |
|
|
|
fbb8efa5f4
|
angular static
|
2018-01-29 17:07:24 +01:00 |
|
|
|
b78b2bb678
|
angularConversion
|
2018-01-29 17:05:51 +01:00 |
|
|
|
d9116ec0b9
|
detectorData.h
|
2018-01-29 17:03:46 +01:00 |
|
|
|
b6f6122656
|
post processing header
|
2018-01-29 17:00:40 +01:00 |
|
|
|
80c301f88e
|
oj
|
2018-01-29 16:58:31 +01:00 |
|
|
|
2feaa27c74
|
more
|
2018-01-29 16:56:27 +01:00 |
|
|
|
b398322fd2
|
det base
|
2018-01-29 16:54:34 +01:00 |
|
|
|
66e0049ded
|
set of headers
|
2018-01-29 16:52:17 +01:00 |
|
|
|
7d48c2f8ee
|
actions
|
2018-01-29 16:48:22 +01:00 |
|
|
|
988baca7f6
|
more inc
|
2018-01-29 16:46:03 +01:00 |
|
|
|
afd2cd1923
|
fimnc
|
2018-01-29 16:40:37 +01:00 |
|
|
|
2963d5c401
|
detector defs
|
2018-01-29 16:38:26 +01:00 |
|
|
|
87d539a040
|
header
|
2018-01-29 16:18:12 +01:00 |
|
|
|
3a18a0a6cf
|
o
|
2018-01-23 17:49:40 +01:00 |
|
|
|
fd03cf5b0f
|
and more targets
|
2018-01-23 17:46:35 +01:00 |
|
|
|
b3d6bc1800
|
targets
|
2018-01-23 17:37:54 +01:00 |
|
|
|
0242db7e7a
|
target for install
|
2018-01-23 17:16:26 +01:00 |
|
|
|
3aeb3f58d1
|
first mythen3Server commit
|
2018-01-22 14:01:46 +01:00 |
|
|
|
92b4b3324e
|
first mythen3 server commit
|
2018-01-18 09:25:06 +01:00 |
|
|
|
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 |
|
|
|
2d6e4c95a2
|
temp_threshold, temp_control, temp_event done
|
2018-01-11 15:37:24 +01:00 |
|
|
|
a87687199f
|
jungfrau server: minor typo in previous ocmmit
|
2018-01-11 11:36:40 +01:00 |
|
|
|
d879379aa4
|
jungfrau server: incorporated transmission delay
|
2018-01-11 11:33:26 +01:00 |
|
|
|
8fc3d97e78
|
jungfrau server: changed delay to trigger delay to have better trigger being caught
|
2018-01-11 09:26:50 +01:00 |
|
|
|
beabd03be2
|
jungfrau server: (also previous commit) date changed to have only 6 nibbles in format yymmdd
|
2018-01-11 09:24:49 +01:00 |
|
|
|
348a426242
|
updating to have developer's debug mode, resetfpga, programfpga and added api versioning, changed software date to only have date
|
2018-01-11 09:14:45 +01:00 |
|
|
|
68d6c514a9
|
jungfrau server has same resetfpga, programfpga and debug mode as developer branch, eiger server has effects from debug flag, but not compiled
|
2018-01-10 15:49:40 +01:00 |
|
|
|
59c0861131
|
Merge branch '3.0.1' into developer
|
2017-12-19 17:51:31 +01:00 |
|
|
|
6690335971
|
gotthard server bug fix, temp read
|
2017-12-19 17:50:20 +01:00 |
|
|
|
bc8c706150
|
updated gotthard server binaries (3.0.0.6 was already used in 3.0.1)
|
2017-12-19 17:44:32 +01:00 |
|
|
|
e39bee0113
|
gotthard server bug fix, temp fail
|
2017-12-19 17:33:27 +01:00 |
|
|
|
a4dc00b252
|
gotthard server binary update
|
2017-12-19 17:08:28 +01:00 |
|
|
|
6438238b55
|
gotthard server bug fix, read temp
|
2017-12-19 17:06:45 +01:00 |
|
|
|
31589ce352
|
added and fixed gotthard 25um file and zmq photon finder
|
2017-12-19 13:40:05 +01:00 |
|
|
|
d2319459df
|
Merge branch '3.0.1' into developer
|
2017-12-11 18:03:01 +01:00 |
|
|
|
03de29de90
|
refine threadpool mutex, remove unlock before destroying, unlocking twice is undefined behaviour
|
2017-12-11 18:02:33 +01:00 |
|
|
|
d6bdbf8524
|
Merge branch '3.0.1' into developer
|
2017-12-11 13:51:20 +01:00 |
|
|
|
bb3e5351b4
|
solving warnings from latest linux
|
2017-12-11 13:51:11 +01:00 |
|
|
|
1e849097ea
|
merge conflict fixed in filename bug
|
2017-12-08 12:09:10 +01:00 |
|
|
|
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 |
|
|
|
7577d03e75
|
Merge branch '3.0.1' into developer
|
2017-12-08 11:50:15 +01:00 |
|
|
|
8c123982d2
|
get detector and receiver status only when necessary for stopacquisition
|
2017-12-08 11:50:10 +01:00 |
|
|
|
6e876d79ee
|
conflict merged fix, lockin in stop and startandreadallnowait, r_restreamstop moved to stop
|
2017-12-08 11:45:29 +01:00 |
|
|
|
40a7b3983a
|
put some locking in stop acquisition and startandreadallnowait (bugs threadpool with more evernts than normal due to main and processing thread with no locks for detector releated stuff, zmqthreadpool not required, r_restreamstop moved to status stop when idle
|
2017-12-08 11:40:07 +01:00 |
|
|
|
4718378d0a
|
corrected bug fix in r_restreamstop
|
2017-12-06 19:21:28 +01:00 |
|
|
|
24c305ec59
|
solved conflicts from merge of version being used to binary
|
2017-12-06 19:07:06 +01:00 |
|
|
|
bf9905ad2a
|
possible to use binary --version or -v to get the branch and versionid
|
2017-12-06 19:05:35 +01:00 |
|
|
|
c4a242e10a
|
changed all variables from svn to git, included --version for receiver binary
|
2017-12-06 10:29:57 +01:00 |
|
|
|
2f3dc8d109
|
Merge branch '3.0.1' into developer
|
2017-12-06 08:44:21 +01:00 |
|
