 celcer_t
|
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 |
|
 ebner
|
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 |
|
|
celcer_t
|
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 |
|
 humar_t
|
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 |
|
|
humar_t
|
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 |
|
|
celcer_t
|
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 |
|
|
celcer_t
|
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 |
|
|
celcer_t
|
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 |
|
|
celcer_t
|
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 |
|
|
celcer_t
|
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 |
|
 stubbs_s
|
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 |
|
|
humar_t
|
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 |
|
 marinkovic
|
e6c3fe4e71
|
Update bpm.sources
Testing DBPM3 with bsread.
|
2020-09-22 14:32:25 +02:00 |
|
 gobbo_a
|
30200c5e71
|
Revert original configuration after test (bernina)
|
2020-09-11 17:02:02 +02:00 |
|
|
gobbo_a
|
d1583887ed
|
Revert original configuration after test
|
2020-09-11 16:56:28 +02:00 |
|
|
gobbo_a
|
300736df46
|
Revert "Merge branch 'master' into 'master'"
This reverts merge request !17
|
2020-09-01 16:08:34 +02:00 |
|
|
gobbo_a
|
1c9f17b071
|
100Hz tests on sf-daqsync-03
|
2020-09-01 13:42:58 +02:00 |
|
|
celcer_t
|
40db7ee5af
|
Update SATES20.sources
|
2020-09-01 11:10:24 +02:00 |
|
|
celcer_t
|
322fa21aad
|
Update SARES20.sources
|
2020-09-01 11:09:05 +02:00 |
|
|
celcer_t
|
db3e29c724
|
Update image.sources
|
2020-09-01 11:06:53 +02:00 |
|
|
ebner
|
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 |
|
|
stubbs_s
|
7c3c31010e
|
add more athos pscr cams, plus some cleanup
|
2020-07-21 12:00:12 +02:00 |
|
|
ebner
|
9c27b6717c
|
Merge branch 'master' into 'master'
Add 8 Maloja GigE sources
See merge request sf_config/sf_daq_sources!16
|
2020-07-20 08:26:25 +02:00 |
|
|
stubbs_s
|
f4a5eecd9e
|
Add 8 Maloja GigE sources
|
2020-07-16 19:21:00 +02:00 |
|
|
gobbo_a
|
3691b1dfc4
|
Fix Maloja PSEN data source
|
2020-06-30 09:45:01 +02:00 |
|
|
ebner
|
5247b20cb7
|
Update Readme.md with instructions how to do upload a new config to the Data/ImageBuffer
|
2020-06-29 16:53:20 +02:00 |
|
|
gobbo_a
|
83ac22933a
|
Merge branch 'master' into 'master'
Move Maloja pco edge entries to processed data
See merge request sf_config/sf_daq_sources!15
|
2020-06-29 15:22:49 +02:00 |
|
|
stubbs_s
|
33ec2ed422
|
Move Maloja pco edge entries to processed data
|
2020-06-29 15:17:27 +02:00 |
|
|
ebner
|
a36766fbb9
|
Merge branch 'master' into 'master'
My Changes
See merge request sf_config/sf_daq_sources!13
|
2020-06-17 16:33:40 +02:00 |
|
|
ebner
|
23cfca786f
|
Merge branch 'master' into 'master'
Temporary sf-sioc-cs-c1 1Gb connections
See merge request sf_config/sf_daq_sources!14
|
2020-06-17 16:33:21 +02:00 |
|
|
stubbs_s
|
b7a8357844
|
Update image.sources
|
2020-06-17 16:13:34 +02:00 |
|
 divall_e
|
179a185d1a
|
first sources for Maloja
|
2020-06-17 15:14:59 +02:00 |
|
 babic_a
|
bb5a52abb9
|
Removed , at beginning of line
|
2020-06-02 12:20:20 +02:00 |
|
|
celcer_t
|
2e0f4c2bb9
|
Updated PSSS config
|
2020-06-02 12:14:54 +02:00 |
|
|
celcer_t
|
d32a4425a4
|
PSSS changes
|
2020-06-02 12:07:45 +02:00 |
|
|
celcer_t
|
e13ba474a4
|
Update SARFE.sources
|
2020-06-02 12:07:13 +02:00 |
|
|
celcer_t
|
a0ce3f2f28
|
Update image.sources
|
2020-06-02 12:03:39 +02:00 |
|
|
babic_a
|
4f21b94161
|
PSSS changes
|
2020-06-02 11:58:43 +02:00 |
|
|
babic_a
|
05b8f30b35
|
Revert PSSS back to original server
|
2020-06-02 11:51:43 +02:00 |
|
|
babic_a
|
4504229806
|
Merge branch 'master' into 'master'
SARES12-CAMS128-M1 pipeline
See merge request sf_config/sf_daq_sources!11
|
2020-06-02 11:40:30 +02:00 |
|