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
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
maerki_f
0b0aeb0a3a
Merge branch 'master' into 'master'
...
Enabling all 4 ICT crates. Found out that EVR FW in 3 crates was not correct one, so they were flashed with the correct FW: S10DI01-CVME-DICT009, SARMA01-CVME-DICT482, SARBD01-CVME-DICT599
The configuration was changed by sustar_t
See merge request !23
2016-11-04 13:16:54 +01:00
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
a3e721589d
Remove all mps sources
2016-10-12 15:27:26 +02:00
34a5cfe239
Add MPS configuration file with MPS sources
2016-10-11 09:24:21 +02:00
2a964d033d
Merge branch 'master' into 'master'
...
temporarily removing SIN-CVME-DBPM042, adding two ICTs
The configuration was changed by sustar_t
See merge request !20
2016-09-23 08:13:55 +02:00
Tomaž Šuštar
e2267f0754
temporarily removing tcp://SIN-CVME-DBPM042, adding two ICTs
2016-09-21 16:40:07 +02:00
maerki_f
aef4ae1014
Merge branch 'master' into 'master'
...
enabled SINSB04 & SINXB01 RF stations for the databuffer configuration
The configuration was changed by gaertner
See merge request !19
2016-09-15 10:00:05 +02:00
Gärtner Florian
db523b64d4
enabled SINSB04 & SINXB01 stations
2016-09-15 09:26:56 +02:00
maerki_f
ab0b0c1cfc
Merge branch 'master' into 'master'
...
adding two BPM sources,temporarily removing one BLM source
The configuration was changed by sustar_t
See merge request !18
2016-09-07 17:25:40 +02:00
Tomaž Šuštar
0870cf445a
adding two BPM sources,temporarily removing one BLM source
2016-09-07 17:06:52 +02:00
Fabian Märki
d19e4d163c
Set to dispatcher/sf
2016-08-18 08:34:39 +02:00
maerki_f
38e3680e79
Merge branch 'master' into 'master'
...
new laser IOCS
The configuration was changed by ebner
See merge request !15
2016-08-09 08:27:20 +02:00
3e3abaac21
remove psi.ch
2016-08-09 08:26:21 +02:00
a3ea82df4e
added laser sources
2016-08-09 08:18:29 +02:00
Fabian Märki
6ad8aeebbe
Prepend ^ to station specific patterns.
2016-08-04 10:36:31 +02:00
maerki_f
60dcc77e27
Merge branch 'master' into 'master'
...
LLRF basic config PT2H for all waveforms, add llrf_measurements.policies with now SINEG01 + S10CB01 enabled for P2W
See merge request !14
2016-08-04 10:30:42 +02:00
079142af30
LLRF basic policy PT2H for waveforms, in llrf_measurement.policies now for SINEG01 + S10CB01 P2W
2016-08-04 09:11:17 +02:00
356538b760
extend AMPLT / PHASE waveforms to 2 weeks
2016-07-29 10:51:07 +02:00
maerki_f
2289211237
Merge branch 'master' into 'master'
...
Inbetriebnahme RF Station SINDI01
The configuration was changed by kalt_r
See merge request !12
2016-07-26 16:08:35 +02:00
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
Fabian Märki
81e742d8aa
channel changed to pattern.
2016-06-16 15:22:55 +02:00
Fabian Märki
733ceb9feb
New address.
2016-06-16 15:21:30 +02:00
Fabian Märki
6ae0503b46
Fixes.
2016-06-16 14:31:33 +02:00
Fabian Märki
ce64e9d6bf
Escape special chars.
2016-06-16 14:29:28 +02:00
Fabian Märki
cc15285a2c
escaping special character.
2016-06-16 14:24:59 +02:00
Fabian Märki
7ccfc30a29
Overwork Readme and add llrf.policies
2016-06-16 14:18:43 +02:00
Dietrich Alexander
5a288adca9
enabled S10CB01
2016-06-10 15:13:09 +02:00
Fabian Märki
7510671ec4
Info on how data policies are applied to data points.
2016-06-10 10:12:46 +02:00
Fabian Märki
b1996d5d18
Activate di
2016-06-09 17:27:59 +02:00
Fabian Märki
5495704cc3
Define minimal resolution of seconds.
2016-06-09 09:30:20 +02:00
Fabian Märki
b65ddec48b
Rename
2016-06-06 17:33:44 +02:00
Fabian Märki
463e06ffdf
add data policies
...
use json structure
2016-06-06 15:58:27 +02:00
maerki_f
00c1299726
Merge branch 'master' into 'master'
...
Rename
The configuration was changed by maerki_f
See merge request !5
2016-05-24 11:20:20 +02:00
maerki_f
160721aa06
Rename
2016-05-24 11:19:47 +02:00
maerki_f
26f93722d9
Merge branch 'master' into 'master'
...
Rename
The configuration was changed by maerki_f
See merge request !4
2016-05-24 11:18:09 +02:00
maerki_f
6d5a8449c3
Rename
2016-05-24 11:14:39 +02:00
cbecf0f9c0
Merge branch 'master' into 'master'
...
Enhance Readme
The configuration was changed by maerki_f
See merge request !3
2016-05-24 11:10:34 +02:00
maerki_f
8b29ebfeae
Enhance Readme
2016-05-24 11:05:22 +02:00
90a906fc53
updated readme and port configuration
2016-04-20 12:20:33 +02:00
b263b60a79
Merge branch 'master' into 'master'
...
add port 20000 for LLRF bsdata IOCs, add but comment out other RF stations
Test für den Workflow manuell
See merge request !1
2016-04-20 11:29:39 +02:00
