 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 |
|
|
Fabian Märki
|
1cc79274b1
|
Image source and policy.
|
2017-03-02 09:09:27 +01:00 |
|
|
Tomaž Šuštar
|
daa8fe55d2
|
adding DBLM sources
|
2017-02-24 11:47:54 +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 |
|
 ebner
|
9350786510
|
fix ioc name
|
2017-02-17 13:19:16 +01:00 |
|
|
ebner
|
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 |
|
|
Vintar Rok
|
d5d024babb
|
wsc added
|
2017-02-16 14:40:33 +01:00 |
|
|
ebner
|
8b520c34c5
|
Add mps IOC as datasource
|
2017-02-08 12:04:31 +01:00 |
|
|
ebner
|
2af440d6c9
|
Add new BPM
|
2016-12-09 08:52:30 +01:00 |
|
|
ebner
|
99106ab9e1
|
enabled all bpms
|
2016-11-24 12:04:30 +01:00 |
|
|
ebner
|
83acc391c5
|
Comment sources not delivering data
|
2016-11-23 16:20:00 +01:00 |
|
|
ebner
|
06c3219618
|
Add new bpm sources
|
2016-11-23 16:16:28 +01:00 |
|
 kalt_r
|
0847935288
|
enabled all RF stations up to S10CB01
|
2016-11-08 11:43:26 +01:00 |
|
|
maerki_f
|
7619740ded
|
Merge branch 'master' into 'master'
added RF Interlock sources, enable SINDI01-CVME-ILK:9999
The configuration was changed by kalt_r
See merge request !24
|
2016-11-04 13:17:11 +01:00 |
|
|
kalt_r
|
e0ba535c7b
|
added RF Interlock sources, enable SINDI01-CVME-ILK:9999
|
2016-11-04 09:24:56 +01:00 |
|
|
Tomaž Šuštar
|
ddfd425aed
|
enabling all 4 ICT crates
|
2016-11-04 09:16:13 +01:00 |
|
|
maerki_f
|
191ecdc667
|
Cannot allow simulated sources as DAQ System builds on unique mapping between pulse-id and global time (which is guaranteed by the Timing System). Simulated sources break this uniqueness.
|
2016-10-23 10:00:42 +02:00 |
|
|
maerki_f
|
5171237d6a
|
Add P. Chevtsov sources. tcp://SINBC01-CVME-DBAM22:9999 and tcp://S10BC01-CVME-DBAM32:9999 use simulated pulse-ids and therefore correlations are not possible (neither online nor offline).
|
2016-10-19 13:16:36 +02:00 |
|
|
maerki_f
|
63addce00d
|
Disable IOCs as they do not send valid data.
|
2016-10-18 16:22:44 +02:00 |
|
|
ebner
|
a3e721589d
|
Remove all mps sources
|
2016-10-12 15:27:26 +02:00 |
|
|
ebner
|
34a5cfe239
|
Add MPS configuration file with MPS sources
|
2016-10-11 09:24:21 +02:00 |
|
|
Tomaž Šuštar
|
e2267f0754
|
temporarily removing tcp://SIN-CVME-DBPM042, adding two ICTs
|
2016-09-21 16:40:07 +02:00 |
|
|
Gärtner Florian
|
db523b64d4
|
enabled SINSB04 & SINXB01 stations
|
2016-09-15 09:26:56 +02:00 |
|
|
Tomaž Šuštar
|
0870cf445a
|
adding two BPM sources,temporarily removing one BLM source
|
2016-09-07 17:06:52 +02:00 |
|
|
ebner
|
3e3abaac21
|
remove psi.ch
|
2016-08-09 08:26:21 +02:00 |
|
|
ebner
|
a3ea82df4e
|
added laser sources
|
2016-08-09 08:18:29 +02:00 |
|
|
kalt_r
|
7b1fbbb203
|
SINDI01 enable
|
2016-07-26 16:03:30 +02:00 |
|
|
maerki_f
|
c49acddafc
|
Merge branch 'master' into 'master'
enable S10CB01, IOC is now up and running
The configuration was changed by dietrich_a1
See merge request !9
|
2016-07-13 07:51:18 +02:00 |
|
|
Dietrich Alexander
|
5a288adca9
|
enabled S10CB01
|
2016-06-10 15:13:09 +02:00 |
|
|
Fabian Märki
|
b1996d5d18
|
Activate di
|
2016-06-09 17:27:59 +02:00 |
|
|
Fabian Märki
|
463e06ffdf
|
add data policies
use json structure
|
2016-06-06 15:58:27 +02:00 |
|