Commit Graph
401 Commits
Author SHA1 Message Date
alarcon_a 33a00e803b athos wirescanner sources 2019-11-22 10:24:03 +01:00
ebner adb19b77e4 Merge branch 'master' into 'master'
Add Athos PSCR066 and commented line for PSCR070

See merge request sf_config/sf_daq_sources!111
2019-11-21 09:52:16 +01:00
stubbs_s 68b9ad5a23 Add Athos PSCR066 and commented line for PSCR070 2019-11-18 17:42:33 +01:00
ebner 1df39df826 removed test sources again 2019-11-11 15:01:59 +01:00
ebner 355c053e75 Merge branch 'master' into 'master'
commenting out broken source while debugging

See merge request sf_config/sf_daq_sources!110
2019-11-11 15:01:26 +01:00
alarcon_a 76cb0c37b4 commenting out broken source while debugging 2019-11-11 14:56:44 +01:00
humar_t bd729d137b BPM test sources added. 2019-11-07 11:02:17 +01:00
babic_a 3a0eeb4688 Arturo wanted this 2019-10-30 12:04:16 +01:00
ebner 79676cabf3 add 3 month policy for Franziska for certain channels 2019-10-25 08:34:19 +02:00
ebner be08326386 add source 2019-10-17 13:48:17 +02:00
ebner 48cfa4c024 add pumplaser sources for edwin 2019-10-11 08:18:15 +02:00
humar_t 6926b2e845 Added WSC in Athos 2019-10-07 11:50:30 +02:00
babic_a f261088d45 Comment out direct saving of M1 camera
The camera is not used in PSEN processing
2019-09-30 15:00:19 +02:00
ebner ccfa79f292 remove sftest sources 2019-09-24 16:52:19 +02:00
babic_a d57a9d5fd2 Moving cameras to sf-daqsync-01
Performance on other sf-daqsync-* servers is too slow for this cameras
2019-09-24 15:16:26 +02:00
humar_t ba928d3cd4 Test BPMs added. 2019-09-23 13:43:38 +02:00
babic_a 03a6e8b22b Move PSEN processing to cam_server 2019-09-23 10:52:25 +02:00
ebner ad57a9bd35 removed bpm test sources 2019-09-20 17:10:17 +02:00
ebner b67dd06578 increase retention time for EvtSet channels 2019-09-20 09:28:00 +02:00
humar_t 7307fddbee Added test BPM system 2019-09-17 14:36:10 +02:00
babic_a f4f783b67e Add SARES20-CAMS142-M4 PSEN processing 2019-09-13 18:21:21 +02:00
babic_a 2e0322779d Merge branch 'master' of https://git.psi.ch/sf_config/sf_daq_sources 2019-09-10 16:54:59 +02:00
babic_a 9c7c5e84b8 Merge branch 'master' into 'master'
Add ESA Basler cams

See merge request sf_config/sf_daq_sources!108
2019-09-10 14:20:56 +02:00
babic_a 5aff24e1e8 Merge branch 'master' into 'master'
add athos, enable SATCB01 LLRF/ILK but keep data only 1 day - this station is not in operation yet, commissioning on-going

See merge request sf_config/sf_daq_sources!107
2019-09-10 14:20:47 +02:00
stubbs_s 2502fe0af5 9000 + 9010 are ESA Prime cameras, 9020 laser 2019-09-09 11:34:27 +02:00
kalt_r 5f29a20c32 add athos, enable SATCB01 LLRF/ILK but keep data only 1 day - this station is not in operation yet, commissioning on-going 2019-09-09 10:48:18 +02:00
stubbs_s 2236fa3d4f Add cs-81 with ESA Basler sources 2019-09-06 15:48:45 +02:00
babic_a ca0d6f25d7 SARES20-CAMS142-M5:FPICTURE added to image buffer 2019-09-06 13:01:13 +02:00
babic_a aeffdd19d4 Merge branch 'master' of https://git.psi.ch/sf_config/sf_daq_sources 2019-09-05 11:35:19 +02:00
babic_a a339553449 Merge branch 'master' into 'master'
Removed obsolete timing test source

See merge request sf_config/sf_daq_sources!106
2019-09-05 11:34:48 +02:00
biffiger_r a0ee600be9 Removed obsolete timing test source 2019-09-05 10:45:47 +02:00
babic_a 22c9e6c33c Add PSEN data to daq 2019-09-04 14:50:46 +02:00
babic_a 2165a1d7f2 Changed network for PSSS 2019-09-03 15:03:24 +02:00
babic_a e2fb25189c Fix PSSS sources 2019-09-03 14:54:59 +02:00
humar_t ed1434a809 S10 back to 16x bsread 2019-08-28 11:36:38 +02:00
ebner 719ab83a38 add source on request of pavel 2019-08-20 09:15:18 +02:00
ebner 73ef2b1302 changes for Tadej 2019-08-12 11:01:24 +02:00
ebner 3ed2d285c8 manually copied changes from merge request https://git.psi.ch/sf_config/sf_daq_sources/merge_requests/105 - due to it being 10 commits behind - changes requested by edwin 2019-07-25 13:31:57 +02:00
babic_a b4cfd93261 Remove PSEN camera Alvra
PSEN service was started again.
2019-07-25 11:42:21 +02:00
babic_a 53729968de Add PSEN SARES11-SPEC125-M2 to source list 2019-07-25 11:38:54 +02:00
ebner a442ac980d add command to reload of API cache 2019-07-23 07:42:42 +02:00
ebner 50e201c078 add data source requested by Arturo 2019-07-23 07:40:56 +02:00
ebner 12eb1cc253 Merge branch 'master' into 'master'
Add Flex sample stage PowerBrick, Prime to come later

See merge request sf_config/sf_daq_sources!104
2019-07-22 13:19:58 +02:00
stubbs_s 5ba0b1af2c Add Prime PowerBrick with HUBER to datastream 2019-07-18 19:08:36 +02:00
stubbs_s 90c2392a61 Add Flex sample stage PowerBrick, Prime to come later 2019-07-17 20:45:33 +02:00
ebner 0328539b1b removed camera SARES20-CAMS142-M4:FPICTURE on request of Henrik 2019-07-15 11:59:29 +02:00
ebner 768d53b39b fixed upload script to be more responsive and to not print an error at the end 2019-07-15 11:51:21 +02:00
ebner 855aef19bc Merge branch 'master' into 'master'
BS spec source added again

See merge request sf_config/sf_daq_sources!102
2019-06-04 16:44:39 +02:00
divall_e f675569870 BS spec source added again 2019-06-04 14:49:08 +02:00
ebner 79cba41b01 re-add laser ioc 2019-05-20 09:56:09 +02:00