|
|
014b8cf9a6
|
fixed problem with dbitpipeline in ctb gui
|
2019-08-28 12:05:45 +02:00 |
|
|
|
f123a280bb
|
added save pattern, printout of some of the pattern for command line
|
2019-08-27 16:41:38 +02:00 |
|
|
|
7abb18e5c8
|
added load paramaters to detector.h
|
2019-08-27 11:24:53 +02:00 |
|
|
|
fc0b25cfa7
|
gui bug fix: hostname print out and acquisition index
|
2019-08-27 09:25:10 +02:00 |
|
Dhanya Thattil
|
aafe049a9b
|
Guidetector (#54)
* WIP
* dacWidget
* main WIP
* advanced WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* works
* updated gui to chrono
* review fixes
* unitque ptrs in gui
|
2019-08-26 19:14:22 +02:00 |
|
Marie Andrä
|
7a4c1161ab
|
add default period for mythen3 (#56)
|
2019-08-26 12:03:20 +02:00 |
|
|
|
94013a7fad
|
delay not implemented for mythen3 and gotthad2
|
2019-08-26 11:58:34 +02:00 |
|
|
|
aecf3bb7db
|
gotthard udp fix
|
2019-08-26 11:47:28 +02:00 |
|
|
|
3497175b15
|
merge resovled
|
2019-08-26 10:55:44 +02:00 |
|
|
|
298e1dd1fe
|
udp virtual of gotthard2
|
2019-08-26 10:54:01 +02:00 |
|
Marie Andrä
|
f981825172
|
virtual UDP for mythen3 (#55)
|
2019-08-26 10:53:17 +02:00 |
|
|
|
3b2feba3b2
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2019-08-26 09:59:52 +02:00 |
|
|
|
386b6601a8
|
initial version of gotthard2
|
2019-08-26 09:59:27 +02:00 |
|
Erik Fröjdh
|
9a48d9b832
|
Intcmd (#53)
* migrated more
* more
|
2019-08-23 17:39:41 +02:00 |
|
Erik Frojdh
|
2c5ff0e9bf
|
fixed output
|
2019-08-23 15:44:47 +02:00 |
|
Erik Frojdh
|
e89b65002a
|
minor
|
2019-08-23 15:11:57 +02:00 |
|
Erik Frojdh
|
5866e330c1
|
fixed test
|
2019-08-23 14:43:58 +02:00 |
|
Erik Fröjdh
|
5c06549982
|
Cleanup of the CmdProxy and migrated some commands (#52)
* migrated rx_fifodepth
* Moved and cleand CmdProxy
* rx_slient
* new commands
* examples
* fixed result string print
|
2019-08-23 14:32:44 +02:00 |
|
|
|
975a5a4cab
|
moench03T1ZmqData added
|
2019-08-23 12:05:19 +02:00 |
|
Erik Frojdh
|
57ac5c0dab
|
moved CmdLineParser to sls::
|
2019-08-23 10:42:35 +02:00 |
|
Erik Frojdh
|
6a20a780fe
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2019-08-23 10:28:57 +02:00 |
|
Erik Frojdh
|
7afe0c510e
|
multiSlsDetectorClient.cpp added .h cleaned
|
2019-08-23 10:28:50 +02:00 |
|
|
|
8ec0ac4eb3
|
client bug fix: was configuring mac even for a get of tengiga enable
|
2019-08-23 10:21:20 +02:00 |
|
|
|
322970ebed
|
ctb gui option in cmk.sh enabled
|
2019-08-23 10:18:45 +02:00 |
|
Erik Frojdh
|
9e40c06786
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2019-08-23 09:30:45 +02:00 |
|
Erik Frojdh
|
caedfbebd5
|
removed two doxy.config
|
2019-08-23 09:30:38 +02:00 |
|
Erik Fröjdh
|
3ca52176b7
|
CMake support for CTB Gui (#51)
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP builds...
* clean up
* root 6.18 support
|
2019-08-22 21:21:04 +02:00 |
|
|
|
867bce8b38
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2019-08-22 15:59:24 +02:00 |
|
|
|
170db19f48
|
initial functions for mythen3
|
2019-08-22 15:58:32 +02:00 |
|
|
|
4b7ab98135
|
initial functions for mythen3
|
2019-08-22 15:55:27 +02:00 |
|
|
|
72362b0334
|
first version of mythen3
|
2019-08-22 12:34:06 +02:00 |
|
|
|
794b6f8090
|
added detector type
|
2019-08-22 10:58:03 +02:00 |
|
Gemma Tinti
|
7fd5d7c610
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2019-08-21 20:25:08 +02:00 |
|
Gemma Tinti
|
199ecbce80
|
transmission delays
|
2019-08-21 20:24:59 +02:00 |
|
|
|
d4a2af1693
|
CTB fixed 10Gb data structures for the GUI (to be tested)
|
2019-08-21 17:31:25 +02:00 |
|
|
|
e247605b76
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2019-08-21 17:20:18 +02:00 |
|
|
|
0735f890a3
|
Modified waveform plots for 10Gb (to be tested)
|
2019-08-21 17:19:54 +02:00 |
|
|
|
3d78b7b6a7
|
updated al the binaries
|
2019-08-21 17:10:20 +02:00 |
|
|
|
1b5e939748
|
Added 10Gb data structures for moench04 (to be tested)
|
2019-08-21 16:57:54 +02:00 |
|
|
|
2ef9aa0ea0
|
fixed conflict
|
2019-08-21 16:28:45 +02:00 |
|
|
|
cadb4cff93
|
moench02 common mode moved to new structure
|
2019-08-21 16:27:14 +02:00 |
|
|
|
e04242c5fa
|
ctb gui progress call back fix
|
2019-08-21 15:40:19 +02:00 |
|
|
|
434aa78a04
|
Merge branch 'developer' into apidhanya
|
2019-08-21 15:36:08 +02:00 |
|
|
|
cf045d8a1d
|
ctb gui fix
|
2019-08-21 15:18:50 +02:00 |
|
|
|
a98271f0c2
|
merge resolved
|
2019-08-21 14:25:21 +02:00 |
|
|
|
5c393e6204
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2019-08-21 13:23:38 +02:00 |
|
|
|
5eaea5fb8d
|
updated ctb server
|
2019-08-21 13:22:43 +02:00 |
|
|
|
f0ba8a06ce
|
ctb 10g fix for old reciever
|
2019-08-21 13:21:35 +02:00 |
|
|
|
4b0fb5029f
|
WIP
|
2019-08-21 12:45:08 +02:00 |
|
Erik Fröjdh
|
b4c207fc4e
|
Less data race in slsReceiver (#50)
* removed some data races
* non needed mutex
* removed extra include
|
2019-08-21 12:02:06 +02:00 |
|
