Dhanya Maliakal
|
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 |
|
Dhanya Maliakal
|
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 |
|
Dhanya Maliakal
|
59c0861131
|
Merge branch '3.0.1' into developer
|
2017-12-19 17:51:31 +01:00 |
|
Dhanya Maliakal
|
6690335971
|
gotthard server bug fix, temp read
|
2017-12-19 17:50:20 +01:00 |
|
Dhanya Maliakal
|
bc8c706150
|
updated gotthard server binaries (3.0.0.6 was already used in 3.0.1)
|
2017-12-19 17:44:32 +01:00 |
|
Dhanya Maliakal
|
e39bee0113
|
gotthard server bug fix, temp fail
|
2017-12-19 17:33:27 +01:00 |
|
Dhanya Maliakal
|
a4dc00b252
|
gotthard server binary update
|
2017-12-19 17:08:28 +01:00 |
|
Dhanya Maliakal
|
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 |
|
|
|
7602ffc5ac
|
gotthard on the fly to be stested
|
2017-12-14 17:01:28 +01:00 |
|
|
|
13078d0ef2
|
gotthardDataStructures added
|
2017-12-14 17:00:30 +01:00 |
|
|
|
9f3468bd15
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2017-12-14 16:59:04 +01:00 |
|
|
|
b50c1d966a
|
on the fly moench photon finder and cluster saving
|
2017-12-14 16:58:22 +01:00 |
|
Dhanya Maliakal
|
65a91c519e
|
Merge branch '3.0.1' into developer
|
2017-12-14 14:29:16 +01:00 |
|
Dhanya Maliakal
|
0649626842
|
made the color fix for black/white backgrounds
|
2017-12-14 14:29:07 +01:00 |
|
Dhanya Maliakal
|
5958cf9278
|
Merge remote branch 'slsDetectorCalibration/developer' into developer
|
2017-12-12 11:14:38 +01:00 |
|
Dhanya Maliakal
|
e7f7e0f280
|
Merge remote branch 'slsDetectorCalibration/3.0.1' into 3.0.1
|
2017-12-12 11:14:30 +01:00 |
|
Dhanya Maliakal
|
735b8ea206
|
Merge remote branch 'slsDetectorCalibration/3.0' into 3.0
|
2017-12-12 11:14:24 +01:00 |
|
Dhanya Maliakal
|
f6e1c21137
|
Merge branch '3.0.1' into developer
|
2017-12-12 09:05:50 +01:00 |
|
Dhanya Maliakal
|
8da5b8318f
|
removed a few stuff from gitignore
|
2017-12-12 09:05:39 +01:00 |
|
Dhanya Maliakal
|
d2319459df
|
Merge branch '3.0.1' into developer
|
2017-12-11 18:03:01 +01:00 |
|
helfenstein_p
|
03de29de90
|
refine threadpool mutex, remove unlock before destroying, unlocking twice is undefined behaviour
|
2017-12-11 18:02:33 +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
|
4c0a16cd75
|
Merge branch '3.0.1' into developer
|
2017-12-11 11:13:32 +01:00 |
|
Dhanya Maliakal
|
d6a4f83a99
|
ignore misleading indentation
|
2017-12-11 11:13:25 +01:00 |
|
Dhanya Maliakal
|
e39d0aee56
|
Merge branch '3.0.1' into developer
|
2017-12-11 10:51:28 +01:00 |
|
Dhanya Maliakal
|
29d66e455d
|
possible to make only certain components of system
|
2017-12-11 10:51:19 +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 |
|
Dhanya Maliakal
|
8c123982d2
|
get detector and receiver status only when necessary for stopacquisition
|
2017-12-08 11:50:10 +01:00 |
|
Dhanya Maliakal
|
6e876d79ee
|
conflict merged fix, lockin in stop and startandreadallnowait, r_restreamstop moved to stop
|
2017-12-08 11:45:29 +01:00 |
|
Dhanya Maliakal
|
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 |
|
Dhanya Maliakal
|
4718378d0a
|
corrected bug fix in r_restreamstop
|
2017-12-06 19:21:28 +01:00 |
|
Dhanya Maliakal
|
24c305ec59
|
solved conflicts from merge of version being used to binary
|
2017-12-06 19:07:06 +01:00 |
|
Dhanya Maliakal
|
bf9905ad2a
|
possible to use binary --version or -v to get the branch and versionid
|
2017-12-06 19:05:35 +01:00 |
|
Dhanya Maliakal
|
c4a242e10a
|
changed all variables from svn to git, included --version for receiver binary
|
2017-12-06 10:29:57 +01:00 |
|
|
|
1bf7b4a6a1
|
directory restuctured
|
2017-12-06 09:10:13 +01:00 |
|
Dhanya Maliakal
|
2f3dc8d109
|
Merge branch '3.0.1' into developer
|
2017-12-06 08:44:21 +01:00 |
|
Dhanya Maliakal
|
7436d6c8d3
|
updaterev
|
2017-12-06 08:44:07 +01:00 |
|
Dhanya Maliakal
|
7e932bf84b
|
Merge branch '3.0.1' into developer
|
2017-12-05 16:04:26 +01:00 |
|
Dhanya Maliakal
|
b498043ea6
|
remember old read freq if not 0 in gui
|
2017-12-05 16:04:10 +01:00 |
|
Dhanya Maliakal
|
98e09b29d5
|
merge conflict solved -1 in adc in gui
|
2017-12-05 15:39:02 +01:00 |
|
Dhanya Maliakal
|
7aaf95a565
|
-1 in getadc fixed in gui as well
|
2017-12-05 15:37:34 +01:00 |
|
Dhanya Maliakal
|
a51f4f1252
|
Merge branch '3.0.1' into developer
|
2017-12-05 14:49:32 +01:00 |
|
Dhanya Maliakal
|
7b1f935da2
|
allowing to read adcs/temp during acquire
|
2017-12-05 14:49:20 +01:00 |
|
Dhanya Maliakal
|
2d14da545d
|
Merge branch '3.0.1' into developer
|
2017-12-05 13:47:09 +01:00 |
|
Dhanya Maliakal
|
ce1ec97571
|
some indentation in writing config file
|
2017-12-05 13:47:01 +01:00 |
|
Dhanya Maliakal
|
9150556209
|
merge from 3.0.1 added more to write config/paramters
|
2017-12-05 13:42:35 +01:00 |
|
