Commit Graph

69 Commits

Author SHA1 Message Date
ebner 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
voulot_d d712de562c update op.policies 2017-02-07 11:04:34 +01:00
voulot_d 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
voulot_d c94251854f correct op.policies 2016-12-22 15:34:02 +01:00
voulot_d 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
ebner 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
ebner 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
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
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
kalt_r d27fd64876 correct to P3D for waveforms 2016-11-08 14:35:24 +01:00
kalt_r 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
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
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
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
ebner 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
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
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
kalt_r 079142af30 LLRF basic policy PT2H for waveforms, in llrf_measurement.policies now for SINEG01 + S10CB01 P2W 2016-08-04 09:11:17 +02:00
kalt_r 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
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
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