|
|
e1a16cae3f
|
remove
|
2021-02-01 09:55:07 +01:00 |
|
|
|
763c56a6fb
|
Merge branch 'master' into 'master'
My Changes
See merge request archiver_config/sf_databuffer!34
|
2021-01-14 11:39:29 +01:00 |
|
|
|
d143b9773d
|
2nd BS on 0051 and 1st on 0201 added
|
2021-01-14 09:29:24 +01:00 |
|
|
|
7b3b8c3d6a
|
Merge branch 'master' into 'master'
My Changes
See merge request archiver_config/sf_databuffer!33
|
2021-01-06 16:45:46 +01:00 |
|
|
|
b4a882e778
|
LAS0071 added
|
2021-01-06 12:52:28 +01:00 |
|
|
|
5de2e94b57
|
added restart script for data-api-xx server
|
2020-12-19 11:55:00 +01:00 |
|
|
|
f7f16e03be
|
add restart for imagebuffer api3
|
2020-12-18 08:36:54 +01:00 |
|
|
|
7e525ec76c
|
moved operation tools from databuffer code to here
|
2020-12-16 10:30:32 +01:00 |
|
|
|
3564d9bdf8
|
add details to request workflow
|
2020-12-15 17:05:04 +01:00 |
|
|
|
c0d6cb6fbe
|
Merge branch 'master' into 'master'
Added new BPMs
See merge request sf_config/sf_daq_sources!32
|
2020-12-15 15:34:28 +01:00 |
|
Marinkovic Goran
|
b300c0dbfe
|
Added new BPMs
|
2020-12-15 08:30:36 +01:00 |
|
|
|
463af1303c
|
Bernina processing pipelines
|
2020-12-09 16:16:55 +01:00 |
|
|
|
6bde069a56
|
Merge branch 'master' into 'master'
My Changes
See merge request sf_config/sf_daq_sources!31
|
2020-12-08 11:54:48 +01:00 |
|
|
|
f22057b247
|
SARES12 Keysight added
|
2020-12-02 17:30:48 +01:00 |
|
|
|
d2381ec111
|
Merge branch 'master' into 'master'
changed SATES21 and SARES11 M1 cameras to use original cam_server
See merge request sf_config/sf_daq_sources!30
|
2020-11-26 11:08:54 +01:00 |
|
Celcer Tine
|
f73a1a41cd
|
changed SATES21 and SARES11 M1 cameras back to original cam_server
|
2020-11-26 11:05:46 +01:00 |
|
|
|
ab2a43514f
|
Merge branch 'master' into 'master'
Change to bsreadcopy
See merge request sf_config/sf_daq_sources!29
|
2020-11-25 14:35:35 +01:00 |
|
Marinkovic Goran
|
8a2028586e
|
change to bsreadcopy
|
2020-11-25 11:43:14 +01:00 |
|
|
|
2c50eba216
|
Merge branch 'master' into 'master'
changed SATES21 and SARES11 M1 cameras to use daqsync-03 test cam_server
See merge request sf_config/sf_daq_sources!28
|
2020-11-24 17:52:39 +01:00 |
|
Celcer Tine
|
1508187294
|
changed SATES21 and SARES11 M1 cameras to use daqsync-03 test cam_server
|
2020-11-24 17:47:52 +01:00 |
|
|
|
92b6d95c13
|
Merge branch 'master' into 'master'
Added new BPM SATUN14-DBPM410
See merge request sf_config/sf_daq_sources!27
|
2020-11-11 07:59:23 +01:00 |
|
Marinkovic Goran
|
25342c09af
|
Added new BPM SATUN14-DBPM410
|
2020-11-10 08:03:27 +01:00 |
|
|
|
f7cd0c4291
|
Merge branch 'master' into 'master'
tests finished - changing back from daqsync-03 host to original hosts
See merge request sf_config/sf_daq_sources!26
|
2020-11-06 14:05:54 +01:00 |
|
Celcer Tine
|
ce29a8f03a
|
tests finished - changed hosts back from sf-daqsync-03-v346 to original hosts
|
2020-11-06 13:58:56 +01:00 |
|
|
|
1b2ff3359e
|
Merge branch 'master' into 'master'
DBPM3 in parallel to IFC1210
See merge request sf_config/sf_daq_sources!25
|
2020-11-06 11:05:47 +01:00 |
|
Marinkovic Goran
|
8a660afc92
|
DBPM3 in parallel to IFC1210
|
2020-11-06 10:20:49 +01:00 |
|
|
|
afa46ddb5d
|
Merge branch 'master' into 'master'
Moved BPMs from MBU to DBPM3
See merge request sf_config/sf_daq_sources!24
|
2020-11-05 08:48:35 +01:00 |
|
Marinkovic Goran
|
9556cc7d15
|
Moved BPMs from MBU to DBPM3
|
2020-11-04 15:37:39 +01:00 |
|
|
|
ea163491c7
|
Merge branch 'master' into 'master'
changing the name of the daqsync-03 host to use sf- instead of daqsf-
See merge request sf_config/sf_daq_sources!23
|
2020-11-03 08:48:29 +01:00 |
|
Celcer Tine
|
5d82d153f0
|
changed host from daqsf-daqsync-03-v346 to sf-daqsync-03-v346
|
2020-11-03 08:47:10 +01:00 |
|
|
|
fd0280afff
|
Merge branch 'master' into 'master'
changing the name of the daqsync-03 host to use -v346 at the end for image sources - corrrection
See merge request sf_config/sf_daq_sources!22
|
2020-11-03 08:04:13 +01:00 |
|
Celcer Tine
|
ca9171ab1b
|
changed host from daqsf-daqsync-03 to daqsf-daqsync-03-v346
|
2020-11-03 08:03:14 +01:00 |
|
|
|
56c04f238f
|
Merge branch 'master' into 'master'
changing the name of the daqsync-03 host to use -v346 at the end for image sources
See merge request sf_config/sf_daq_sources!21
|
2020-11-03 08:02:05 +01:00 |
|
Celcer Tine
|
33507b5a94
|
changed host from daqsf-daqsync-03 to daqsf-daqsync-03-v346
|
2020-11-03 07:59:54 +01:00 |
|
|
|
bd412e3008
|
Merge branch 'master' into 'master'
changing Maloja and Alvra cameras and processed data for 100 Hz tests
See merge request sf_config/sf_daq_sources!20
|
2020-11-02 11:41:36 +01:00 |
|
Celcer Tine
|
afa912774b
|
changed sources for 100 Hz pipeline processing tests on sf-daqsync-03
|
2020-11-02 11:35:32 +01:00 |
|
|
|
b21ca81c90
|
Merge branch 'master' into 'master'
Finally added some section labels plus 2 more Athos PSCRs, commented for now
See merge request sf_config/sf_daq_sources!19
|
2020-10-30 15:18:48 +01:00 |
|
|
|
b21818742a
|
Finally added some section labels plus 2 more Athos PSCRs, commented for now
|
2020-10-19 19:27:12 +02:00 |
|
Dominik Werder
|
f71d2f8da8
|
Add Basler camera SARES20-PROF142-M1 at SARES20-PROF142-M1
|
2020-10-16 12:55:29 +02:00 |
|
|
|
a2df50a342
|
Merge branch 'patch-1' into 'master'
Update bpm.sources
See merge request sf_config/sf_daq_sources!18
|
2020-09-22 14:38:18 +02:00 |
|
|
|
e6c3fe4e71
|
Update bpm.sources
Testing DBPM3 with bsread.
|
2020-09-22 14:32:25 +02:00 |
|
|
|
30200c5e71
|
Revert original configuration after test (bernina)
|
2020-09-11 17:02:02 +02:00 |
|
|
|
d1583887ed
|
Revert original configuration after test
|
2020-09-11 16:56:28 +02:00 |
|
|
|
300736df46
|
Revert "Merge branch 'master' into 'master'"
This reverts merge request !17
|
2020-09-01 16:08:34 +02:00 |
|
|
|
1c9f17b071
|
100Hz tests on sf-daqsync-03
|
2020-09-01 13:42:58 +02:00 |
|
|
|
40db7ee5af
|
Update SATES20.sources
|
2020-09-01 11:10:24 +02:00 |
|
|
|
322fa21aad
|
Update SARES20.sources
|
2020-09-01 11:09:05 +02:00 |
|
|
|
db3e29c724
|
Update image.sources
|
2020-09-01 11:06:53 +02:00 |
|
|
|
86b1bf4c00
|
Merge branch 'master' into 'master'
add more athos pscr cams, plus some cleanup
See merge request sf_config/sf_daq_sources!17
|
2020-07-21 15:07:28 +02:00 |
|
|
|
7c3c31010e
|
add more athos pscr cams, plus some cleanup
|
2020-07-21 12:00:12 +02:00 |
|
