maerki_f b437ac560f Merge branch 'master' into 'master' ...

enable S20CB04 and S30CB09-11 LLRF / RF interlock

See merge request sf_config/sf_daq_sources!76

2018-04-13 09:06:09 +02:00

..

bam.sources

Make sure valid JSON.

2017-03-09 15:34:42 +01:00

bcm.sources

Fix invalid json.

2017-04-25 16:37:53 +02:00

blm.sources

Make sure valid JSON.

2017-03-09 15:34:42 +01:00

bpm.sources

Rename and new Source.

2018-01-26 09:25:12 +01:00

dwsc.sources

Disable sources without EVR.

2017-07-05 11:55:35 +02:00

ict.sources

Make sure valid JSON.

2017-03-09 15:34:42 +01:00

image.sources

Activate images.

2018-04-12 12:07:50 +02:00

laser.sources

Another source from Edwin Divall

2018-03-13 07:55:36 +01:00

llrf.sources

enable S30CB12 LLRF

2018-04-06 14:54:29 +02:00

mps.sources

Reactivate MPS

2017-07-20 09:58:33 +02:00

pho_digitizer.sources

Add new source.

2018-02-26 15:59:00 +01:00

pho_keysight.sources

add new source

2018-03-06 09:47:30 +01:00

rf_interlock.sources

enable S20CB04 and S30CB09-11 LLRF / RF interlock

2018-03-22 16:32:24 +01:00

rf_modulator.sources

enable L3 but not S30CB04 (OFF, klystron problem) and S30CB12 (not ready - commissioning)

2018-03-27 14:55:04 +02:00

timing.sources

add timing ioc

2017-03-24 15:18:37 +01:00