Add file-format key to set DST or MDST (!20) · Merge requests · LHCb Simulation / LBMCSubmit

Chris Burr requested to merge add-file-format-key into main Jul 08, 2022
This adds the option of setting file-format: DST to override the default (MDST). It only affects the stripping but I thought it would make more sense as a dedicated key so that we could potentially support more invasive format changes like XDIGI or LDST output.
This is what changes in the stage 6 output:
Click to expand
diff --git a/tests/references/sim09l/basic.stage6.yaml b/tests/references/sim09l/dst.stage6.yaml
index 362885e..0061a76 100644
--- a/tests/references/sim09l/basic.stage6.yaml
+++ b/tests/references/sim09l/dst.stage6.yaml
@@ -115,16 +115,15 @@
     - $APPCONFIGOPTS/DaVinci/DV-RedoCaloPID-Stripping21.py
     - $APPCONFIGOPTS/DaVinci/DataType-2011.py
     - $APPCONFIGOPTS/DaVinci/InputType-DST.py
-    - $APPCONFIGOPTS/DaVinci/DV-Stripping-MC-muDST.py
     data_pkgs:
     - AppConfig.v3r402
     input:
     - type: DST
       visible: false
     output:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: false
-  - name: Merge for ALLSTREAMS.MDST
+  - name: Merge for ALLSTREAMS.DST
     processing_pass: merging
     visible: false
     application: DaVinci/v45r6
@@ -138,10 +137,10 @@
     data_pkgs:
     - AppConfig.v3r402
     input:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: true
     output:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: true
     options_format: merge
 - type: Simulation
@@ -261,16 +260,15 @@
     - $APPCONFIGOPTS/DaVinci/DV-RedoCaloPID-Stripping21.py
     - $APPCONFIGOPTS/DaVinci/DataType-2012.py
     - $APPCONFIGOPTS/DaVinci/InputType-DST.py
-    - $APPCONFIGOPTS/DaVinci/DV-Stripping-MC-muDST.py
     data_pkgs:
     - AppConfig.v3r402
     input:
     - type: DST
       visible: false
     output:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: false
-  - name: Merge for ALLSTREAMS.MDST
+  - name: Merge for ALLSTREAMS.DST
     processing_pass: merging
     visible: false
     application: DaVinci/v45r6
@@ -284,10 +282,10 @@
     data_pkgs:
     - AppConfig.v3r402
     input:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: true
     output:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: true
     options_format: merge
 - type: Simulation
@@ -426,7 +424,6 @@
     - $APPCONFIGOPTS/DaVinci/DV-RedoCaloPID-Stripping_28_24.py
     - $APPCONFIGOPTS/DaVinci/DataType-2015.py
     - $APPCONFIGOPTS/DaVinci/InputType-DST.py
-    - $APPCONFIGOPTS/DaVinci/DV-Stripping-MC-muDST.py
     - $APPCONFIGOPTS/DaVinci/DV-RawEventJuggler-0_3-to-4_3.py
     data_pkgs:
     - AppConfig.v3r402
@@ -434,9 +431,9 @@
     - type: DST
       visible: false
     output:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: false
-  - name: Merge for ALLSTREAMS.MDST
+  - name: Merge for ALLSTREAMS.DST
     processing_pass: merging
     visible: false
     application: DaVinci/v45r6
@@ -450,10 +447,10 @@
     data_pkgs:
     - AppConfig.v3r402
     input:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: true
     output:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: true
     options_format: merge
 - type: Simulation
@@ -611,7 +608,6 @@
     - $APPCONFIGOPTS/DaVinci/DV-RedoCaloPID-Stripping_28_24.py
     - $APPCONFIGOPTS/DaVinci/DataType-2016.py
     - $APPCONFIGOPTS/DaVinci/InputType-DST.py
-    - $APPCONFIGOPTS/DaVinci/DV-Stripping-MC-muDST.py
     - $APPCONFIGOPTS/DaVinci/DV-RawEventJuggler-4_3-to-4_3.py
     data_pkgs:
     - AppConfig.v3r402
@@ -620,9 +616,9 @@
     - type: DST
       visible: false
     output:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: false
