Skip to content

Update config, improve saving tables #476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vkucera merged 3 commits into from
Nov 11, 2024
Merged

Update config, improve saving tables #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4596de
Support different table origins and versions
vkucera Oct 28, 2024
5152a64
Update configuration
vkucera Oct 4, 2024
052fb21
Merge branch 'master' into config
vkucera Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions codeHF/config_tasks.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,13 @@ function AdjustJson {
if [ "$INPUT_RUN" -eq 2 ]; then
ReplaceString "\"processRun2\": \"false\"" "\"processRun2\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON."
ReplaceString "\"processRun3\": \"true\"" "\"processRun3\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
ReplaceString "\"processRun2\": \"0\"" "\"processRun2\": \"1\"" "$JSON" || ErrExit "Failed to edit $JSON."
ReplaceString "\"processRun3\": \"1\"" "\"processRun3\": \"0\"" "$JSON" || ErrExit "Failed to edit $JSON."
elif [ "$INPUT_RUN" -eq 3 ]; then
ReplaceString "\"processRun2\": \"true\"" "\"processRun2\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
ReplaceString "\"processRun3\": \"false\"" "\"processRun3\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON."
ReplaceString "\"processRun2\": \"1\"" "\"processRun2\": \"0\"" "$JSON" || ErrExit "Failed to edit $JSON."
ReplaceString "\"processRun3\": \"0\"" "\"processRun3\": \"1\"" "$JSON" || ErrExit "Failed to edit $JSON."
fi

# MC
Expand All @@ -206,6 +210,7 @@ function AdjustJson {
ReplaceString "\"processMcWithDCAFitterAll\": \"false\"" "\"processMcWithDCAFitterAll\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON."
ReplaceString "\"processMcWithDCAFitterN\": \"false\"" "\"processMcWithDCAFitterN\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON."
ReplaceString "\"processMC\": \"false\"" "\"processMC\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON."
ReplaceString "\"processMC\": \"0\"" "\"processMC\": \"1\"" "$JSON" || ErrExit "Failed to edit $JSON."
ReplaceString "\"processData\": \"true\"" "\"processData\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
ReplaceString "\"processDataStd\": \"true\"" "\"processDataStd\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
ReplaceString "\"processDataWithDCAFitterN\": \"true\"" "\"processDataWithDCAFitterN\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
Expand All @@ -217,6 +222,7 @@ function AdjustJson {
ReplaceString "\"processMcWithDCAFitterAll\": \"true\"" "\"processMcWithDCAFitterAll\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
ReplaceString "\"processMcWithDCAFitterN\": \"true\"" "\"processMcWithDCAFitterN\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
ReplaceString "\"processMC\": \"true\"" "\"processMC\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
ReplaceString "\"processMC\": \"1\"" "\"processMC\": \"0\"" "$JSON" || ErrExit "Failed to edit $JSON."
ReplaceString "\"processData\": \"false\"" "\"processData\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON."
ReplaceString "\"processDataStd\": \"false\"" "\"processDataStd\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON."
ReplaceString "\"processDataWithDCAFitterN\": \"false\"" "\"processDataWithDCAFitterN\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON."
Expand Down
135 changes: 85 additions & 50 deletions codeHF/dpl-config_run3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
"centralityMax": "100",
"useSel8Trigger": "true",
"triggerClass": "-1",
"useTvxTrigger": "true",
"useTimeFrameBorderCut": "true",
"useItsRofBorderCut": "true",
"useIsGoodZvtxFT0vsPV": "false",
"useNoSameBunchPileup": "false",
"useNumTracksInTimeRange": "false",
Expand All @@ -28,7 +30,10 @@
"nPvContributorsMin": "0",
"chi2PvMax": "-1",
"zPvPosMin": "-10",
"zPvPosMax": "10"
"zPvPosMax": "10",
"softwareTrigger": "",
"bcMarginForSoftwareTrigger": "100",
"ccdbPathSoftwareTrigger": "Users/m/mpuccio/EventFiltering/OTS/"
},
"processTrigAndCentFT0ASel": "false",
"processTrigAndCentFT0CSel": "false",
Expand Down Expand Up @@ -791,18 +796,14 @@
"hf-track-index-skim-creator-cascades": {
"isRun2": "true",
"fillHistograms": "true",
"useDCAFitter": "true",
"propagateToPCA": "true",
"maxR": "200",
"maxDZIni": "4",
"minParamChange": "0.001",
"minRelChi2Change": "0.9",
"useAbsDCA": "true",
"useWeightedFinalPCA": "false",
"doCutQuality": "true",
"tpcRefitBach": "false",
"nCrossedRowsMinBach": "50",
"tpcRefitV0Daugh": "false",
"nCrossedRowsMinV0Daugh": "50",
"etaMinV0Daugh": "-99999",
"etaMaxV0Daugh": "1.1",
"ptMinV0Daugh": "0.05",
Expand Down Expand Up @@ -2380,6 +2381,38 @@
},
"timestampCCDB": "-1",
"loadModelsFromCCDB": "false",
"useTriggerMassCut": "false",
"hfTrigger2ProngCuts": {
"nSigmaMax": "2",
"ptDeltaMassMax": "10",
"ptMassCutMax": "9999",
"deltaMassPars": {
"labels_rows": "",
"labels_cols": [
"constant",
"linear"
],
"values": [
[
"-0.0025",
"9.99999975e-05"
]
]
},
"sigmaPars": {
"labels_rows": "",
"labels_cols": [
"constant",
"linear"
],
"values": [
[
"0.0142400004",
"0.00178000005"
]
]
}
},
"processWithDCAFitterN": "true",
"processWithKFParticle": "false"
},
Expand Down Expand Up @@ -5876,6 +5909,13 @@
"1"
]
},
"thnConfigAxisPromptScore": {
"values": [
"50",
"0",
"1"
]
},
"thnConfigAxisMass": {
"values": [
"120",
Expand Down Expand Up @@ -6182,11 +6222,11 @@
"20"
]
},
"thnConfigAxisMultiplicity": {
"thnConfigAxisCentrality": {
"values": [
"100",
"0",
"1000"
"100"
]
},
"thnConfigAxisChi2PCA": {
Expand Down Expand Up @@ -6233,8 +6273,16 @@
},
"processDataStd": "true",
"processDataWithMl": "false",
"processDataStdWithFT0C": "false",
"processDataWithMlWithFT0C": "false",
"processDataStdWithFT0M": "false",
"processDataWithMlWithFT0M": "false",
"processMcStd": "false",
"processMcWithMl": "false"
"processMcWithMl": "false",
"processMcStdWithFT0C": "false",
"processMcWithMlWithFT0C": "false",
"processMcStdWithFT0M": "false",
"processMcWithMlWithFT0M": "false"
},
"hf-task-lc-to-k0s-p": {
"selectionFlagLcToK0sP": "0",
Expand Down Expand Up @@ -7308,80 +7356,67 @@
"processRun3FT0": "false"
},
"multiplicity-table": {
"doVertexZeq": "1",
"fractionOfEvents": "2",
"processRun3": "0",
"processRun2": "1",
"enabledTables": {
"labels_rows": [
"FV0Mults",
"FT0Mults",
"FDDMults",
"ZDCMults",
"TrackletMults",
"TPCMults",
"PVMults",
"MultsExtra",
"MultSelections",
"FV0MultZeqs",
"FT0MultZeqs",
"FDDMultZeqs",
"PVMultZeqs",
"MultsExtraMC"
],
"labels_cols": [
"Enable"
],
"values": [
[
"-1"
-1
],
[
"-1"
-1
],
[
"-1"
-1
],
[
"-1"
-1
],
[
"-1"
-1
],
[
"-1"
-1
],
[
"-1"
-1
],
[
"-1"
-1
],
[
"-1"
-1
],
[
"-1"
-1
],
[
"-1"
-1
],
[
"-1"
-1
],
[
"-1"
-1
],
[
"-1"
-1
]
]
},
"ccdburl": "http://alice-ccdb.cern.ch",
"fractionOfEvents": "2",
"processMC2Mults": "0",
"min_pt_globaltrack": "0.15",
"min_ncluster_its_globaltrack": "5",
"max_pt_globaltrack": "1e+10",
"processGlobalTrackingCounters": "0",
"min_ncluster_itsib_globaltrack": "1",
"doVertexZeq": "1",
"produceHistograms": "0",
"reconstructionPass": " ",
"ccdbpath": "Centrality/Calibration",
"produceHistograms": "false",
"processRun2": "true",
"processRun3": "false",
"processGlobalTrackingCounters": "false",
"processMC": "true"
"ccdburl": "http://alice-ccdb.cern.ch",
"processMC": "1"
},
"pid-multiplicity": {
"processIU": "false",
Expand Down
33 changes: 20 additions & 13 deletions codeHF/workflows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,31 +60,38 @@ workflows:

o2-analysis-hf-candidate-creator-2prong: &cand_creator_2p
executable: o2-analysis-hf-candidate-creator-2prong
dependencies: o2-analysis-hf-track-index-skim-creator_skimX
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

tables:
default: [HFCAND2PBASE, HFCAND2PEXT]
default: [HFCAND2PBASE, DYN/HFCAND2PEXT]
mc: [HFCAND2PMCREC, HFCAND2PMCGEN]

o2-analysis-hf-candidate-creator-2prong_derived:
<<: *cand_creator_2p
dependencies: o2-analysis-track-dca_runX

o2-analysis-hf-candidate-creator-3prong: &cand_creator_3p
<<: *cand_creator_2p
executable: o2-analysis-hf-candidate-creator-3prong
dependencies: o2-analysis-hf-track-index-skim-creator_skimX
tables:
default: [HFCAND3PBASE, HFCAND3PEXT]
default: [HFCAND3PBASE, DYN/HFCAND3PEXT]
mc: [HFCAND3PMCREC, HFCAND3PMCGEN]

o2-analysis-hf-candidate-creator-3prong_derived:
<<: *cand_creator_3p
dependencies: o2-analysis-track-dca_runX

o2-analysis-hf-candidate-creator-dstar: &cand_creator_dstar
<<: *cand_creator_2p
executable: o2-analysis-hf-candidate-creator-dstar
dependencies: o2-analysis-hf-track-index-skim-creator_skimX
tables:
default: [HFDSTARCANDBASE, HFDSTAREXT, HFD0FROMDSTAR, HFD0FRMDSTREXT]
default: [HFDSTARCANDBASE, DYN/HFDSTAREXT, HFD0FROMDSTAR, DYN/HFD0FRMDSTREXT]
mc: [HFDSTARMCREC, HFDSTARMCGEN]

o2-analysis-hf-candidate-creator-dstar_derived:
Expand All @@ -96,13 +103,13 @@ workflows:
- o2-analysis-hf-track-index-skim-creator_skimX
- o2-analysis-event-selection
tables:
default: [HFCANDCASCBASE, HFCANDCASCEXT]
default: [HFCANDCASCBASE, DYN/HFCANDCASCEXT]
mc: [HFCANDCASCMCREC, HFCANDCASCMCGEN]

o2-analysis-hf-candidate-creator-x:
dependencies: o2-analysis-hf-candidate-selector-jpsi_runX
tables:
default: [HFCANDXBASE, HFCANDXEXT]
default: [HFCANDXBASE, DYN/HFCANDXEXT]
mc: [HFCANDXMCREC, HFCANDXMCGEN]

o2-analysis-hf-candidate-creator-xicc:
Expand All @@ -111,31 +118,31 @@ workflows:
options:
mc: "--doMC"
tables:
default: [HFCANDXICCBASE, HFCANDXICCEXT]
default: [HFCANDXICCBASE, DYN/HFCANDXICCEXT]
mc: [HFCANDXICCMCREC, HFCANDXICCMCGEN]

o2-analysis-hf-candidate-creator-chic:
dependencies: o2-analysis-hf-candidate-selector-jpsi_runX
tables:
default: [HFCANDCHICBASE, HFCANDCHICEXT]
default: [HFCANDCHICBASE, DYN/HFCANDCHICEXT]
mc: [HFCANDCHICMCREC, HFCANDCHICMCGEN]

o2-analysis-hf-candidate-creator-b0:
dependencies: o2-analysis-hf-candidate-selector-dplus-to-pi-k-pi
tables:
default: [HFCANDB0BASE, HFCANDB0EXT]
default: [HFCANDB0BASE, DYN/HFCANDB0EXT]
mc: [HFCANDB0MCREC, HFCANDB0MCGEN]

o2-analysis-hf-candidate-creator-bplus:
dependencies: o2-analysis-hf-candidate-selector-d0
tables:
default: [HFCANDBPLUSBASE, HFCANDBPLUSEXT]
default: [HFCANDBPLUSBASE, DYN/HFCANDBPLUSEXT]
mc: [HFCANDBPMCREC, HFCANDBPMCGEN]

o2-analysis-hf-candidate-creator-lb:
dependencies: o2-analysis-hf-candidate-selector-lc
tables:
default: [HFCANDLB, HFCANDLBEXT]
default: [HFCANDLB, DYN/HFCANDLBEXT]
mc: [HFCANDLBMCREC, HFCANDLBMCGEN]

o2-analysis-hf-candidate-creator-xic0-omegac0:
Expand Down
19 changes: 16 additions & 3 deletions exec/make_command_o2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,21 @@ def join_to_list(obj, list_out: list):
msg_fatal("Cannot convert %s into a string" % type(obj))


def make_table_output(spec: str) -> str:
"""Format the output table descriptor."""
words = spec.split("/")
if len(words) > 2:
return spec
if len(words) == 1:
return f"AOD/{spec}/0"
if len(words) == 2:
if words[0] in ("AOD", "AOD1", "DYN"):
return f"{spec}/0"
if words[1].isdigit():
return f"AOD/{spec}"
return spec


def healthy_structure(dic_full: dict):
"""Check correct structure of the database."""
if not isinstance(dic_full, dict):
Expand Down Expand Up @@ -235,9 +250,7 @@ def main():
join_to_list(tab_wf["mc"], tables)
else:
msg_fatal('"tables" in %s must be str, list or dict, is %s' % (wf, type(tab_wf)))
str_before = "AOD/"
str_after = "/0"
string_tables = ",".join(str_before + t + ("" if "/" in t else str_after) for t in tables)
string_tables = ",".join(make_table_output(t) for t in tables)
if string_tables:
opt_local += " --aod-writer-keep " + string_tables

Expand Down