maerki_f 59f34aa3ea Merge branch 'master' into 'master' ...

adding all current PPMACs with wire scanners

New wire scanner PPMACs were connected to timing.

See merge request !48

2017-03-13 14:26:05 +01:00

..

bam.sources

Make sure valid JSON.

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

blm.sources

Make sure valid JSON.

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

bpm.sources

fix ioc name

2017-02-17 13:19:16 +01:00

dwsc.sources

adding all current PPMACs with wire scanners

2017-03-10 13:51:10 +01:00

ict.sources

Make sure valid JSON.

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

image.sources

disable images.

2017-03-13 14:13:27 +01:00

laser.sources

Remove inactive IOCs since Edwin did not react on request.

2017-03-08 08:17:40 +01:00

llrf.sources

Remove S20CB01-CVME-LLRF1 as commissioning got postponed.

2017-03-08 08:05:00 +01:00

mps.sources

Add mps IOC as datasource

2017-02-08 12:04:31 +01:00

rf_interlock.sources

enabled all RF stations up to S10CB01

2016-11-08 11:43:26 +01:00