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

This commit is contained in:
2017-08-03 09:22:15 +02:00
4 changed files with 21 additions and 4 deletions
+15
View File
@@ -0,0 +1,15 @@
{
"policies": [
{
"pattern":"^SIN-CVME-TIFGUN-EVR0:BEAMOK$",
"data_reduction":{
"default":[
{
"ttl":"P20W",
"modulo":1
}
]
}
}
]
}
+2 -2
View File
@@ -5,9 +5,9 @@
{"stream": "tcp://S10-CPPM-MOT0991:9999"},
{"stream": "tcp://S10-CPPM-MOT1531:9999"},
{"stream": "tcp://S10-CPPM-MOT2161:9999"},
{"stream": "tcp://S20-CPPM-MOT2551:9999"},
/*{"stream": "tcp://S20-CPPM-MOT2551:9999"},*/
{"stream": "tcp://S30-CPPM-MOT3101:9999"},
{"stream": "tcp://SAT-CPPM-MOT4001:9999"},
/*{"stream": "tcp://SAT-CPPM-MOT4001:9999"},*/
{"stream": "tcp://SAR-CPPM-MOT4693:9999"}
]
}
+2
View File
@@ -1,5 +1,6 @@
{
"sources": [
/*
{"stream":"tcp://daqsf-sioc-cs-11.psi.ch:8020","split":4,"backend":"sf-imagebuffer"}
,{"stream":"tcp://daqsf-sioc-cs-11.psi.ch:9000","split":4,"backend":"sf-imagebuffer"}
,{"stream":"tcp://daqsf-sioc-cs-12.psi.ch:9000","split":4,"backend":"sf-imagebuffer"}
@@ -16,5 +17,6 @@
,{"stream":"tcp://daqsf-sioc-cs-62.psi.ch:9010","split":4,"backend":"sf-imagebuffer"}
,{"stream":"tcp://daqsf-sioc-cs-63.psi.ch:9000","split":4,"backend":"sf-imagebuffer"}
,{"stream":"tcp://daqsf-sioc-cs-63.psi.ch:9010","split":4,"backend":"sf-imagebuffer"}
*/
]
}
+2 -2
View File
@@ -73,8 +73,8 @@
,{"stream": "tcp://S30CB12-CVME-LLRF1:20000"}
,{"stream": "tcp://S30CB12-CVME-LLRF2:20000"}*/
,{"stream": "tcp://S30CB13-CVME-LLRF1:20000"}
,{"stream": "tcp://S30CB13-CVME-LLRF2:20000"}
/*,{"stream": "tcp://S30CB14-CVME-LLRF1:20000"}
/*,{"stream": "tcp://S30CB13-CVME-LLRF2:20000"}
,{"stream": "tcp://S30CB14-CVME-LLRF1:20000"}
,{"stream": "tcp://S30CB14-CVME-LLRF2:20000"}
,{"stream": "tcp://S30-CVME-LLRF:20000"}*/
]