Commit Graph
83 Commits
Author SHA1 Message Date
kalt_r 4b252d01a0 enable RF stations S20CB01, 02 and S30CB01, 02 2017-10-10 16:16:00 +02:00
Fabian Märki a6ad31227f sort by host and port 2017-09-25 13:43:04 +02:00
brands adf883b48f Merge branch 'master' of git.psi.ch:sf_config/sf_daq_sources 2017-09-25 08:40:07 +02:00
Fabian Märki 20bc280902 Remove image used by Andrej 2017-09-22 15:36:20 +02:00
brands afc1c11521 update camera 2017-09-22 11:28:17 +02:00
Fabian Märki 9a90de089d Enable S30CB13-CVME-LLRF2 2017-09-21 17:57:46 +02:00
Fabian Märki fd8466ff06 Add S30CB13-CVME-LLRF1 again. 2017-08-16 13:54:28 +02:00
Fabian Märki df617ce8e0 Remove malfunctioning 30CB13-CVME-LLRF1 2017-08-15 20:03:20 +02:00
Fabian Märki 4168bf5263 Disable defective S30CB13-CVME-LLRF2 2017-08-14 10:03:19 +02:00
kalt_r 8411e64168 enable S10CB08, 09 and wrongly disabled S30CB13-CVME-LLRF2 2017-08-03 14:34:42 +02:00
kalt_r 2b3136cf76 Merge branch 'master' of git.psi.ch:sf_config/sf_daq_sources 2017-08-03 09:22:15 +02:00
Fabian Märki 61247cb35e Disable tcp://S30CB13-CVME-LLRF2:20000 (pulse-id 0, random time) 2017-07-26 09:03:20 +02:00
Patrick Pollet abb83bbe62 S10CB07 enabled 2017-07-24 10:52:34 +02:00
Fabian Märki 6cc94d4b63 Reactivate MPS 2017-07-20 09:58:33 +02:00
Fabian Märki 79b9b35a33 Disable sources without EVR. 2017-07-05 11:55:35 +02:00
Fabian Märki d73c710dd3 Disable and wait until Dragutin enables new firmware. 2017-07-05 11:55:12 +02:00
Fabian Märki 594f97864b Specify BEAMOK and disable images. 2017-06-30 13:14:21 +02:00
kalt_r dde851bf55 enable S10CB03, 04, 07 LLRF and RF ILK 2017-06-21 11:38:18 +02:00
kalt_r f821462cd4 enable S10CB02 and S30CB13 LLRF and RF Interlock 2017-06-12 08:18:02 +02:00
Fabian Märki a4439e35cd Add port. 2017-05-11 13:59:38 +02:00
Tomaž Šuštar 75498425c3 adding sources for frontend digitizers 2017-05-11 13:40:48 +02:00
Fabian Märki 6b9902cb44 Enable images. 2017-05-04 11:24:33 +02:00
Fabian Märki 8079acec69 Fix invalid json. 2017-04-25 16:37:53 +02:00
koprek_w 40e083251c BCM configuration added 2017-04-25 13:46:34 +02:00
Fabian Märki 93dc6d8234 Images. 2017-04-20 16:15:50 +02:00
kalt_r 7861e2d14d enabled S10CB05, 06 2017-04-20 13:29:30 +02:00
Fabian Märki 4b8a76a3f0 Do not record images. 2017-04-12 17:58:50 +02:00
Fabian Märki 329098f0e5 Reactivate images. 2017-04-07 08:20:23 +02:00
Fabian Märki b479447a3a No images for now. 2017-04-03 15:26:50 +02:00
Fabian Märki f4e6ab5426 Add image source 2017-04-03 13:42:38 +02:00
maerki_f c59e1df46f Merge branch 'master' into 'master'
Add timing IOC

The configuration was changed by ebner

See merge request !51
2017-03-27 09:10:49 +02:00
ebner 87a9be3599 add timing ioc 2017-03-24 15:18:37 +01:00
gaertner d14bd298f3 enabled SINSB03 due to that it is already in RF conditioning and added (commented out) further VRF stations 2017-03-21 11:20:49 +01:00
Fabian Märki 5d1b1eb23a Reuse sf-sioc-cs-11 2017-03-20 17:58:44 +01:00
Fabian Märki 203a88aa5c Change interface. 2017-03-20 17:16:03 +01:00
Fabian Märki 2d954d1b10 Reactivate 2017-03-17 09:42:07 +01:00
jurcevic_m 05a858a492 add injector virtual rf station 2017-03-15 11:00:08 +01:00
Fabian Märki 9f1ce674c1 Merge branch 'master' of git@git.psi.ch:sf_config/sf_daq_sources.git 2017-03-13 16:28:22 +01:00
Fabian Märki d6c1668a10 Reactivate images. 2017-03-13 16:28:11 +01:00
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
Fabian Märki d7fbffd796 disable images. 2017-03-13 14:13:27 +01:00
Fabian Märki 0d5d1b0738 Rename to imagebuffer. 2017-03-13 13:57:25 +01:00
Vintar Rok 381b168ed1 adding all current PPMACs with wire scanners 2017-03-10 13:51:10 +01:00
Fabian Märki d133b06c4a Make sure valid JSON. 2017-03-09 15:34:42 +01:00
Daniel Llorente fdfea5e76f New files for ICT, BLM, BAM, DWSC 2017-03-09 13:59:23 +01:00
Daniel Llorente 2257f0e8dd New files for ICT, BLM, BAM, DWSC 2017-03-09 13:59:01 +01:00
Daniel Llorente 3cef792319 New files for ICT, BLM, BAM 2017-03-09 13:20:38 +01:00
Daniel Llorente 2502e701b4 Create ict.sources 2017-03-08 15:03:49 +01:00
Fabian Märki 05780b3147 Remove inactive IOCs since Edwin did not react on request. 2017-03-08 08:17:40 +01:00
Fabian Märki 0f93255484 Remove S20CB01-CVME-LLRF1 as commissioning got postponed. 2017-03-08 08:05:00 +01:00