Erik Frojdh
|
0270e18882
|
new tests
|
2019-04-03 18:11:48 +02:00 |
|
Erik Frojdh
|
a7ab8aa9e6
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2019-04-03 14:48:04 +02:00 |
|
Erik Frojdh
|
3b4d36c3d4
|
bumped cmake to 3.5
|
2019-04-03 14:47:58 +02:00 |
|
|
|
59a0f5fac9
|
Merge branch 'address' into refactor, including minor change in formal argument name
|
2019-04-03 14:22:10 +02:00 |
|
|
|
bbfb5df30d
|
conflict resolved, changed to using hex() instead of str() in configuremac
|
2019-04-03 14:11:01 +02:00 |
|
|
|
d9ea8e6747
|
Merge branch 'refactor' into program2
|
2019-04-02 17:29:00 +02:00 |
|
|
|
5131245f0a
|
all servers except eiger: easier to update firmware and software using update or copydetectorserver, rebootcontroller, and programfpga
|
2019-04-02 17:27:01 +02:00 |
|
Erik Frojdh
|
24f28f14f4
|
clean up
|
2019-04-02 17:00:00 +02:00 |
|
Erik Frojdh
|
45fd35b243
|
Merge branch 'refactor' into address
|
2019-04-02 15:44:57 +02:00 |
|
Erik Frojdh
|
11a452545c
|
added parallel call for void return
|
2019-04-02 15:44:19 +02:00 |
|
Erik Frojdh
|
b198b50377
|
class for Ip and Mac
|
2019-04-02 15:24:25 +02:00 |
|
Erik Frojdh
|
73ad238028
|
removed missed cout
|
2019-04-01 13:15:38 +02:00 |
|
Erik Frojdh
|
959d9aa5d1
|
cleaning and new functions
|
2019-04-01 10:36:47 +02:00 |
|
|
|
45b837b42a
|
program fpga printouts for errors
|
2019-04-01 10:22:50 +02:00 |
|
|
|
969551ae37
|
program fpga made parallel
|
2019-03-29 17:59:06 +01:00 |
|
Erik Frojdh
|
05709e2f47
|
finished
|
2019-03-29 16:29:00 +01:00 |
|
Erik Frojdh
|
d134e54810
|
ip
|
2019-03-29 10:18:10 +01:00 |
|
Erik Frojdh
|
990848554c
|
midpoint
|
2019-03-28 16:16:41 +01:00 |
|
|
|
c38bebd615
|
jungfrau server: added deg and maxadcphaseshift, ctb & moench server: set adc phase like jungfrau that positive shift is positive, moved conversion between shift to degrees to the common function. receiver: removed unused variables
|
2019-03-28 09:35:53 +01:00 |
|
|
|
c7c52c63cd
|
ctb & moench: phase fix for absolute within limits, option to set as degrees and get max phase shift, bug fix for eiger with implementation of 2 udp interface
|
2019-03-27 12:25:38 +01:00 |
|
|
|
7cd5bc8b2d
|
jungfrau: switching between 2 and 1 interface, implementation for server required when firmware done
|
2019-03-26 15:00:19 +01:00 |
|
Erik Frojdh
|
d4ac6fe160
|
gitinfo as public
|
2019-03-20 17:48:01 +01:00 |
|
Erik Frojdh
|
83e43b1bcf
|
format ColumnLimit changed to 100
|
2019-03-20 17:31:19 +01:00 |
|
Erik Frojdh
|
2a01688683
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2019-03-20 17:07:29 +01:00 |
|
Erik Frojdh
|
4b2c6af4f5
|
reorganizing of slsDetectorSoftware
|
2019-03-20 17:07:02 +01:00 |
|
|
|
3ff01bf609
|
removed minor warnings for unused ret
|
2019-03-20 17:07:02 +01:00 |
|
Erik Fröjdh
|
03402d0e9e
|
Error handling with exceptions in slsDetector and multiSlsDetector (#14)
* less error mask
* removing error mask from slsDetector
* removed ErrorMask
* setonline, setreceiveornline bug fix
|
2019-03-20 16:23:41 +01:00 |
|
|
|
685fcc31b6
|
setonline, setreceiveronline was never really setting offline flag, so was never really updating detector first time
|
2019-03-19 18:42:45 +01:00 |
|
Erik Frojdh
|
4e56107015
|
new socket overload
|
2019-03-19 17:49:20 +01:00 |
|
Erik Frojdh
|
6759b2eeb8
|
refactor getID
|
2019-03-19 16:27:07 +01:00 |
|
Erik Frojdh
|
38bf540c1a
|
fixed segfault on loading trimbits
|
2019-03-18 18:10:50 +01:00 |
|
Erik Frojdh
|
43012e4f28
|
more const more python
|
2019-03-18 17:38:44 +01:00 |
|
Erik Frojdh
|
43d478076c
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2019-03-18 12:06:49 +01:00 |
|
Erik Frojdh
|
4036e6af8d
|
const qualified multi calls, python fixes
|
2019-03-18 12:06:39 +01:00 |
|
|
|
fad73a57aa
|
minor
|
2019-03-18 09:19:04 +01:00 |
|
Erik Frojdh
|
c0d5303b70
|
removed pycache
|
2019-03-15 17:59:36 +01:00 |
|
Erik Frojdh
|
c93b78c74f
|
working
|
2019-03-15 13:50:50 +01:00 |
|
Erik Frojdh
|
c153be95d1
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2019-03-15 10:15:50 +01:00 |
|
Erik Frojdh
|
4943983d10
|
det id const and ini shm in constructor
|
2019-03-15 10:15:42 +01:00 |
|
|
|
5fe7a86361
|
switching udpsocketbuffersize from uitn64_t to int64_t, printing socket exception into tcp error mess, changing an exception message
|
2019-03-15 10:00:22 +01:00 |
|
Erik Frojdh
|
9f724f0c0d
|
using only sls exceptions
|
2019-03-14 17:09:44 +01:00 |
|
Erik Frojdh
|
bad44f5bf4
|
moving SharedMemory into namespace sls
|
2019-03-14 16:51:38 +01:00 |
|
Erik Frojdh
|
40d2f66146
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2019-03-14 16:37:46 +01:00 |
|
Erik Frojdh
|
9639e480d9
|
new exceptions
|
2019-03-14 16:37:36 +01:00 |
|
|
|
be33102164
|
checkonline, checkrecieveronline, retval has offline hostnames, online flag should be set no matter what the outcome
|
2019-03-14 13:18:42 +01:00 |
|
|
|
cb687d805e
|
merge conflict
|
2019-03-14 12:41:37 +01:00 |
|
|
|
327d08a016
|
removing comments, added one check for nullptr, updated current threshold when getting module, removing unsued function from header file (writesettingsfile)
|
2019-03-14 12:40:01 +01:00 |
|
Erik Frojdh
|
c9422befff
|
fixed loading trimbits
|
2019-03-14 10:21:18 +01:00 |
|
Erik Frojdh
|
d21ceb0e75
|
only construct shared memory from a type with exact size
|
2019-03-13 17:43:48 +01:00 |
|
Erik Frojdh
|
9a08c85b2a
|
changed the shared memory of slsDetector
|
2019-03-13 17:38:27 +01:00 |
|
