 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 |
|
|
ebner
|
295ec85b26
|
update
|
2019-05-17 13:41:38 +02:00 |
|
|
ebner
|
e76a50638e
|
re-enabled FLEX1
|
2019-05-16 16:32:09 +02:00 |
|
|
ebner
|
b1f691e840
|
removed broken sources
|
2019-05-16 16:12:11 +02:00 |
|
|
ebner
|
62e188b03d
|
add digitizer on request of Arturo
|
2019-05-16 15:43:34 +02:00 |
|
|
ebner
|
b0afa96497
|
Merge branch 'master' into 'master'
Added second pco edge source for ESA
See merge request sf_config/sf_daq_sources!100
|
2019-05-16 15:35:45 +02:00 |
|
|
stubbs_s
|
31bc4edb17
|
Aesthetics
|
2019-05-14 16:23:47 +02:00 |
|
|
stubbs_s
|
018ac37457
|
Second ESA pco edge IOC running
|
2019-05-14 16:22:33 +02:00 |
|
|
ebner
|
c125a34af1
|
add check script - initial version with nslookup check
|
2019-05-14 13:16:40 +02:00 |
|
|
ebner
|
cd1401ac2a
|
remove return code parsing
|
2019-05-14 13:16:14 +02:00 |
|
|
ebner
|
f73077dd5d
|
removed non existent ioc
|
2019-05-14 09:34:46 +02:00 |
|
|
ebner
|
76f2155160
|
removed not running sources
|
2019-05-10 13:02:33 +02:00 |
|
|
ebner
|
6c15157737
|
use of 25Gb interface instead of 1Gb
|
2019-05-09 11:31:55 +02:00 |
|
|
ebner
|
13ccaa6b02
|
fix stop image?
|
2019-05-06 12:13:44 +02:00 |
|
|
ebner
|
ef6cb8f60c
|
add stop image command
|
2019-05-06 11:45:41 +02:00 |
|
 root
|
7d3ba1133f
|
remove comment
|
2019-04-25 14:41:20 +02:00 |
|
|
ebner
|
f3bd2e5f13
|
remove esb cameras
|
2019-04-25 14:00:01 +02:00 |
|
|
ebner
|
a219bd8228
|
Merge branch 'patch-1' into 'master'
Update image.sources: adding ESB sources
See merge request sf_config/sf_daq_sources!98
|
2019-04-25 08:31:49 +02:00 |
|
 zamofing_t
|
b8f250178d
|
Update image.sources
|
2019-04-25 08:27:13 +02:00 |
|
|
ebner
|
c9efd0bff9
|
Merge branch 'master' into 'master'
Add new ESA PCO Edges, only one currently operational
See merge request sf_config/sf_daq_sources!97
|
2019-04-23 08:59:45 +02:00 |
|
|
stubbs_s
|
6a0852539b
|
Add new ESA PCO Edges, only one currently operational
|
2019-04-18 17:33:44 +02:00 |
|
|
maerki_f
|
ae056180dc
|
Merge branch 'master' into 'master'
retry LAM for Andreas
See merge request sf_config/sf_daq_sources!96
|
2019-03-11 09:26:49 +01:00 |
|
|
divall_e
|
2003d0c5d2
|
retry LAM for Andreas
|
2019-03-11 08:36:41 +01:00 |
|
|
maerki_f
|
2b85140094
|
Merge branch 'master' into 'master'
Basler CL Camera (TEST) for ESB
See merge request sf_config/sf_daq_sources!94
|
2019-03-06 09:54:39 +01:00 |
|
 brands
|
489019b10a
|
Basler CL Camera (TEST) for ESB
|
2019-03-06 09:50:04 +01:00 |
|
|
Fabian Märki
|
89f6d07fbd
|
Fix invalid json
|
2019-03-05 15:50:48 +01:00 |
|
|
Fabian Märki
|
734aba8b30
|
Add responsible
|
2019-03-05 15:48:01 +01:00 |
|
|
maerki_f
|
60fd819fc1
|
Merge branch 'master' into 'master'
spectrometer for SARMA01-DBCM030-SPEC (F.Frei)
See merge request sf_config/sf_daq_sources!93
|
2019-03-05 15:46:11 +01:00 |
|
|
brands
|
3698ce4015
|
spectrometer for SARMA01-DBCM030-SPEC (F.Frei)
|
2019-03-04 17:00:20 +01:00 |
|
|
Fabian Märki
|
85fccbdfd5
|
Set back to other interface.
|
2019-02-22 09:34:20 +01:00 |
|
|
Fabian Märki
|
d224ef9196
|
Merge branch 'master' of git@git.psi.ch:sf_config/sf_daq_sources.git
|
2019-02-19 08:03:38 +01:00 |
|
|
Fabian Märki
|
ace4508e2c
|
ensure connection to daqsync-02 over image network
|
2019-02-19 08:02:16 +01:00 |
|
|
maerki_f
|
d61f9d352e
|
make it nice looking
|
2019-02-14 09:50:54 +01:00 |
|
|
maerki_f
|
6f5a941377
|
Apply Edwins changes.
|
2019-02-14 09:50:29 +01:00 |
|
|
maerki_f
|
24e8a8f9b9
|
Merge branch 'master' into 'master'
flex keysight added
See merge request sf_config/sf_daq_sources!91
|
2019-02-06 12:44:01 +01:00 |
|
|
divall_e
|
8ab5feb5ef
|
flex keysight added
|
2019-02-06 11:16:50 +01:00 |
|
|
maerki_f
|
4ccfb71ca6
|
Merge branch 'master' into 'master'
ESB laser cam 511 added
See merge request sf_config/sf_daq_sources!90
|
2019-01-25 11:11:37 +01:00 |
|
|
divall_e
|
bb73048880
|
ESB laser cam 511 added
|
2019-01-25 11:07:38 +01:00 |
|
|
maerki_f
|
93bfb7e302
|
Merge branch 'master' into 'master'
add PALM processing from Ivan
See merge request sf_config/sf_daq_sources!89
|
2019-01-22 15:07:30 +01:00 |
|
|
divall_e
|
b8b65961a8
|
add PALM processing from Ivan- name order corrected
|
2019-01-22 08:39:08 +01:00 |
|