augustin_s/sf_databuffer
0
0
Fork 0
forked from archiver_config/sf_databuffer
Code Pull Requests Activity
284 Commits 1 Branch 0 Tags
69d4be638a4e5f96293f50911faed0c1d36bbe82
Commit Graph

284 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabian Märki
69d4be638a Also load request. 2018-08-10 16:21:28 +02:00
Simon Ebner
664e478cc6 fix another comma 2018-07-25 07:50:43 +02:00
Simon Ebner
4ee8c9a783 fix comma 2018-07-25 07:49:42 +02:00
ebner
547946634b Merge branch 'master' into 'master' 
ESB cameras

See merge request sf_config/sf_daq_sources!85
 2018-07-25 07:40:16 +02:00
ebner
2ec286f200 Merge branch 'master' into 'master' 
Athos ICTs

See merge request sf_config/sf_daq_sources!81
 2018-07-25 07:39:44 +02:00
ebner
6bc20aa4ea Merge branch 'master' into 'master' 
enable S20CB04 beam synchronous modulator data

See merge request sf_config/sf_daq_sources!84
 2018-07-25 07:39:17 +02:00
Brands Helge
9b6d96e2c5 ESB cameras 2018-07-24 13:40:39 +02:00
Mario Jurcevic
2718823aae enable S20CB04 beam synchronous modulator data 2018-07-23 14:15:40 +02:00
Fabian Märki
8dbfd57b65 Formatting. 2018-07-19 13:49:01 +02:00
maerki_f
8f6c7b7ecc Merge branch 'master' into 'master' 
add virtual cathode

See merge request sf_config/sf_daq_sources!83
 2018-07-19 13:48:22 +02:00
Brands Helge
9a4519da9c add virtual cathode 2018-07-19 13:42:09 +02:00
Fabian Märki
0f50ffd96a change sources 2018-07-18 15:46:19 +02:00
Fabian Märki
18bcb96d8f Formatting 2018-07-09 15:39:21 +02:00
maerki_f
a12aa55d23 Merge branch 'master' into 'master' 
restructure edwin stuff in gunlaser, esa and esb

See merge request sf_config/sf_daq_sources!82
 2018-07-09 15:35:11 +02:00
Thierry Zamofing
dc40247347 restructure edwin stuff in gunlaser, esa and esb 2018-07-09 15:16:19 +02:00
Daniel Llorente
ee5978ffd7 2x New IOCs for ICTs 2018-07-06 11:26:21 +02:00
Fabian Märki
5f1a85108e replace 2018-07-05 15:06:24 +02:00
maerki_f
b7d214e228 Merge branch 'master' into 'master' 
enable SINEGTS OSFA Physiklabor test system

See merge request sf_config/sf_daq_sources!80
 2018-07-03 16:32:35 +02:00
Fabian Märki
1041678c60 Readd sources used for tests. 2018-06-29 12:20:20 +02:00
Fabian Märki
67a3e1da85 Disable some cameras for testing. 2018-06-29 10:05:34 +02:00
Roger Kalt
c9dd77403d enable SINEGTS OSFA Physiklabor test system 2018-06-29 09:44:47 +02:00
Roger Kalt
c05fd3dd49 enable SINEGTS OSFA Physiklabor test system 2018-06-29 09:43:19 +02:00
Fabian Märki
0a0121c59a Back to jeromq. 2018-06-28 11:46:54 +02:00
Fabian Märki
f0241f5a0f back to normal 2018-06-28 08:30:40 +02:00
Fabian Märki
557d10534a Test all jeromq 2018-06-28 08:21:57 +02:00
Fabian Märki
c79a4d73f1 Merge branch 'master' of git@git.psi.ch:sf_config/sf_daq_sources.git 2018-06-28 08:15:36 +02:00
Fabian Märki
1a2c3e9f1b try all netty 2018-06-28 08:14:30 +02:00
maerki_f
70a54fe226 Merge branch 'master' into 'master' 
enable S30CB04 HV modulator source

See merge request sf_config/sf_daq_sources!79
 2018-06-27 14:28:28 +02:00
Roger Kalt
518d4388f6 enable S30CB04 HV modulator source 2018-06-27 14:21:14 +02:00
Fabian Märki
96311a1f0f Activate S30CB12-CVME-ILK by request of Roger. 2018-06-20 11:48:59 +02:00
Fabian Märki
0888e7bd73 Activate S30CB12 by request of Roger. 2018-06-20 11:45:16 +02:00
Fabian Märki
4f2e2aa78d Fix ISO time format. 2018-06-15 12:30:14 +02:00
Fabian Märki
28821cb33a remove old and add new. 2018-06-15 11:16:46 +02:00
Fabian Märki
782a168f66 Set to current llrf defaults. 2018-06-15 08:53:24 +02:00
Fabian Märki
f267a5b235 Set MT and LT according current defaults. 2018-06-15 08:44:54 +02:00
Fabian Märki
9e450b9685 ^SINEG01.*-RIQM-STA:DAC MT/LT according other policies, 
combine^SINEGTS-.*
 2018-06-15 08:41:18 +02:00
Fabian Märki
0483c7e805 Deactivate since not reachable by DHCP. 2018-06-15 08:38:44 +02:00
maerki_f
62039a1cd2 Merge branch 'master' into 'master' 
add LLRF OSFA Physiklabor test system in machine network - only short TTL - I will inform when the IOC is booted and ready

See merge request sf_config/sf_daq_sources!78
 2018-06-15 08:36:31 +02:00
Roger Kalt
1bc46485ba add LLRF OSFA Physiklabor test system in machine network - only short TTL 2018-06-14 17:56:32 +02:00
Fabian Märki
0f8a96c352 New sources. 2018-06-11 10:02:55 +02:00
Fabian Märki
8e6525704c policy for experiments 2018-05-30 09:58:47 +02:00
Fabian Märki
4e3023af70 Add timing event sources. 2018-05-29 09:58:53 +02:00
Fabian Märki
61d918e357 Disable test sources. 2018-05-29 09:58:33 +02:00
Fabian Märki
306361a429 Move psen source since no image anymore. 2018-05-18 07:58:07 +02:00
Fabian Märki
3086b9a69d test sources 2018-05-17 15:01:43 +02:00
Fabian Märki
fa60673a33 disable test source 2018-05-17 09:09:47 +02:00
Fabian Märki
620bc2eca0 Fix ttl not a string. 2018-05-17 08:28:55 +02:00
Fabian Märki
61a5c6c6d1 test sources. 2018-05-17 08:13:50 +02:00
Fabian Märki
f97e721f16 New image. 2018-05-15 11:25:39 +02:00
Fabian Märki
27ae63c524 Re-add Andrej's test channel. 2018-05-03 14:13:03 +02:00