Commit Graph

190 Commits

Author SHA1 Message Date
Fabian Märki 1f85ce5325 More images. 2017-12-12 15:15:12 +01:00
maerki_f 48d96e8c5d Merge branch 'master' into 'master'
enable RF interlock for RF stations S30CB05 and 06

See merge request sf_config/sf_daq_sources!70
2017-12-12 15:12:52 +01:00
kalt_r c4982c801f enable RF interlock for RF stations S30CB05 and 06 2017-12-12 08:53:57 +01:00
maerki_f 5835caf095 Merge branch 'master' into 'master'
adding delay stage for ESA

The configuration was changed by sustar_t

See merge request !69
2017-12-04 15:28:11 +01:00
Tomaž Šuštar 862eaacf46 adding delay stage for ESA 2017-12-04 15:20:10 +01:00
Fabian Märki d112e13870 Add S10BC02-DSRM310:FPICTURE 2017-11-17 08:05:01 +01:00
Fabian Märki 842bd5f5e7 Remove primary sources. 2017-11-16 15:41:05 +01:00
Fabian Märki 5887c36fb3 Add new image. 2017-11-16 12:23:50 +01:00
Fabian Märki 37c9f1ceac Add new camera. 2017-11-16 07:48:48 +01:00
ebner c0b1284e0f Added calibration of frontend digitizers 2017-11-14 15:36:42 +01:00
Fabian Märki 00d8a3ddd8 additional photonics sources 2017-11-13 11:22:43 +01:00
maerki_f 382513831b Merge branch 'master' into 'master'
added PowerBrick that moves the laser delay stage in ESB

The configuration was changed by sustar_t

See merge request !67
2017-11-13 08:52:37 +01:00
Tomaž Šuštar 5f79752f26 added PowerBrick that moves the laser delay stage in ESB 2017-11-10 16:43:31 +01:00
maerki_f e1e171b37e Merge branch 'master' into 'master'
enable RF stations S30CB03 and S30CB14

The configuration was changed by kalt_r

See merge request !66
2017-11-09 11:45:32 +01:00
kalt_r 2c35d354c2 enable RF stations S30CB03 and S30CB14 2017-11-09 11:35:26 +01:00
Fabian Märki 1323640911 Use pattern that matches the 4 channels defined by Fanziska 2017-11-09 10:43:36 +01:00
maerki_f 00d93625fc Merge branch 'master' into 'master'
Bugfix in the name pattern

Sorry. Bugfix in the name pattern.

See merge request !65
2017-11-09 10:42:53 +01:00
koprek_w c4cf1169f9 Bugfix in the name pattern 2017-11-09 10:09:53 +01:00
maerki_f 395c4e8f5c Merge branch 'master' into 'master'
Extend storage time to 10 days

This configuration should store data for 10 days for records starting with SINBC02-DBCM410:AL

See merge request !64
2017-11-09 10:09:07 +01:00
koprek_w 313c2332e6 Extend storage time to 10 days 2017-11-08 16:37:42 +01:00
Fabian Märki 930c7aac6e Reenable tcp://S30CB02-CVME-LLRF2:20000 2017-11-02 10:10:37 +01:00
Fabian Märki aaf3e097ec Disable tcp://S30CB02-CVME-LLRF2:20000 as not working properly. 2017-11-02 08:16:38 +01:00
Fabian Märki e88dfbdddd Disable 2017-10-25 14:25:19 +02:00
ebner 54591dcbfc added second PBPS IOC 2017-10-19 11:35:26 +02:00
Fabian Märki a7a1575c44 Keep images for 1 Day. 2017-10-16 09:04:41 +02:00
Fabian Märki 22dc762ff2 Reenable images. 2017-10-12 08:57:00 +02:00
Fabian Märki b21ad4d3b9 Disable images. 2017-10-12 08:54:29 +02:00
Fabian Märki ad9fceadde enable auto image config. 2017-10-10 16:54:59 +02:00
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