-  - name: Merge for ALLSTREAMS.MDST
+  - name: Merge for ALLSTREAMS.DST
     processing_pass: merging
     visible: false
     application: DaVinci/v45r6
@@ -636,10 +632,10 @@
     data_pkgs:
     - AppConfig.v3r402
     input:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: true
     output:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: true
     options_format: merge
 - type: Simulation
@@ -793,7 +789,6 @@
     - $APPCONFIGOPTS/DaVinci/DV-Stripping29r2-Stripping-MC-NoPrescaling-DST.py
     - $APPCONFIGOPTS/DaVinci/DataType-2017.py
     - $APPCONFIGOPTS/DaVinci/InputType-DST.py
-    - $APPCONFIGOPTS/DaVinci/DV-Stripping-MC-muDST.py
     data_pkgs:
     - AppConfig.v3r402
     - TMVAWeights.v1r9
@@ -801,9 +796,9 @@
     - type: DST
       visible: false
     output:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: false
-  - name: Merge for ALLSTREAMS.MDST
+  - name: Merge for ALLSTREAMS.DST
     processing_pass: merging
     visible: false
     application: DaVinci/v45r6
@@ -817,10 +812,10 @@
     data_pkgs:
     - AppConfig.v3r402
     input:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: true
     output:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: true
     options_format: merge
 - type: Simulation
@@ -974,7 +969,6 @@
     - $APPCONFIGOPTS/DaVinci/DV-Stripping34-Stripping-MC-NoPrescaling-DST.py
     - $APPCONFIGOPTS/DaVinci/DataType-2018.py
     - $APPCONFIGOPTS/DaVinci/InputType-DST.py
-    - $APPCONFIGOPTS/DaVinci/DV-Stripping-MC-muDST.py
     data_pkgs:
     - AppConfig.v3r402
     - TMVAWeights.v1r10
@@ -982,9 +976,9 @@
     - type: DST
       visible: false
     output:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: false
-  - name: Merge for ALLSTREAMS.MDST
+  - name: Merge for ALLSTREAMS.DST
     processing_pass: merging
     visible: false
     application: DaVinci/v45r6
@@ -998,10 +992,10 @@
     data_pkgs:
     - AppConfig.v3r402
     input:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: true
     output:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: true
     options_format: merge
 - type: Simulation
@@ -1121,16 +1115,15 @@
     - $APPCONFIGOPTS/DaVinci/DV-RedoCaloPID-Stripping21.py
     - $APPCONFIGOPTS/DaVinci/DataType-2011.py
     - $APPCONFIGOPTS/DaVinci/InputType-DST.py
-    - $APPCONFIGOPTS/DaVinci/DV-Stripping-MC-muDST.py
     data_pkgs:
     - AppConfig.v3r402
     input:
     - type: DST
       visible: false
     output:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: false
-  - name: Merge for ALLSTREAMS.MDST
+  - name: Merge for ALLSTREAMS.DST
     processing_pass: merging
     visible: false
     application: DaVinci/v45r6
@@ -1144,10 +1137,10 @@
     data_pkgs:
     - AppConfig.v3r402
     input:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: true
     output:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: true
     options_format: merge
 - type: Simulation
@@ -1267,16 +1260,15 @@
     - $APPCONFIGOPTS/DaVinci/DV-RedoCaloPID-Stripping21.py
     - $APPCONFIGOPTS/DaVinci/DataType-2012.py
     - $APPCONFIGOPTS/DaVinci/InputType-DST.py
-    - $APPCONFIGOPTS/DaVinci/DV-Stripping-MC-muDST.py
     data_pkgs:
     - AppConfig.v3r402
     input:
     - type: DST
       visible: false
     output:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: false
-  - name: Merge for ALLSTREAMS.MDST
+  - name: Merge for ALLSTREAMS.DST
     processing_pass: merging
     visible: false
     application: DaVinci/v45r6
@@ -1290,10 +1282,10 @@
     data_pkgs:
     - AppConfig.v3r402
     input:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: true
     output:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: true
     options_format: merge
 - type: Simulation
