Merge branch 'master' of git@git.psi.ch:sf_config/sf_daq_sources.git

This commit is contained in:
Fabian Märki
2019-02-19 08:03:38 +01:00
3 changed files with 8 additions and 3 deletions
+3 -1
View File
@@ -1,10 +1,12 @@
{
/* ESA - Responsible Edwin Divall & Scott Stubbs */
"sources": [
{"stream": "tcp://SARES11-CPCL-GES1:9999"}
{"stream": "tcp://SARES11-CPCL-GES1:9999"}
,{"stream": "tcp://SLAAR11-CPPM-MOT6891:9999"}
,{"stream": "tcp://SLAAR11-CVME-LAS6891:9999"}
,{"stream": "tcp://SARES11-CVME-PRIME1:9999"}
,{"stream": "tcp://SARES12-CVME-FLEX1:9999"}
,{"stream": "tcp://SARES12-CPCL-GES1:9990"}
,{"stream": "tcp://SARES12-CPCL-GES1:9999"}
]
}
+2
View File
@@ -8,6 +8,7 @@
{"stream":"tcp://daqsf-sioc-cs-01.psi.ch:8160","split":4,"backend":"sf-imagebuffer"}
,{"stream":"tcp://daqsf-sioc-cs-11.psi.ch:8020","split":4,"backend":"sf-imagebuffer"}
,{"stream":"tcp://daqsf-sioc-cs-11.psi.ch:8030","split":4,"backend":"sf-imagebuffer"}
,{"stream":"tcp://daqsf-sioc-cs-11.psi.ch:8040","split":4,"backend":"sf-imagebuffer"}
,{"stream":"tcp://daqsf-sioc-cs-11.psi.ch:9000","split":4,"backend":"sf-imagebuffer"}
,{"stream":"tcp://daqsf-sioc-cs-11.psi.ch:9010","split":4,"backend":"sf-imagebuffer"}
,{"stream":"tcp://daqsf-sioc-cs-11.psi.ch:9020","split":4,"backend":"sf-imagebuffer"}
@@ -61,6 +62,7 @@
,{"stream":"tcp://daqsf-sioc-cs-74.psi.ch:9140","split":4,"backend":"sf-imagebuffer"}
,{"stream":"tcp://daqsf-sioc-cs-74.psi.ch:9150","split":4,"backend":"sf-imagebuffer"}
,{"stream":"tcp://daqsf-sioc-cs-74.psi.ch:9160","split":4,"backend":"sf-imagebuffer"}
,{"stream":"tcp://daqsf-sioc-cs-83.psi.ch:8060","split":4,"backend":"sf-imagebuffer"}
,{"stream":"tcp://daqsf-sioc-cs-83.psi.ch:9000","split":4,"backend":"sf-imagebuffer"}
,{"stream":"tcp://daqsf-sioc-cs-83.psi.ch:9010","split":4,"backend":"sf-imagebuffer"}
,{"stream":"tcp://daqsf-sioc-cs-83.psi.ch:9020","split":4,"backend":"sf-imagebuffer"}
+3 -2
View File
@@ -1,7 +1,8 @@
/* Responsible Edwin Divall */
{
"sources": [
{"stream": "tcp://SAROP11-CPCL-PALM118:9999"}
{"stream": "tcp://SAROP11-CPCL-PALM118:9990"}
,{"stream": "tcp://SAROP11-CPCL-PALM118:9999"}
,{"stream": "tcp://SAROP21-CPCL-PALM134:9999"}
]
}
}