Commit Graph

133 Commits

Author SHA1 Message Date
Fabian Märki 8feefc3772 Change to test compaction. 2017-06-02 12:15:44 +02:00
Fabian Märki a4439e35cd Add port. 2017-05-11 13:59:38 +02:00
maerki_f d578a7c913 Merge branch 'master' into 'master'
adding sources for frontend digitizers

The configuration was changed by sustar_t

See merge request !55
2017-05-11 13:58:16 +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
maerki_f 4372e3c748 Merge branch 'master' into 'master'
BCM configuration added

Request for adding BCM configuration

See merge request !54
2017-04-25 16:34:38 +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
maerki_f e99007f135 Merge branch 'master' into 'master'
enabled LLRF / ILK S10CB05, 06

The configuration was changed by kalt_r

See merge request !53
2017-04-20 16:13:32 +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 183df4dd34 Change image policy to test compaction. 2017-04-07 09:04:20 +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
Fabian Märki 967852e5c9 Rename 2017-04-03 13:40:14 +02:00
maerki_f 4672120ab7 Merge branch 'master' into 'master'
Removed specific policies for BLM. Reset to Default

The configuration was changed by llorente_d

See merge request !52
2017-04-03 08:07:39 +02:00
Daniel Llorente 68d8558048 Removed specific policies for BLM. Reset to Default 2017-03-29 11:20:52 +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
Fabian Märki 4bd2a72d3e Merge branch 'master' of git@git.psi.ch:sf_config/sf_daq_sources.git 2017-03-22 07:46:28 +01:00
Fabian Märki 8c0e102a64 Add start/stop script. 2017-03-22 07:46:06 +01:00
maerki_f e0e3788ff5 Merge branch 'master' into 'master'
Hoi Fabian, könntest du die RF station SINSB03 ins bs streaming aufnehmen?, Danke und Gruss Florian

The configuration was changed by gaertner

See merge request !50
2017-03-21 14:13:11 +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
maerki_f 0f73bb929e Merge branch 'master' into 'master'
please add injector virtual rf station

The configuration was changed by jurcevic_m

See merge request !49
2017-03-15 11:06:21 +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
maerki_f 0a63306b8a Merge branch 'master' into 'master'
add dwsc.sources

The configuration was changed by llorente_d

See merge request !47
2017-03-09 15:30:55 +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 9546a1bf67 Fix script. 2017-03-08 08:06:55 +01:00
Fabian Märki 0f93255484 Remove S20CB01-CVME-LLRF1 as commissioning got postponed. 2017-03-08 08:05:00 +01:00
Fabian Märki 6e0d04f336 Change execution property 2017-03-02 09:45:57 +01:00
Fabian Märki 1cc79274b1 Image source and policy. 2017-03-02 09:09:27 +01:00
Fabian Märki 31fc5c11cc Alternative command example. 2017-03-02 09:00:53 +01:00
Fabian Märki 900cd93e69 script for storge requirement. 2017-03-01 17:32:31 +01:00
Fabian Märki 2c6677df33 Merge branch 'master' of git@git.psi.ch:sf_config/sf_daq_sources.git 2017-03-01 17:31:49 +01:00