@@ -1432,7 +1424,6 @@
     - $APPCONFIGOPTS/DaVinci/DV-RedoCaloPID-Stripping_28_24.py
     - $APPCONFIGOPTS/DaVinci/DataType-2015.py
     - $APPCONFIGOPTS/DaVinci/InputType-DST.py
-    - $APPCONFIGOPTS/DaVinci/DV-Stripping-MC-muDST.py
     - $APPCONFIGOPTS/DaVinci/DV-RawEventJuggler-0_3-to-4_3.py
     data_pkgs:
     - AppConfig.v3r402
@@ -1440,9 +1431,9 @@
     - type: DST
       visible: false
     output:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: false
-  - name: Merge for ALLSTREAMS.MDST
+  - name: Merge for ALLSTREAMS.DST
     processing_pass: merging
     visible: false
     application: DaVinci/v45r6
@@ -1456,10 +1447,10 @@
     data_pkgs:
     - AppConfig.v3r402
     input:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: true
     output:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: true
     options_format: merge
 - type: Simulation
@@ -1617,7 +1608,6 @@
     - $APPCONFIGOPTS/DaVinci/DV-RedoCaloPID-Stripping_28_24.py
     - $APPCONFIGOPTS/DaVinci/DataType-2016.py
     - $APPCONFIGOPTS/DaVinci/InputType-DST.py
-    - $APPCONFIGOPTS/DaVinci/DV-Stripping-MC-muDST.py
     - $APPCONFIGOPTS/DaVinci/DV-RawEventJuggler-4_3-to-4_3.py
     data_pkgs:
     - AppConfig.v3r402
@@ -1626,9 +1616,9 @@
     - type: DST
       visible: false
     output:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: false
-  - name: Merge for ALLSTREAMS.MDST
+  - name: Merge for ALLSTREAMS.DST
     processing_pass: merging
     visible: false
     application: DaVinci/v45r6
@@ -1642,10 +1632,10 @@
     data_pkgs:
     - AppConfig.v3r402
     input:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: true
     output:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: true
     options_format: merge
 - type: Simulation
@@ -1799,7 +1789,6 @@
     - $APPCONFIGOPTS/DaVinci/DV-Stripping29r2-Stripping-MC-NoPrescaling-DST.py
     - $APPCONFIGOPTS/DaVinci/DataType-2017.py
     - $APPCONFIGOPTS/DaVinci/InputType-DST.py
-    - $APPCONFIGOPTS/DaVinci/DV-Stripping-MC-muDST.py
     data_pkgs:
     - AppConfig.v3r402
     - TMVAWeights.v1r9
@@ -1807,9 +1796,9 @@
     - type: DST
       visible: false
     output:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: false
-  - name: Merge for ALLSTREAMS.MDST
+  - name: Merge for ALLSTREAMS.DST
     processing_pass: merging
     visible: false
     application: DaVinci/v45r6
@@ -1823,10 +1812,10 @@
     data_pkgs:
     - AppConfig.v3r402
     input:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: true
     output:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: true
     options_format: merge
 - type: Simulation
@@ -1980,7 +1969,6 @@
     - $APPCONFIGOPTS/DaVinci/DV-Stripping34-Stripping-MC-NoPrescaling-DST.py
     - $APPCONFIGOPTS/DaVinci/DataType-2018.py
     - $APPCONFIGOPTS/DaVinci/InputType-DST.py
-    - $APPCONFIGOPTS/DaVinci/DV-Stripping-MC-muDST.py
     data_pkgs:
     - AppConfig.v3r402
     - TMVAWeights.v1r10
@@ -1988,9 +1976,9 @@
     - type: DST
       visible: false
     output:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: false
-  - name: Merge for ALLSTREAMS.MDST
+  - name: Merge for ALLSTREAMS.DST
     processing_pass: merging
     visible: false
     application: DaVinci/v45r6
@@ -2004,9 +1992,9 @@
     data_pkgs:
     - AppConfig.v3r402
     input:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: true
     output:
-    - type: ALLSTREAMS.MDST
+    - type: ALLSTREAMS.DST
       visible: true
     options_format: merge
Add file-format key to set DST or MDST

Merge request reports
