 maerki_f
|
3a0e77dff8
|
Merge branch 'master' into 'master'
enable RF stations S20CB01, 02 and S30CB01, 02
The configuration was changed by kalt_r
See merge request !62
|
2017-10-10 16:54:06 +02:00 |
|
 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 |
|
|
maerki_f
|
3a73dc8410
|
Merge branch 'master' into 'master'
Laser cameras Tunnel
See merge request !61
|
2017-09-25 13:39:42 +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 |
|
 ebner
|
a2d9af8cf7
|
Merge branch 'master' into 'master'
enable S10CB03, 04, 07 LLRF and RF ILK
The configuration was changed by kalt_r
See merge request !58
|
2017-08-10 10:15:33 +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 |
|
|
maerki_f
|
acbd4486d6
|
Merge branch 'master' into 'master'
S10CB07 enabled
The configuration was changed by pollet
See merge request !60
|
2017-07-25 08:18:42 +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 |
|
|
maerki_f
|
64d78f9cb8
|
Merge branch 'master' into 'master'
Add policy for beam ok channel - basically we should keep it forever
The configuration was changed by ebner
See merge request !59
|
2017-06-30 13:08:33 +02:00 |
|
|
ebner
|
8364f74d10
|
remove nonsense =)
|
2017-06-29 16:41:39 +02:00 |
|
|
ebner
|
ce21811039
|
reduced to 20 weeks
|
2017-06-29 16:27:11 +02:00 |
|
|
ebner
|
c522956254
|
Add policy for beam ok channel - basically we should keep it forever
|
2017-06-29 16:22:24 +02:00 |
|
|
kalt_r
|
dde851bf55
|
enable S10CB03, 04, 07 LLRF and RF ILK
|
2017-06-21 11:38:18 +02:00 |
|
|
maerki_f
|
cd22c45289
|
Merge branch 'master' into 'master'
enabled S10CB02 and S30CB13 LLRF and RF Interlock
The configuration was changed by kalt_r
See merge request !57
|
2017-06-16 14:22:35 +02:00 |
|
|
kalt_r
|
f821462cd4
|
enable S10CB02 and S30CB13 LLRF and RF Interlock
|
2017-06-12 08:18:02 +02:00 |
|
|
Fabian Märki
|
dd43b74d92
|
Test compaction.
|
2017-06-02 12:25:05 +02:00 |
|
|
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 |
|