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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
b8b65961a8
|
add PALM processing from Ivan- name order corrected
|
2019-01-22 08:39:08 +01:00 |
|
|
|
b61730cc5b
|
add PALM processing from Ivan
|
2019-01-22 08:24:47 +01:00 |
|
maerki_f
|
3b6ccb5dd2
|
Merge branch 'master' into 'master'
add C104
See merge request sf_config/sf_daq_sources!88
|
2019-01-21 13:25:17 +01:00 |
|
|
|
4c224cba0f
|
add C104
|
2019-01-21 13:19:04 +01:00 |
|
Fabian Märki
|
2971d2abf0
|
Add another Edwin camera.
|
2019-01-14 08:10:44 +01:00 |
|
Fabian Märki
|
2d38bf2f58
|
Merge branch 'master' of git@git.psi.ch:sf_config/sf_daq_sources.git
|
2018-12-11 17:06:22 +01:00 |
|
Fabian Märki
|
d5a8040f0a
|
Add image source from Henrik.
|
2018-12-11 17:06:04 +01:00 |
|
|
|
9566dd7843
|
Merge branch 'patch-1' into 'master'
Update bpm.sources
See merge request sf_config/sf_daq_sources!87
|
2018-12-06 11:03:44 +01:00 |
|
|
|
5402c3235d
|
Update bpm.sources
|
2018-12-06 09:27:11 +01:00 |
|
Fabian Märki
|
e4651bba47
|
Disable IN-CVME-LLRF
|
2018-12-05 15:35:26 +01:00 |
|
Fabian Märki
|
60521de0bb
|
Remove SARES11-CVME-FEDIG1
|
2018-12-05 12:49:52 +01:00 |
|
Fabian Märki
|
e4c10ca8bf
|
Add SARES11-CVME-PRIME1
|
2018-12-05 09:19:30 +01:00 |
|
Fabian Märki
|
f5def2eb66
|
2 days for waveforms
|
2018-11-21 12:11:04 +01:00 |
|
Fabian Märki
|
3747b70c0e
|
Try waveforms for 3D.
|
2018-10-31 08:21:17 +01:00 |
|
Fabian Märki
|
13f8a0f371
|
Set back since example setting.
|
2018-10-31 08:09:13 +01:00 |
|
Fabian Märki
|
315a048d35
|
Try images for 2D
|
2018-10-31 08:06:41 +01:00 |
|
Fabian Märki
|
f235dfd264
|
Inc waveformes to 2 days.
|
2018-10-25 13:03:08 +02:00 |
|
Fabian Märki
|
bda1a305b1
|
Readd image sources.
|
2018-10-23 10:21:31 +02:00 |
|
Fabian Märki
|
f5dc54e6bc
|
Merge branch 'master' of git@git.psi.ch:sf_config/sf_daq_sources.git
|
2018-10-23 10:13:59 +02:00 |
|
Fabian Märki
|
473f72f5a2
|
Disable channels not needed for tests.
|
2018-10-23 10:06:40 +02:00 |
|
|
|
6d23030454
|
Merge branch 'master' into 'master'
Add Flex IoXoS crate
See merge request sf_config/sf_daq_sources!86
|
2018-10-04 08:36:03 +02:00 |
|
|
|
8a48078eb8
|
Adding Flex IoXoS crate, for reals
|
2018-10-01 19:42:19 +02:00 |
|
|
|
4a198d6b7a
|
Add FLEX IoXoS crate - not ready yet, but will be soon
|
2018-09-28 15:13:24 +02:00 |
|
Fabian Märki
|
f2a89acf2b
|
Remove on Andrej's request.
|
2018-09-24 15:57:15 +02:00 |
|
Fabian Märki
|
0f3a4f6dfb
|
Add PSSS
|
2018-09-24 15:32:19 +02:00 |
|
Fabian Märki
|
78eeffbfc1
|
Set waveforms also to 3 days
|
2018-09-20 11:44:09 +02:00 |
|
Fabian Märki
|
b046b70a30
|
Try 3 days for scalars
|
2018-09-20 11:15:01 +02:00 |
|
Fabian Märki
|
6dd501d918
|
New source from Edwin.
|
2018-09-10 08:04:48 +02:00 |
|
Fabian Märki
|
dfcecdad82
|
No type anymore.
|
2018-08-23 12:08:55 +02:00 |
|
Fabian Märki
|
69d4be638a
|
Also load request.
|
2018-08-10 16:21:28 +02:00 |
|
|
|
664e478cc6
|
fix another comma
|
2018-07-25 07:50:43 +02:00 |
|
|
|
4ee8c9a783
|
fix comma
|
2018-07-25 07:49:42 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
9b6d96e2c5
|
ESB cameras
|
2018-07-24 13:40:39 +02:00 |
|
|
|
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 |
|
|
|
9a4519da9c
|
add virtual cathode
|
2018-07-19 13:42:09 +02:00 |
|
