Merge pull request #262 from zhujun98/update_default_config_file

Update default config file
European-XFEL · Jul 17, 2020 · 1478cee · 1478cee
2 parents 1250a67 + 50af972
commit 1478cee
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/extra_foam/configs/fxe.config.yaml b/extra_foam/configs/fxe.config.yaml
@@ -13,20 +13,18 @@ SOURCE:
             PIPELINE:
                 FXE_XAD_JF1M/CAL/APPEND:
                     - data.adc
-                FXE_XAD_JF1M/DET/RECEIVER-*:display:
+                FXE_XAD_JF1M/DET/JNGFR01:daqOutput:
                     - data.adc
-                FXE_XAD_JF1M/DET/RECEIVER-1:display:
+                FXE_XAD_JF1M/DET/JNGFR02:daqOutput:
                     - data.adc
-                FXE_XAD_JF1M/DET/RECEIVER-2:display:
+                FXE_XAD_JF500K/DET/JNGFR03:daqOutput:
                     - data.adc
                 FXE_XAD_JF1M/DET/RECEIVER-*:daqOutput:
                     - data.adc
                 FXE_XAD_JF1M/DET/RECEIVER-1:daqOutput:
                     - data.adc
                 FXE_XAD_JF1M/DET/RECEIVER-2:daqOutput:
                     - data.adc
-                FXE_XAD_JF1M1/DET/RECEIVER:daqOutput:
-                    - data.adc
 
         XGM:
             CONTROL:

diff --git a/extra_foam/configs/spb.config.yaml b/extra_foam/configs/spb.config.yaml
@@ -11,23 +11,25 @@ SOURCE:
 
         JungFrau:
             PIPELINE:
-                SPB_IRDA_JNGFR/DET/MODULE_*:daqOutput:
+                SPB_IRDA_JF4M/DET/JNGFR0*:daqOutput:
+                    - data.adc
+                SPB_IRDA_JF4M/DET/JNGFR01:daqOutput:
                     - data.adc
-                SPB_IRDA_JNGFR/DET/MODULE_1:daqOutput:
+                SPB_IRDA_JF4M/DET/JNGFR02:daqOutput:
                     - data.adc
-                SPB_IRDA_JNGFR/DET/MODULE_2:daqOutput:
+                SPB_IRDA_JF4M/DET/JNGFR03:daqOutput:
                     - data.adc
-                SPB_IRDA_JNGFR/DET/MODULE_3:daqOutput:
+                SPB_IRDA_JF4M/DET/JNGFR04:daqOutput:
                     - data.adc
-                SPB_IRDA_JNGFR/DET/MODULE_4:daqOutput:
+                SPB_IRDA_JF4M/DET/JNGFR05:daqOutput:
                     - data.adc
-                SPB_IRDA_JNGFR/DET/MODULE_5:daqOutput:
+                SPB_IRDA_JF4M/DET/JNGFR06:daqOutput:
                     - data.adc
-                SPB_IRDA_JNGFR/DET/MODULE_6:daqOutput:
+                SPB_IRDA_JF4M/DET/JNGFR07:daqOutput:
                     - data.adc
-                SPB_IRDA_JNGFR/DET/MODULE_7:daqOutput:
+                SPB_IRDA_JF4M/DET/JNGFR08:daqOutput:
                     - data.adc
-                SPB_IRDA_JNGFR/DET/MODULE_8:daqOutput:
+                SPB_IRDA_JNGFR/DET/MODULE_*:daqOutput:
                     - data.adc
 
 DETECTOR: