Commit Graph

99 Commits

Author SHA1 Message Date
Fabian Märki
d6c1668a10 Reactivate images. 2017-03-13 16:28:11 +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
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
Fabian Märki
52f89d4a71 check for storage requirement. 2017-03-01 17:31:35 +01:00
maerki_f
e8f781f8e5 Merge branch 'master' into 'master'
adding DBLM sources

The configuration was changed by sustar_t

See merge request !43
2017-02-24 12:51:08 +01:00
Tomaž Šuštar
daa8fe55d2 adding DBLM sources 2017-02-24 11:47:54 +01:00
maerki_f
1a620365df Merge branch 'master' into 'master'
Lieber Fabian, bitte nimm nun S20CB01 in den DataBuffer auf!

The configuration was changed by hauff

See merge request !42
2017-02-22 07:51:32 +01:00
Hauff Andreas
aaa055a646 s20cb01 added 2017-02-20 17:02:31 +01:00
Hauff Andreas
bd593e22c3 s20cb01 added 2017-02-20 17:00:09 +01:00
maerki_f
738a4a5601 Merge branch 'new_bpm' into 'master'
fix ioc name

See merge request !40
2017-02-17 13:24:11 +01:00
9350786510 fix ioc name 2017-02-17 13:19:16 +01:00
maerki_f
5c7a51ea34 Merge branch 'new_bpm' into 'master'
new bpm config

See merge request !39
2017-02-17 13:16:27 +01:00
59e87b228c new bpm config 2017-02-17 11:54:59 +01:00
Fabian Märki
2810489693 Fix valid JSON issue. 2017-02-16 17:00:36 +01:00
maerki_f
096376417a Merge branch 'master' into 'master'
wsc added

See merge request !37
2017-02-16 16:58:07 +01:00
Vintar Rok
d5d024babb wsc added 2017-02-16 14:40:33 +01:00
8b520c34c5 Add mps IOC as datasource 2017-02-08 12:04:31 +01:00
maerki_f
f474b7830c Merge branch 'master' into 'master'
update op.policies

The configuration was changed by voulot_d

See merge request !35
2017-02-07 13:19:22 +01:00
d712de562c update op.policies 2017-02-07 11:04:34 +01:00
f337c5fff7 update op.policies 2017-02-06 16:37:45 +01:00
Fabian Märki
8d76f9eb75 Is on https now. 2017-01-25 15:36:46 +01:00
maerki_f
f26a50f4e9 Ensure valid json. 2016-12-23 11:12:07 +01:00
maerki_f
85db216855 Merge branch 'master' into 'master'
correct op.policies

The configuration was changed by voulot_d

See merge request !31
2016-12-23 11:07:34 +01:00
c94251854f correct op.policies 2016-12-22 15:34:02 +01:00
f8e3e0cd16 addig operation policies 2016-12-22 11:02:30 +01:00
maerki_f
ab90557ec6 Merge branch 'master' into 'master'
Added new BPM IOC

The configuration was changed by ebner

See merge request !29
2016-12-09 12:30:37 +01:00
2af440d6c9 Add new BPM 2016-12-09 08:52:30 +01:00
maerki_f
a81d40e36b Merge branch 'new_bpm_sources' into 'master'
enabled all bpms



See merge request !28
2016-11-24 12:06:20 +01:00
99106ab9e1 enabled all bpms 2016-11-24 12:04:30 +01:00
maerki_f
aa587d4af5 Merge branch 'new_bpm_sources' into 'master'
Add new bpm sources

BPM sources managed by Goran ...
Right now only the first one delivers data as the timing of the others are somehow broken. However the bsread port is reachable by all of them.

See merge request !27
2016-11-23 16:29:51 +01:00
83acc391c5 Comment sources not delivering data 2016-11-23 16:20:00 +01:00
06c3219618 Add new bpm sources 2016-11-23 16:16:28 +01:00
maerki_f
e3728650bf Merge branch 'master' into 'master'
re-submit of merge request 25 after P3D correction

The configuration was changed by kalt_r

See merge request !26
2016-11-08 15:12:18 +01:00
d27fd64876 correct to P3D for waveforms 2016-11-08 14:35:24 +01:00
cffa11f85b remove 1 week 100 Hz TTL for SINEG01 and S10CB01, make generic TTL longer from 2h -> 3days 2016-11-08 12:48:20 +01:00
0847935288 enabled all RF stations up to S10CB01 2016-11-08 11:43:26 +01:00