diff --git a/sources/bam.sources b/sources/bam.sources index d8cf7df..e6a5454 100644 --- a/sources/bam.sources +++ b/sources/bam.sources @@ -4,11 +4,7 @@ {"stream": "tcp://SINLH01-CVME-DBAM12:9999"}, /* {"stream": "tcp://SINBC01-CVME-DBAM22:9999"}, */ {"stream": "tcp://S10BC01-CVME-DBAM32:9999"}, - - /* Use proxy for this source: */ - /*{"stream": "tcp://SARCL01-CVME-DBAM42:9999"},*/ - {"stream": "tcp://sf-daqbuf-33:3203"}, - + {"stream": "tcp://SARCL01-CVME-DBAM42:9999"}, {"stream": "tcp://SARUN20-CVME-DBAM52:9999"} ] } diff --git a/sources/bpm.sources b/sources/bpm.sources index 790782b..c1fa043 100644 --- a/sources/bpm.sources +++ b/sources/bpm.sources @@ -1,12 +1,7 @@ { "sources": [ - - /* Using proxy: { "stream": "tcp://SIN-CVME-DBPM0421:9000" },*/ - { "stream": "tcp://sf-daqbuf-33:3200" }, - - /* Using proxy: { "stream": "tcp://SIN-CVME-DBPM0422:9000" },*/ - { "stream": "tcp://sf-daqbuf-33:3201" }, - + { "stream": "tcp://SIN-CVME-DBPM0421:9000" }, + { "stream": "tcp://SIN-CVME-DBPM0422:9000" }, { "stream": "tcp://S10-CVME-DBPM1431:9000" }, { "stream": "tcp://S20-CVME-DBPM2371:9000" }, { "stream": "tcp://S30-CVME-DBPM3391:9000" }, @@ -14,7 +9,7 @@ { "stream": "tcp://S30-CVME-DBPM4101:9000" }, { "stream": "tcp://S30-CVME-DBPM4102:9000" }, { "stream": "tcp://SARUN-CVME-DBPM4941:9000" }, - { "stream": "tcp://SARUN-CVME-DBPM4942:9000" }, + { "stream": "tcp://SARUN-CVME-DBPM4942:9000" }, { "stream": "tcp://SARUN-CVME-DBPM5411:9000" }, { "stream": "tcp://SARUN-CVME-DBPM5412:9000" }, diff --git a/sources/llrf.sources b/sources/llrf.sources index d5b30c4..0a19310 100644 --- a/sources/llrf.sources +++ b/sources/llrf.sources @@ -5,15 +5,9 @@ - the RF interlock post-mortem sources are located / configured here https://git.psi.ch/archiver_config/sf_rf_databuffer/blob/master/sources/llrf.sources */ "sources": [ /*injector*/ - - /* Proxied so that we can copy the stream: {"stream": "tcp://SINEG01-CVME-LLRF1:20000"} */ - {"stream": "tcp://sf-daqbuf-33:3204"} - + {"stream": "tcp://SINEG01-CVME-LLRF1:20000"} ,{"stream": "tcp://SINEG01-CVME-LLRF2:20000"} - - /* Proxied to copy the stream: ,{"stream": "tcp://SINSB01-CVME-LLRF1:20000"} */ - ,{"stream": "tcp://sf-daqbuf-33:3205"} - + ,{"stream": "tcp://SINSB01-CVME-LLRF1:20000"} ,{"stream": "tcp://SINSB01-CVME-LLRF2:20000"} ,{"stream": "tcp://SINSB02-CVME-LLRF1:20000"} ,{"stream": "tcp://SINSB02-CVME-LLRF2:20000"}