From 0cff5d5ce002f691b9e73c13b236645c68fdb93a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= Date: Thu, 19 Dec 2024 15:55:18 +0100 Subject: [PATCH] Add candidate creators for derived input --- codeHF/config_tasks.sh | 6 ++-- codeHF/workflows.yml | 73 +++++++++++++++++++++++++++++++++++++----- 2 files changed, 68 insertions(+), 11 deletions(-) diff --git a/codeHF/config_tasks.sh b/codeHF/config_tasks.sh index 286f6522..a976007d 100644 --- a/codeHF/config_tasks.sh +++ b/codeHF/config_tasks.sh @@ -453,13 +453,13 @@ function MakeScriptO2 { [ $DOO2_CAND_LB -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-candidate-creator-lb" [ $DOO2_CAND_X -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-candidate-creator-x" [ $DOO2_CAND_CHIC -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-candidate-creator-chic" - [ $DOO2_CAND_CASC -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-candidate-creator-cascade" + [ $DOO2_CAND_CASC -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-candidate-creator-cascade${SUFFIX_DER}" [ $DOO2_CAND_XICC -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-candidate-creator-xicc" [ $DOO2_CAND_B0 -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-candidate-creator-b0" [ $DOO2_CAND_BPLUS -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-candidate-creator-bplus" [ $DOO2_CAND_DSTAR -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-candidate-creator-dstar" - [ $DOO2_CAND_XIC0OC0 -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-candidate-creator-xic0-omegac0" - [ $DOO2_CAND_XIC_XIPIPI -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-candidate-creator-xic-to-xi-pi-pi" + [ $DOO2_CAND_XIC0OC0 -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-candidate-creator-xic0-omegac0${SUFFIX_DER}" + [ $DOO2_CAND_XIC_XIPIPI -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-candidate-creator-xic-to-xi-pi-pi${SUFFIX_DER}" # Selectors [ $DOO2_SEL_D0 -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-candidate-selector-d0" [ $DOO2_SEL_JPSI -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-candidate-selector-jpsi${SUFFIX_RUN}" diff --git a/codeHF/workflows.yml b/codeHF/workflows.yml index 916bf9b9..41b0659f 100644 --- a/codeHF/workflows.yml +++ b/codeHF/workflows.yml @@ -69,7 +69,6 @@ workflows: - o2-analysis-hf-pid-creator - o2-analysis-pid-tof-full_runX - o2-analysis-pid-tpc - tables: default: [HFCAND2PBASE, DYN/HFCAND2PEXT] mc: [HFCAND2PMCREC, HFCAND2PMCGEN] @@ -100,14 +99,31 @@ workflows: <<: *cand_creator_dstar dependencies: o2-analysis-track-dca_runX - o2-analysis-hf-candidate-creator-cascade: + o2-analysis-hf-candidate-creator-cascade: &cand_creator_cascade + <<: *cand_creator_2p + executable: o2-analysis-hf-candidate-creator-cascade dependencies: - o2-analysis-hf-track-index-skim-creator_skimX + - o2-analysis-track-dca_runX - o2-analysis-event-selection + - o2-analysis-hf-pid-creator + - o2-analysis-pid-tof-full_runX + - o2-analysis-pid-tpc + - o2-analysis-lf-lambdakzerobuilder tables: default: [HFCANDCASCBASE, DYN/HFCANDCASCEXT] mc: [HFCANDCASCMCREC, HFCANDCASCMCGEN] + o2-analysis-hf-candidate-creator-cascade_derived: + <<: *cand_creator_cascade + dependencies: + - o2-analysis-track-dca_runX + - o2-analysis-event-selection + - o2-analysis-hf-pid-creator + - o2-analysis-pid-tof-full_runX + - o2-analysis-pid-tpc + - o2-analysis-lf-lambdakzerobuilder + o2-analysis-hf-candidate-creator-x: dependencies: o2-analysis-hf-candidate-selector-jpsi_runX tables: @@ -147,16 +163,57 @@ workflows: default: [HFCANDLB, DYN/HFCANDLBEXT] mc: [HFCANDLBMCREC, HFCANDLBMCGEN] - o2-analysis-hf-candidate-creator-xic0-omegac0: + o2-analysis-hf-candidate-creator-xic0-omegac0: &cand_creator_xic0-omegac0 + <<: *cand_creator_2p + executable: o2-analysis-hf-candidate-creator-xic0-omegac0 dependencies: - o2-analysis-hf-track-index-skim-creator_skimX + - o2-analysis-track-dca_runX - o2-analysis-event-selection + - o2-analysis-hf-pid-creator + - o2-analysis-pid-tof-full_runX + - o2-analysis-pid-tpc + - o2-analysis-lf-lambdakzerobuilder + - o2-analysis-lf-cascadebuilder tables: default: [HFCANDTOXIPI, HFCANDTOOMEGAPI, HFCANDTOOMEGAK] mc: [HFXICXIPIMCREC, HFOMCXIPIMCREC, HFTOOMEPIMCREC, HFTOOMEKMCREC, HFXICXIPIMCGEN, HFOMECXIPIMCGEN, HFTOOMEPIMCGEN, HFTOOMEKMCGEN] - o2-analysis-hf-candidate-creator-xic-to-xi-pi-pi: - dependencies: o2-analysis-hf-track-index-skim-creator_skimX + o2-analysis-hf-candidate-creator-xic0-omegac0_derived: + <<: *cand_creator_xic0-omegac0 + dependencies: + - o2-analysis-track-dca_runX + - o2-analysis-event-selection + - o2-analysis-hf-pid-creator + - o2-analysis-pid-tof-full_runX + - o2-analysis-pid-tpc + - o2-analysis-lf-lambdakzerobuilder + - o2-analysis-lf-cascadebuilder + + o2-analysis-hf-candidate-creator-xic-to-xi-pi-pi: &cand_creator_xic-to-xi-pi-pi + <<: *cand_creator_2p + executable: o2-analysis-hf-candidate-creator-xic-to-xi-pi-pi + dependencies: + - o2-analysis-hf-track-index-skim-creator_skimX + - o2-analysis-track-dca_runX + - o2-analysis-event-selection + - o2-analysis-hf-pid-creator + - o2-analysis-pid-tof-full_runX + - o2-analysis-pid-tpc + - o2-analysis-lf-lambdakzerobuilder + - o2-analysis-lf-cascadebuilder + tables: [] + + o2-analysis-hf-candidate-creator-xic-to-xi-pi-pi_derived: + <<: *cand_creator_xic-to-xi-pi-pi + dependencies: + - o2-analysis-track-dca_runX + - o2-analysis-event-selection + - o2-analysis-hf-pid-creator + - o2-analysis-pid-tof-full_runX + - o2-analysis-pid-tpc + - o2-analysis-lf-lambdakzerobuilder + - o2-analysis-lf-cascadebuilder # Selectors @@ -219,7 +276,7 @@ workflows: o2-analysis-hf-candidate-selector-lc-to-k0s-p: dependencies: - - o2-analysis-hf-candidate-creator-cascade + - o2-analysis-hf-candidate-creator-cascade_derX - o2-analysis-pid-tpc - o2-analysis-pid-tof-full_runX - o2-analysis-pid-bayes @@ -249,14 +306,14 @@ workflows: o2-analysis-hf-candidate-selector-to-xi-pi: dependencies: - - o2-analysis-hf-candidate-creator-xic0-omegac0 + - o2-analysis-hf-candidate-creator-xic0-omegac0_derX - o2-analysis-pid-tof-full_runX - o2-analysis-multiplicity-table_runX tables: HFSELTOXIPI o2-analysis-hf-candidate-selector-xic-to-xi-pi-pi: dependencies: - - o2-analysis-hf-candidate-creator-xic-to-xi-pi-pi + - o2-analysis-hf-candidate-creator-xic-to-xi-pi-pi_derX - o2-analysis-pid-tof-full_runX - o2-analysis-multiplicity-table_runX - o2-analysis-pid-tpc