From 4c224cba0fd31024098184c0eabce1546aab566b Mon Sep 17 00:00:00 2001 From: Divall Edwin James Date: Mon, 21 Jan 2019 13:19:04 +0100 Subject: [PATCH 1/7] add C104 --- sources/image.sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources/image.sources b/sources/image.sources index 6413014..c08b959 100644 --- a/sources/image.sources +++ b/sources/image.sources @@ -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"} From b61730cc5b2e9054f76fbd7ee8a374365068a9c6 Mon Sep 17 00:00:00 2001 From: Divall Edwin James Date: Tue, 22 Jan 2019 08:24:47 +0100 Subject: [PATCH 2/7] add PALM processing from Ivan --- sources/pho_keysight.sources | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sources/pho_keysight.sources b/sources/pho_keysight.sources index f317821..1734548 100644 --- a/sources/pho_keysight.sources +++ b/sources/pho_keysight.sources @@ -1,7 +1,8 @@ /* Responsible Edwin Divall */ { "sources": [ - {"stream": "tcp://SAROP11-CPCL-PALM118:9999"} + {"stream": "tcp://SAROP11-CPCL-PALM118:9999"} + ,{"stream": "tcp://SAROP11-CPCL-PALM118:9990"} ,{"stream": "tcp://SAROP21-CPCL-PALM134:9999"} ] -} \ No newline at end of file +} From b8b65961a84e99cb928f3e8679a944de725c7ecd Mon Sep 17 00:00:00 2001 From: Divall Edwin James Date: Tue, 22 Jan 2019 08:39:08 +0100 Subject: [PATCH 3/7] add PALM processing from Ivan- name order corrected --- sources/pho_keysight.sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/pho_keysight.sources b/sources/pho_keysight.sources index 1734548..6b91308 100644 --- a/sources/pho_keysight.sources +++ b/sources/pho_keysight.sources @@ -1,8 +1,8 @@ /* Responsible Edwin Divall */ { "sources": [ - {"stream": "tcp://SAROP11-CPCL-PALM118:9999"} - ,{"stream": "tcp://SAROP11-CPCL-PALM118:9990"} + {"stream": "tcp://SAROP11-CPCL-PALM118:9990"} + ,{"stream": "tcp://SAROP11-CPCL-PALM118:9999"} ,{"stream": "tcp://SAROP21-CPCL-PALM134:9999"} ] } From bb730488808c3fe801aa3b209b5cc57d608affb3 Mon Sep 17 00:00:00 2001 From: Divall Edwin James Date: Fri, 25 Jan 2019 11:07:38 +0100 Subject: [PATCH 4/7] ESB laser cam 511 added --- sources/image.sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources/image.sources b/sources/image.sources index c08b959..cec7060 100644 --- a/sources/image.sources +++ b/sources/image.sources @@ -62,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"} From 8ab5feb5ef3bbdae0ecd4d9dc2851a54f081161b Mon Sep 17 00:00:00 2001 From: Divall Edwin James Date: Wed, 6 Feb 2019 11:16:50 +0100 Subject: [PATCH 5/7] flex keysight added --- sources/SARES10.sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources/SARES10.sources b/sources/SARES10.sources index 9244f7e..6a1c1c5 100644 --- a/sources/SARES10.sources +++ b/sources/SARES10.sources @@ -6,5 +6,6 @@ ,{"stream": "tcp://SLAAR11-CVME-LAS6891:9999"} ,{"stream": "tcp://SARES11-CVME-PRIME1:9999"} ,{"stream": "tcp://SARES12-CVME-FLEX1:9999"} + ,{"stream": "tcp://SARES12-CPCL-GES1:9999"} ] } From 6f5a941377ad5fe029070ff84206c983048c5783 Mon Sep 17 00:00:00 2001 From: maerki_f Date: Thu, 14 Feb 2019 09:50:29 +0100 Subject: [PATCH 6/7] Apply Edwins changes. --- sources/SARES10.sources | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sources/SARES10.sources b/sources/SARES10.sources index 6a1c1c5..c444bf2 100644 --- a/sources/SARES10.sources +++ b/sources/SARES10.sources @@ -6,6 +6,7 @@ ,{"stream": "tcp://SLAAR11-CVME-LAS6891:9999"} ,{"stream": "tcp://SARES11-CVME-PRIME1:9999"} ,{"stream": "tcp://SARES12-CVME-FLEX1:9999"} - ,{"stream": "tcp://SARES12-CPCL-GES1:9999"} + ,{"stream": "tcp://SARES12-CPCL-GES1:9990"} + ,{"stream": "tcp://SARES12-CPCL-GES1:9999"} ] } From d61f9d352ef6ac6f10eac75b9bec867957390011 Mon Sep 17 00:00:00 2001 From: maerki_f Date: Thu, 14 Feb 2019 09:50:54 +0100 Subject: [PATCH 7/7] make it nice looking --- sources/SARES10.sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/SARES10.sources b/sources/SARES10.sources index c444bf2..43c80bf 100644 --- a/sources/SARES10.sources +++ b/sources/SARES10.sources @@ -1,7 +1,7 @@ { /* 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"}