Commit Graph

460 Commits

Author SHA1 Message Date
ebner a3ea90c73a Merge branch 'master' of git.psi.ch:sf_config/sf_daq_sources 2020-05-27 16:17:44 +02:00
ebner 7fbb50d4dd add psss spectrum 2020-05-27 16:17:01 +02:00
humar_t bf9a1cb73a DBPM3 test sources added. 2020-05-27 15:56:27 +02:00
ebner 529fa72218 latest config 2020-05-27 15:47:04 +02:00
ebner adcd336ca8 change 2020-05-27 15:35:06 +02:00
ebner aeede18763 fix address - use sf instead of daqsf network 2020-05-27 15:06:42 +02:00
ebner 04aeb09041 record PSSS spectrum to databuffer not imagebuffer 2020-05-27 14:46:00 +02:00
ebner 64a73c51d9 add sarfe sources 2020-05-27 14:29:36 +02:00
ebner 5013943734 reconfiguration PSSS 2020-05-27 14:27:22 +02:00
ebner 4e9128d350 unconfigured cs73 82 85 add PSS 2020-05-27 14:16:42 +02:00
celcer_t e259649d70 Update image.sources 2020-05-27 08:10:40 +02:00
ebner 2292a62033 removed psss from ImageBuffer for tests 2020-05-27 06:44:16 +02:00
ebner e1f0c618d7 Merge branch 'master' into 'master'
Added DBPM3 box

See merge request sf_config/sf_daq_sources!9
2020-05-26 17:24:41 +02:00
ebner 285f8513fb Merge branch 'master' into 'master'
Added maloja timing station as data source

See merge request sf_config/sf_daq_sources!8
2020-05-26 17:24:30 +02:00
Marinkovic Goran 6e55e3ea95 Added DBPM3 box 2020-05-26 16:37:26 +02:00
biffiger_r 1eef0aff4e Added maloja timing station as data source 2020-05-26 10:12:27 +02:00
celcer_t 89c924a0ed Merge branch 'master' into 'master'
Add port for Flex pco edge

See merge request sf_config/sf_daq_sources!7
2020-05-25 17:52:24 +02:00
stubbs_s f22d861599 Add port for Flex pco edge 2020-05-25 17:32:49 +02:00
celcer_t d5efc21d4e Merge branch 'master' into 'master'
Mostly temporary changes for tests involving ESA/ESB pco edges. Also add Athos...

See merge request sf_config/sf_daq_sources!6
2020-05-25 17:06:10 +02:00
stubbs_s e6962ef831 Mostly temporary changes for tests involving ESA/ESB pco edges. Also add Athos PSCRs, commented out for now. 2020-05-25 15:28:11 +02:00
humar_t 262c92d22b BPMs up to date. 2020-05-20 18:35:04 +02:00
humar_t ae2b41eb05 BPMs to old config 2020-04-30 10:18:07 +02:00
humar_t 46c66dc196 BPM comma fix 2020-04-29 09:38:29 +02:00
humar_t 4feabffc00 BPM sources update. 2020-04-29 09:36:55 +02:00
Niko Kivel f9164dd00c SARMA01-CPCL-DBCM0302 2020-04-14 15:14:57 +02:00
humar_t a3605f65a1 Adding SIN-CVME-DBPM0422 2020-04-07 13:37:38 +02:00
humar_t 5fe56c9462 Removing SIN-CVME-DBPM0422 2020-04-07 13:27:25 +02:00
humar_t b975ceb2f5 Adding SIN-CVME-DBPM0421 2020-04-07 11:54:14 +02:00
humar_t f3cb2b5415 Removing SIN-CVME-DBPM0421 2020-04-07 11:47:25 +02:00
humar_t 1dfd035f2c Added S30-CVME-DBPM3392 back 2020-04-07 11:25:49 +02:00
humar_t 4388e79638 Removing S30-CVME-DBPM3392 2020-04-07 10:59:15 +02:00
humar_t 112255e0fa Added { stream: tcp://S30-CVME-DBPM3391:9000 }, 2020-04-07 10:44:47 +02:00
humar_t cc280fbcb9 Removing S30-CVME-DBPM3391 2020-04-07 09:24:39 +02:00
humar_t 4f9cc4d5a5 Updated BPM setup. 2020-04-07 09:15:41 +02:00
ebner 9c9f1fc9f0 fix syntax issue 2020-03-31 09:00:33 +02:00
ebner 28882878e4 Merge branch 'master' into 'master'
Add new ESA Flex cam

See merge request sf_config/sf_daq_sources!4
2020-03-31 08:57:08 +02:00
humar_t f9d8f9c013 BPM test stand update. 2020-03-13 12:39:39 +01:00
stubbs_s 92233215d8 Add new ESA Flex cam 2020-03-06 18:28:48 +01:00
ebner b5cca72fa1 Merge branch 'master' into 'master'
one missing camera

See merge request sf_config/sf_daq_sources!3
2020-02-11 13:43:01 +01:00
brands a0e54343ac one missing camera 2020-02-11 13:36:51 +01:00
ebner 5c677af58a update image sources 2020-02-11 11:40:05 +01:00
humar_t b2489991c1 Added BAM 2020-02-10 10:49:39 +01:00
babic_a 1532fd909e Record cameras over ZMQ network 2020-02-04 14:53:13 +01:00
humar_t b44c1fa083 Test BPMs update. 2020-01-29 16:52:32 +01:00
ebner a33f268742 add new sources for Goran 2020-01-13 10:18:36 +01:00
Niko Kivel 13dcb5ea53 changed port for ECMC 2020-01-10 14:47:54 +01:00
Niko Kivel 0e685b088f added ECMC test source 2020-01-10 14:33:56 +01:00
ebner d7d5087281 add timing test system on request of Roger 2020-01-08 08:17:58 +01:00
humar_t 0d14baf162 Test BPMs back. 2020-01-06 16:18:12 +01:00
ebner ac2291cce6 Update Readme.md 2019-12-18 11:51:17 +01:00