augustin_s/sf_databuffer
0
0
Fork 0
forked from archiver_config/sf_databuffer
Code Pull Requests Activity
343 Commits 1 Branch 0 Tags
cd1401ac2ae18a43d504ebca2f993f15065978f2
Commit Graph

343 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon Ebner
cd1401ac2a remove return code parsing 2019-05-14 13:16:14 +02:00
Simon Ebner
f73077dd5d removed non existent ioc 2019-05-14 09:34:46 +02:00
Simon Ebner
76f2155160 removed not running sources 2019-05-10 13:02:33 +02:00
Simon Ebner
6c15157737 use of 25Gb interface instead of 1Gb 2019-05-09 11:31:55 +02:00
Simon Ebner
13ccaa6b02 fix stop image? 2019-05-06 12:13:44 +02:00
Simon Ebner
ef6cb8f60c add stop image command 2019-05-06 11:45:41 +02:00
root
7d3ba1133f remove comment 2019-04-25 14:41:20 +02:00
Simon Ebner
f3bd2e5f13 remove esb cameras 2019-04-25 14:00:01 +02:00
ebner
a219bd8228 Merge branch 'patch-1' into 'master' 
Update image.sources: adding ESB sources

See merge request sf_config/sf_daq_sources!98
 2019-04-25 08:31:49 +02:00
zamofing_t
b8f250178d Update image.sources 2019-04-25 08:27:13 +02:00
ebner
c9efd0bff9 Merge branch 'master' into 'master' 
Add new ESA PCO Edges, only one currently operational

See merge request sf_config/sf_daq_sources!97
 2019-04-23 08:59:45 +02:00
stubbs_s
6a0852539b Add new ESA PCO Edges, only one currently operational 2019-04-18 17:33:44 +02:00
maerki_f
ae056180dc Merge branch 'master' into 'master' 
retry LAM for Andreas

See merge request sf_config/sf_daq_sources!96
 2019-03-11 09:26:49 +01:00
Divall Edwin James
2003d0c5d2 retry LAM for Andreas 2019-03-11 08:36:41 +01:00
maerki_f
2b85140094 Merge branch 'master' into 'master' 
Basler CL Camera (TEST) for ESB

See merge request sf_config/sf_daq_sources!94
 2019-03-06 09:54:39 +01:00
Brands Helge
489019b10a Basler CL Camera (TEST) for ESB 2019-03-06 09:50:04 +01:00
Fabian Märki
89f6d07fbd Fix invalid json 2019-03-05 15:50:48 +01:00
Fabian Märki
734aba8b30 Add responsible 2019-03-05 15:48:01 +01:00
maerki_f
60fd819fc1 Merge branch 'master' into 'master' 
spectrometer for SARMA01-DBCM030-SPEC (F.Frei)

See merge request sf_config/sf_daq_sources!93
 2019-03-05 15:46:11 +01:00
Brands Helge
3698ce4015 spectrometer for SARMA01-DBCM030-SPEC (F.Frei) 2019-03-04 17:00:20 +01:00
Fabian Märki
85fccbdfd5 Set back to other interface. 2019-02-22 09:34:20 +01:00
Fabian Märki
d224ef9196 Merge branch 'master' of git@git.psi.ch:sf_config/sf_daq_sources.git 2019-02-19 08:03:38 +01:00
Fabian Märki
ace4508e2c ensure connection to daqsync-02 over image network 2019-02-19 08:02:16 +01:00
maerki_f
d61f9d352e make it nice looking 2019-02-14 09:50:54 +01:00
maerki_f
6f5a941377 Apply Edwins changes. 2019-02-14 09:50:29 +01:00
maerki_f
24e8a8f9b9 Merge branch 'master' into 'master' 
flex keysight added

See merge request sf_config/sf_daq_sources!91
 2019-02-06 12:44:01 +01:00
Divall Edwin James
8ab5feb5ef flex keysight added 2019-02-06 11:16:50 +01:00
maerki_f
4ccfb71ca6 Merge branch 'master' into 'master' 
ESB laser cam 511 added

See merge request sf_config/sf_daq_sources!90
 2019-01-25 11:11:37 +01:00
Divall Edwin James
bb73048880 ESB laser cam 511 added 2019-01-25 11:07:38 +01:00
maerki_f
93bfb7e302 Merge branch 'master' into 'master' 
add PALM processing from Ivan

See merge request sf_config/sf_daq_sources!89
 2019-01-22 15:07:30 +01:00
Divall Edwin James
b8b65961a8 add PALM processing from Ivan- name order corrected 2019-01-22 08:39:08 +01:00
Divall Edwin James
b61730cc5b add PALM processing from Ivan 2019-01-22 08:24:47 +01:00
maerki_f
3b6ccb5dd2 Merge branch 'master' into 'master' 
add C104

See merge request sf_config/sf_daq_sources!88
 2019-01-21 13:25:17 +01:00
Divall Edwin James
4c224cba0f add C104 2019-01-21 13:19:04 +01:00
Fabian Märki
2971d2abf0 Add another Edwin camera. 2019-01-14 08:10:44 +01:00
Fabian Märki
2d38bf2f58 Merge branch 'master' of git@git.psi.ch:sf_config/sf_daq_sources.git 2018-12-11 17:06:22 +01:00
Fabian Märki
d5a8040f0a Add image source from Henrik. 2018-12-11 17:06:04 +01:00
ebner
9566dd7843 Merge branch 'patch-1' into 'master' 
Update bpm.sources

See merge request sf_config/sf_daq_sources!87
 2018-12-06 11:03:44 +01:00
marinkovic
5402c3235d Update bpm.sources 2018-12-06 09:27:11 +01:00
Fabian Märki
e4651bba47 Disable IN-CVME-LLRF 2018-12-05 15:35:26 +01:00
Fabian Märki
60521de0bb Remove SARES11-CVME-FEDIG1 2018-12-05 12:49:52 +01:00
Fabian Märki
e4c10ca8bf Add SARES11-CVME-PRIME1 2018-12-05 09:19:30 +01:00
Fabian Märki
f5def2eb66 2 days for waveforms 2018-11-21 12:11:04 +01:00
Fabian Märki
3747b70c0e Try waveforms for 3D. 2018-10-31 08:21:17 +01:00
Fabian Märki
13f8a0f371 Set back since example setting. 2018-10-31 08:09:13 +01:00
Fabian Märki
315a048d35 Try images for 2D 2018-10-31 08:06:41 +01:00
Fabian Märki
f235dfd264 Inc waveformes to 2 days. 2018-10-25 13:03:08 +02:00
Fabian Märki
bda1a305b1 Readd image sources. 2018-10-23 10:21:31 +02:00
Fabian Märki
f5dc54e6bc Merge branch 'master' of git@git.psi.ch:sf_config/sf_daq_sources.git 2018-10-23 10:13:59 +02:00
Fabian Märki
473f72f5a2 Disable channels not needed for tests. 2018-10-23 10:06:40 +02:00