Commit Graph
233 Commits
Author SHA1 Message Date
Fabian Märki c3d3035da5 All jeromq 2018-04-26 15:50:02 +02:00
Fabian Märki e574e0730e Netty and jmq. 2018-04-26 13:52:32 +02:00
Fabian Märki 3831c0d6fb use all netty 2018-04-26 13:29:17 +02:00
Fabian Märki 3b7c591325 Use netty and jmq. 2018-04-26 12:43:50 +02:00
Fabian Märki 10202c7b42 New image sources and receiver type option. 2018-04-26 08:01:55 +02:00
Fabian Märki 03cdf6722c Correct date. 2018-04-13 09:09:33 +02:00
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
maerki_f e3df757cd2 Merge branch 'master' into 'master'
Added polices for the CDRs

See merge request sf_config/sf_daq_sources!77
2018-04-13 09:01:01 +02:00
koprek_w 3e433da6fc Added polices for the CDRs 2018-04-12 21:49:35 +02:00
Fabian Märki 3db0b8335f Change policies due to too much LT data. 2018-04-12 13:32:03 +02:00
Fabian Märki f6417135cb Activate images. 2018-04-12 12:07:50 +02:00
Fabian Märki efcc8ed99d Keep these waveforms a bit longer than default. 2018-04-09 14:23:24 +02:00
Fabian Märki 12f221dfaf Make sure waveforms matching -RLLE-DSP: are not kept for 6M 2018-04-09 14:14:33 +02:00
kalt_r 6a107eae87 enable S30CB12 LLRF 2018-04-06 14:54:29 +02:00
kalt_r e92bf12d87 enable L3 but not S30CB04 (OFF, klystron problem) and S30CB12 (not ready - commissioning) 2018-03-27 14:55:04 +02:00
kalt_r 7bcd8c60ad Merge branch 'master' of git.psi.ch:sf_config/sf_daq_sources 2018-03-27 14:52:33 +02:00
Fabian Märki b722dc3f7d Disable cams 2018-03-27 11:42:23 +02:00
kalt_r f59fbe226d enable S20CB04 and S30CB09-11 LLRF / RF interlock 2018-03-22 16:32:24 +01:00
Fabian Märki 10a6b15c57 Another source from Edwin Divall 2018-03-13 07:55:36 +01:00
Fabian Märki 0b376128d0 add new source 2018-03-06 09:47:30 +01:00
maerki_f 238a670a44 Merge branch 'master' into 'master'
enable only S30CB01-03 modulators, see https://elog-gfa.psi.ch/LLRF/2125

See merge request sf_config/sf_daq_sources!75
2018-03-01 10:53:03 +01:00
kalt_r 3f29593885 enable only S30CB01-03 modulators 2018-03-01 10:44:45 +01:00
Fabian Märki 2fa1d96e37 Reduce data of LLRF. 2018-03-01 08:36:19 +01:00
Fabian Märki b43147c691 Add new source. 2018-02-26 15:59:00 +01:00
Fabian Märki f6d993fc31 New source from Edwin Divall 2018-02-20 16:25:11 +01:00
Fabian Märki db1b389541 Fix comment error. 2018-02-15 13:49:37 +01:00
Fabian Märki 82a9309c18 Query file stats. 2018-02-15 13:46:39 +01:00
maerki_f 86a5a013b5 Merge branch 'master' into 'master'
enabled RF interlock streaming for all stations ready, move HV modualtor streaming to new file rf_modulator.sources  and enable only L3 / Scandinova

See merge request sf_config/sf_daq_sources!74
2018-02-15 13:44:21 +01:00
kalt_r 08a9085e13 add RF HV modulator sources which is streamed over RF interlock IOCs over EtherCAT bridge. Currently only L3 / Scandinova modulators enabled 2018-02-14 10:00:40 +01:00
kalt_r 5ff0a11233 enabled RF stations where ILK system is ready for streaming, remove port 9000 HV modulator test because moved to separate sources file 2018-02-14 09:58:48 +01:00
Fabian Märki 5330dddd13 another source 2018-02-13 11:33:33 +01:00
Fabian Märki 5631694b63 New image sources 2018-02-12 08:53:24 +01:00
Fabian Märki 723cb72371 Formatting 2018-02-07 10:08:34 +01:00
maerki_f db0d105c4a Merge branch 'master' into 'master'
stream data from scandinova modulator

See merge request sf_config/sf_daq_sources!73
2018-02-07 10:04:14 +01:00
jurcevic_m d5c26f4962 test ECAT-bsread 2018-02-06 17:56:01 +01:00
Fabian Märki 104bbe5f3c Remove leading whitespace. 2018-02-05 10:05:38 +01:00
maerki_f b65fa809ef Merge branch 'master' into 'master'
created blm and llm policies

See merge request sf_config/sf_daq_sources!72
2018-02-05 08:51:30 +01:00
Ozkan Loch Cigdem e041d4850e created blm and llm policies 2018-01-30 13:36:46 +01:00
Fabian Märki 00fa45f570 Rename and new Source. 2018-01-26 09:25:12 +01:00
maerki_f de02556f1d Merge branch 'master' into 'master'
enabled next RF stations

See merge request sf_config/sf_daq_sources!71
2018-01-18 14:04:35 +01:00
kalt_r ab6e749e6e enable S20CB03, S30CB07, 08 2018-01-17 11:38:54 +01:00
Fabian Märki 33c83d6e08 S30CB04-CVME-LLRF 2017-12-14 09:27:10 +01:00
Fabian Märki 33264c9805 Remove for Nicole test. 2017-12-13 08:08:45 +01:00
Fabian Märki 1f85ce5325 More images. 2017-12-12 15:15:12 +01:00
maerki_f 48d96e8c5d Merge branch 'master' into 'master'
enable RF interlock for RF stations S30CB05 and 06

See merge request sf_config/sf_daq_sources!70
2017-12-12 15:12:52 +01:00
kalt_r c4982c801f enable RF interlock for RF stations S30CB05 and 06 2017-12-12 08:53:57 +01:00
maerki_f 5835caf095 Merge branch 'master' into 'master'
adding delay stage for ESA

The configuration was changed by sustar_t

See merge request !69
2017-12-04 15:28:11 +01:00
Tomaž Šuštar 862eaacf46 adding delay stage for ESA 2017-12-04 15:20:10 +01:00
Fabian Märki d112e13870 Add S10BC02-DSRM310:FPICTURE 2017-11-17 08:05:01 +01:00
Fabian Märki 842bd5f5e7 Remove primary sources. 2017-11-16 15:41:05 +01:00