Commit Graph

203 Commits

Author SHA1 Message Date
f73077dd5d removed non existent ioc 2019-05-14 09:34:46 +02:00
76f2155160 removed not running sources 2019-05-10 13:02:33 +02:00
6c15157737 use of 25Gb interface instead of 1Gb 2019-05-09 11:31:55 +02:00
root
7d3ba1133f remove comment 2019-04-25 14:41:20 +02:00
f3bd2e5f13 remove esb cameras 2019-04-25 14:00:01 +02:00
b8f250178d Update image.sources 2019-04-25 08:27:13 +02:00
6a0852539b Add new ESA PCO Edges, only one currently operational 2019-04-18 17:33:44 +02:00
2003d0c5d2 retry LAM for Andreas 2019-03-11 08:36:41 +01:00
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
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
8ab5feb5ef flex keysight added 2019-02-06 11:16:50 +01:00
bb73048880 ESB laser cam 511 added 2019-01-25 11:07:38 +01:00
b8b65961a8 add PALM processing from Ivan- name order corrected 2019-01-22 08:39:08 +01:00
b61730cc5b add PALM processing from Ivan 2019-01-22 08:24:47 +01:00
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
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
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
8a48078eb8 Adding Flex IoXoS crate, for reals 2018-10-01 19:42:19 +02:00
4a198d6b7a Add FLEX IoXoS crate - not ready yet, but will be soon 2018-09-28 15:13:24 +02:00
Fabian Märki
f2a89acf2b Remove on Andrej's request. 2018-09-24 15:57:15 +02:00
Fabian Märki
0f3a4f6dfb Add PSSS 2018-09-24 15:32:19 +02:00
Fabian Märki
6dd501d918 New source from Edwin. 2018-09-10 08:04:48 +02:00
Fabian Märki
dfcecdad82 No type anymore. 2018-08-23 12:08:55 +02:00
664e478cc6 fix another comma 2018-07-25 07:50:43 +02:00
4ee8c9a783 fix comma 2018-07-25 07:49:42 +02:00
547946634b Merge branch 'master' into 'master'
ESB cameras

See merge request sf_config/sf_daq_sources!85
2018-07-25 07:40:16 +02:00
2ec286f200 Merge branch 'master' into 'master'
Athos ICTs

See merge request sf_config/sf_daq_sources!81
2018-07-25 07:39:44 +02:00
9b6d96e2c5 ESB cameras 2018-07-24 13:40:39 +02:00
2718823aae enable S20CB04 beam synchronous modulator data 2018-07-23 14:15:40 +02:00
Fabian Märki
8dbfd57b65 Formatting. 2018-07-19 13:49:01 +02:00
9a4519da9c add virtual cathode 2018-07-19 13:42:09 +02:00
Fabian Märki
0f50ffd96a change sources 2018-07-18 15:46:19 +02:00
Fabian Märki
18bcb96d8f Formatting 2018-07-09 15:39:21 +02:00
dc40247347 restructure edwin stuff in gunlaser, esa and esb 2018-07-09 15:16:19 +02:00
Daniel Llorente
ee5978ffd7 2x New IOCs for ICTs 2018-07-06 11:26:21 +02:00