From 12aaff4fb99a840918ee397a13f1090dd431d78e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= Date: Tue, 17 Dec 2024 20:07:47 +0100 Subject: [PATCH] Update configuration of HFJ workflows --- codeHF/Compare.C | 18 +++---- codeHF/config_tasks.sh | 26 ++++----- codeHF/dpl-config_run3.json | 102 +++++++++++++++++++++++++++++------- codeHF/workflows.yml | 48 +++++++---------- 4 files changed, 122 insertions(+), 72 deletions(-) diff --git a/codeHF/Compare.C b/codeHF/Compare.C index 14e8237a..bdf94d00 100644 --- a/codeHF/Compare.C +++ b/codeHF/Compare.C @@ -205,9 +205,9 @@ Int_t Compare(TString pathFileO2 = "AnalysisResults_O2.root", TString pathFileAl AddHistogram(vecHisJets, "#it{p}_{T}^{cand} (GeV/#it{c})", "fHistJetCandPt", "jet-finder-hf-data/h_D0_pt", 1, 1, 0); VecSpecHis vecHisJetSubstructure; - AddHistogram(vecHisJetSubstructure, "#it{z}_{g}", "fHistJetZg", "jet-substructure-hf-data/h_jet_zg", 1, 0, 0); - AddHistogram(vecHisJetSubstructure, "#it{R}_{g}", "fHistJetRg", "jet-substructure-hf-data/h_jet_rg", 1, 0, 0); - AddHistogram(vecHisJetSubstructure, "#it{n}_{SD}", "fHistJetNsd", "jet-substructure-hf-data/h_jet_nsd", 1, 0, 0); + AddHistogram(vecHisJetSubstructure, "#it{z}_{g}", "fHistJetZg", "jet-substructure-d0-data/h_jet_zg", 1, 0, 0); + AddHistogram(vecHisJetSubstructure, "#it{R}_{g}", "fHistJetRg", "jet-substructure-d0-data/h_jet_rg", 1, 0, 0); + AddHistogram(vecHisJetSubstructure, "#it{n}_{SD}", "fHistJetNsd", "jet-substructure-d0-data/h_jet_nsd", 1, 0, 0); VecSpecHis vecHisJetsMC; AddHistogram(vecHisJetsMC, "#it{p}_{T,det}^{jet} (GeV/#it{c})", "fHistJetPt", "jet-finder-hf-mcd/h_jet_pt", 1, 1, 0); @@ -222,12 +222,12 @@ Int_t Compare(TString pathFileO2 = "AnalysisResults_O2.root", TString pathFileAl AddHistogram(vecHisJetsMC, "#it{p}_{T,gen}^{cand} (GeV/#it{c})", "fHistJetCandPt_Part", "jet-finder-hf-mcp/h_D0_pt", 1, 1, 0); VecSpecHis vecHisJetSubstructureMC; - AddHistogram(vecHisJetSubstructureMC, "#it{z}_{g,det}", "fHistJetZg", "jet-substructure-hf-mcd/h_jet_zg", 1, 0, 0); - AddHistogram(vecHisJetSubstructureMC, "#it{z}_{g,gen}", "fHistJetZg_Part", "jet-substructure-hf-mcp/h_jet_zg", 1, 0, 0); - AddHistogram(vecHisJetSubstructureMC, "#it{R}_{g,det}", "fHistJetRg", "jet-substructure-hf-mcd/h_jet_rg", 1, 0, 0); - AddHistogram(vecHisJetSubstructureMC, "#it{R}_{g,gen}", "fHistJetRg_Part", "jet-substructure-hf-mcp/h_jet_rg", 1, 0, 0); - AddHistogram(vecHisJetSubstructureMC, "#it{n}_{SD,det}", "fHistJetNsd", "jet-substructure-hf-mcd/h_jet_nsd", 1, 0, 0); - AddHistogram(vecHisJetSubstructureMC, "#it{n}_{SD,gen}", "fHistJetNsd_Part", "jet-substructure-hf-mcp/h_jet_nsd", 1, 0, 0); + AddHistogram(vecHisJetSubstructureMC, "#it{z}_{g,det}", "fHistJetZg", "jet-substructure-d0-mcd/h_jet_zg", 1, 0, 0); + AddHistogram(vecHisJetSubstructureMC, "#it{z}_{g,gen}", "fHistJetZg_Part", "jet-substructure-d0-mcp/h_jet_zg", 1, 0, 0); + AddHistogram(vecHisJetSubstructureMC, "#it{R}_{g,det}", "fHistJetRg", "jet-substructure-d0-mcd/h_jet_rg", 1, 0, 0); + AddHistogram(vecHisJetSubstructureMC, "#it{R}_{g,gen}", "fHistJetRg_Part", "jet-substructure-d0-mcp/h_jet_rg", 1, 0, 0); + AddHistogram(vecHisJetSubstructureMC, "#it{n}_{SD,det}", "fHistJetNsd", "jet-substructure-d0-mcd/h_jet_nsd", 1, 0, 0); + AddHistogram(vecHisJetSubstructureMC, "#it{n}_{SD,gen}", "fHistJetNsd_Part", "jet-substructure-d0-mcp/h_jet_nsd", 1, 0, 0); // vector of specifications of vectors: name, VecSpecHis, pads X, pads Y VecSpecVecSpec vecSpecVecSpec; diff --git a/codeHF/config_tasks.sh b/codeHF/config_tasks.sh index b172b122..58cf49a5 100644 --- a/codeHF/config_tasks.sh +++ b/codeHF/config_tasks.sh @@ -68,10 +68,10 @@ DOO2_SEL_DSTAR=0 # hf-candidate-selector-dstar DOO2_SEL_TOXIPI=0 # hf-candidate-selector-to-xi-pi DOO2_SEL_XIC_XIPIPI=0 # hf-candidate-selector-xic-to-xi-pi-pi # Analysis tasks -DOO2_TASK_D0=1 # hf-task-d0 +DOO2_TASK_D0=0 # hf-task-d0 DOO2_TASK_DS=0 # hf-task-ds DOO2_TASK_DPLUS=0 # hf-task-dplus -DOO2_TASK_LC=1 # hf-task-lc +DOO2_TASK_LC=0 # hf-task-lc DOO2_TASK_LB=0 # hf-task-lb DOO2_TASK_XIC=0 # hf-task-xic DOO2_TASK_JPSI=0 # hf-task-jpsi @@ -112,10 +112,10 @@ DOO2_TASK_D0HADRON=0 # hf-task-correlation-d0-hadrons DOO2_TASK_FLOW=0 # hf-task-flow # Jets DOO2_JET_FIND=0 # je-jet-finder-d0 -DOO2_JET_FIND_QA=0 # je-jet-finder-hf-qa -DOO2_JET_MATCH=0 # je-jet-matching -DOO2_JET_SUB=0 # je-jet-substructure-hf -DOO2_JET_SUB_OUT=0 # je-jet-substructure-hf-output +DOO2_JET_FIND_QA=1 # je-jet-finder-d0-qa +DOO2_JET_MATCH=0 # je-jet-matching-mc-d0-ch +DOO2_JET_SUB=0 # je-jet-substructure-d0 +DOO2_JET_SUB_OUT=0 # je-jet-substructure-d0-output # QA DOO2_REJ_ALICE3=0 # hf-task-qa-pid-rejection DOO2_QA_EFF=0 # qa-efficiency @@ -525,16 +525,16 @@ function MakeScriptO2 { # Jets if [ "$INPUT_IS_MC" -eq 1 ]; then [ $DOO2_JET_FIND -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-finder-d0-mcd-charged o2-analysis-je-jet-finder-d0-mcp-charged" - [ $DOO2_JET_FIND_QA -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-finder-hf-qa_mc" - [ $DOO2_JET_SUB -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-substructure-hf_mcd o2-analysis-je-jet-substructure-hf_mcp" - [ $DOO2_JET_SUB_OUT -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-substructure-hf-output_mcd o2-analysis-je-jet-substructure-hf-output_mcp" + [ $DOO2_JET_FIND_QA -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-finder-d0-qa_mc" + [ $DOO2_JET_SUB -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-substructure-d0_mc" + [ $DOO2_JET_SUB_OUT -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-substructure-d0-output_mc" else [ $DOO2_JET_FIND -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-finder-d0-data-charged" - [ $DOO2_JET_FIND_QA -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-finder-hf-qa_data" - [ $DOO2_JET_SUB -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-substructure-hf_data" - [ $DOO2_JET_SUB_OUT -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-substructure-hf-output_data" + [ $DOO2_JET_FIND_QA -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-finder-d0-qa_data" + [ $DOO2_JET_SUB -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-substructure-d0_data" + [ $DOO2_JET_SUB_OUT -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-substructure-d0-output_data" fi - [ $DOO2_JET_MATCH -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-matching" + [ $DOO2_JET_MATCH -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-matching-mc-d0-ch" # QA [ $DOO2_REJ_ALICE3 -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-task-qa-pid-rejection" [ $DOO2_QA_EFF -eq 1 ] && WORKFLOWS+=" o2-analysis-qa-efficiency" diff --git a/codeHF/dpl-config_run3.json b/codeHF/dpl-config_run3.json index 490fbb3c..9e2d6d13 100644 --- a/codeHF/dpl-config_run3.json +++ b/codeHF/dpl-config_run3.json @@ -7043,35 +7043,63 @@ "processMcGenMixedEvent": "false" }, "jet-deriveddata-producer": { + "ccdbUrl": "http://alice-ccdb.cern.ch", + "ccdbPathLut": "GLO/Param/MatLUT", + "ccdbPathGrp": "GLO/GRP/GRP", + "ccdbPathGrpMag": "GLO/Config/GRPMagField", + "dcaZMax": "0.2", + "ccdb-url": "http://alice-ccdb.cern.ch", + "includeTriggers": "false", + "processClearMaps": "false", "processBunchCrossings": "false", "processCollisions": "true", "processCollisionsWithoutCentralityAndMultiplicity": "false", "processCollisionsRun2": "false", + "processCollisionsALICE3": "false", + "processWithoutEMCalCollisionLabels": "false", + "processEMCalCollisionLabels": "false", "processMcCollisionLabels": "false", "processMcCollisions": "false", "processTracks": "true", + "processTracksWithCollisionAssociator": "false", "processMcTrackLabels": "false", + "processMcTrackLabelsWithCollisionAssociator": "false", "processParticles": "false", "processClusters": "false", + "processMcClusterLabels": "false", + "processD0Collisions": "false", + "processD0McCollisions": "false", "processD0": "true", - "processD0MC": "true", + "processD0MC": "false", + "processLcCollisions": "false", + "processLcMcCollisions": "false", "processLc": "false", "processLcMC": "false", + "processBplusCollisions": "false", + "processBplusMcCollisions": "false", + "processBplus": "false", + "processBplusMC": "false", "processV0": "false", - "processV0MC": "false" + "processV0MC": "false", + "processDielectronCollisions": "false", + "processDielectron": "false", + "processDielectronMc": "false" }, "jet-finder-d0-data-charged": { "vertexZCut": "10", "centralityMin": "-999", "centralityMax": "999", + "trackOccupancyInTimeRangeMax": "999999", + "eventSelections": "sel8", + "triggerMasks": "", "trackPtMin": "0.15", "trackPtMax": "1000", "trackEtaMin": "-0.9", "trackEtaMax": "0.9", "trackPhiMin": "-999", "trackPhiMax": "999", + "trackingEfficiency": "1", "trackSelections": "globalTracks", - "eventSelections": "sel8", "particleSelections": "PhysicalPrimary", "clusterDefinition": "kV3Default", "clusterEtaMin": "-0.7", @@ -7104,28 +7132,34 @@ "jetRecombScheme": "0", "jetGhostArea": "0.005", "ghostRepeat": "1", + "DoTriggering": "false", "jetAreaFractionMin": "-99", "jetPtBinWidth": "5", "fillTHnSparse": "false", + "jetExtraParam": "-99", "processDummy": "false", "processChargedJetsData": "true", "processChargedEvtWiseSubJetsData": "false", "processChargedJetsMCD": "false", "processChargedEvtWiseSubJetsMCD": "false", - "processChargedJetsMCP": "false" + "processChargedJetsMCP": "false", + "processChargedEvtWiseSubJetsMCP": "false" }, "jet-finder-d0-mcd-charged": { "vertexZCut": "10", "centralityMin": "-999", "centralityMax": "999", + "trackOccupancyInTimeRangeMax": "999999", + "eventSelections": "sel8", + "triggerMasks": "", "trackPtMin": "0.15", "trackPtMax": "1000", "trackEtaMin": "-0.9", "trackEtaMax": "0.9", "trackPhiMin": "-999", "trackPhiMax": "999", + "trackingEfficiency": "1", "trackSelections": "globalTracks", - "eventSelections": "sel8", "particleSelections": "PhysicalPrimary", "clusterDefinition": "kV3Default", "clusterEtaMin": "-0.7", @@ -7158,28 +7192,34 @@ "jetRecombScheme": "0", "jetGhostArea": "0.005", "ghostRepeat": "1", + "DoTriggering": "false", "jetAreaFractionMin": "-99", "jetPtBinWidth": "5", "fillTHnSparse": "false", + "jetExtraParam": "-99", "processDummy": "false", "processChargedJetsData": "false", "processChargedEvtWiseSubJetsData": "false", "processChargedJetsMCD": "true", "processChargedEvtWiseSubJetsMCD": "false", - "processChargedJetsMCP": "false" + "processChargedJetsMCP": "false", + "processChargedEvtWiseSubJetsMCP": "false" }, "jet-finder-d0-mcp-charged": { "vertexZCut": "10", "centralityMin": "-999", "centralityMax": "999", + "trackOccupancyInTimeRangeMax": "999999", + "eventSelections": "sel8", + "triggerMasks": "", "trackPtMin": "0.15", "trackPtMax": "1000", "trackEtaMin": "-0.9", "trackEtaMax": "0.9", "trackPhiMin": "-999", "trackPhiMax": "999", + "trackingEfficiency": "1", "trackSelections": "globalTracks", - "eventSelections": "sel8", "particleSelections": "PhysicalPrimary", "clusterDefinition": "kV3Default", "clusterEtaMin": "-0.7", @@ -7212,36 +7252,50 @@ "jetRecombScheme": "0", "jetGhostArea": "0.005", "ghostRepeat": "1", + "DoTriggering": "false", "jetAreaFractionMin": "-99", "jetPtBinWidth": "5", "fillTHnSparse": "false", + "jetExtraParam": "-99", "processDummy": "false", "processChargedJetsData": "false", "processChargedEvtWiseSubJetsData": "false", "processChargedJetsMCD": "false", "processChargedEvtWiseSubJetsMCD": "false", - "processChargedJetsMCP": "true" + "processChargedJetsMCP": "true", + "processChargedEvtWiseSubJetsMCP": "false" }, "jet-finder-charged-d0-qa": { - "selectedJetsRadius": "0.4", + "selectedJetsRadius": "0.400000006", + "eventSelections": "sel8", "vertexZCut": "10", + "centralityMin": "-999", + "centralityMax": "999", "jetRadii": { "values": [ "0.4" ] }, - "trackEtaMin": "-0.9", - "trackEtaMax": "0.9", - "trackPtMin": "0.15", + "trackEtaMin": "-0.899999976", + "trackEtaMax": "0.899999976", + "trackPtMin": "0.150000006", "trackPtMax": "100", "trackSelections": "globalTracks", - "selectionFlagD0": "0", - "selectionFlagD0bar": "0", - "selectionFlagLcToPKPi": "0", - "selectionFlagLcToPiPK": "0", - "selectionFlagBplus": "0", + "jetPtMax": "200", + "jetEtaMin": "-99", + "jetEtaMax": "99", + "jetAreaFractionMin": "-99", + "leadingConstituentPtMin": "-99", + "pTHatMaxMCD": "999", + "pTHatMaxMCP": "999", + "pTHatExponent": "6", + "randomConeR": "0.400000006", "processDummy": "false", - "processJetsData": "true", + "processJetsData": "false", + "processJetsRhoAreaSubData": "false", + "processJetsRhoAreaSubMCD": "false", + "processEvtWiseConstSubJetsData": "false", + "processJetsSubMatched": "false", "processJetsMCD": "true", "processJetsMCDWeighted": "false", "processJetsMCP": "true", @@ -7249,9 +7303,17 @@ "processJetsMCPMCDMatched": "false", "processJetsMCPMCDMatchedWeighted": "false", "processMCCollisionsWeighted": "false", - "processTriggeredData": "false" + "processTriggeredData": "false", + "processHFTriggeredData": "false", + "processTracks": "false", + "processTracksWeighted": "false", + "processTracksSub": "false", + "processRho": "false", + "processRandomConeData": "false", + "processRandomConeMCD": "false", + "processCandidates": "false" }, - "jet-matching-d0-ch": { + "jet-matching-mc-d0-ch": { "doMatchingGeo": "true", "doMatchingPt": "true", "doMatchingHf": "true", diff --git a/codeHF/workflows.yml b/codeHF/workflows.yml index 0bbb19b2..011af235 100644 --- a/codeHF/workflows.yml +++ b/codeHF/workflows.yml @@ -488,53 +488,41 @@ workflows: requires_mc: yes tables: [D0PJET, D0PJETCONSTS, D0PJETCONSTSUB] - o2-analysis-je-jet-finder-hf-qa_data: - executable: o2-analysis-je-jet-finder-hf-qa + o2-analysis-je-jet-finder-d0-qa_data: + executable: o2-analysis-je-jet-finder-d0-qa dependencies: o2-analysis-je-jet-finder-d0-data-charged - o2-analysis-je-jet-finder-hf-qa_mc: - executable: o2-analysis-je-jet-finder-hf-qa + o2-analysis-je-jet-finder-d0-qa_mc: + executable: o2-analysis-je-jet-finder-d0-qa dependencies: [o2-analysis-je-jet-finder-d0-mcd-charged, o2-analysis-je-jet-finder-d0-mcp-charged] requires_mc: yes - o2-analysis-je-jet-matching: + o2-analysis-je-jet-matching-mc-d0-ch: dependencies: [o2-analysis-je-jet-finder-d0-mcd-charged, o2-analysis-je-jet-finder-d0-mcp-charged] requires_mc: yes tables: [D0JETMP2D, D0JETMD2P] - o2-analysis-je-jet-substructure-hf_data: - executable: o2-analysis-je-jet-substructure-hf + o2-analysis-je-jet-substructure-d0_data: + executable: o2-analysis-je-jet-substructure-d0 dependencies: [o2-analysis-hf-candidate-selector-d0, o2-analysis-je-jet-finder-d0-data-charged] tables: D0SS - o2-analysis-je-jet-substructure-hf_mcd: - executable: o2-analysis-je-jet-substructure-hf - dependencies: [o2-analysis-hf-candidate-selector-d0, o2-analysis-je-jet-finder-d0-mcd-charged] + o2-analysis-je-jet-substructure-d0_mc: + executable: o2-analysis-je-jet-substructure-d0 + dependencies: [o2-analysis-hf-candidate-selector-d0, o2-analysis-je-jet-finder-d0-mcd-charged, o2-analysis-je-jet-finder-d0-mcp-charged] requires_mc: yes - tables: D0MCDSS + tables: [D0MCDSS,D0MCPSS] - o2-analysis-je-jet-substructure-hf_mcp: - executable: o2-analysis-je-jet-substructure-hf - dependencies: [o2-analysis-hf-candidate-selector-d0, o2-analysis-je-jet-finder-d0-mcp-charged] - requires_mc: yes - tables: D0MCPSS - - o2-analysis-je-jet-substructure-hf-output_data: - executable: o2-analysis-je-jet-substructure-hf-output - dependencies: o2-analysis-je-jet-substructure-hf_data + o2-analysis-je-jet-substructure-d0-output_data: + executable: o2-analysis-je-jet-substructure-d0-output + dependencies: o2-analysis-je-jet-substructure-d0_data tables: [D0O, D0SSO] - o2-analysis-je-jet-substructure-hf-output_mcd: - executable: o2-analysis-je-jet-substructure-hf-output - dependencies: o2-analysis-je-jet-substructure-hf_mcd - requires_mc: yes - tables: [D0MCDO, D0MCDSSO] - - o2-analysis-je-jet-substructure-hf-output_mcp: - executable: o2-analysis-je-jet-substructure-hf-output - dependencies: o2-analysis-je-jet-substructure-hf_mcp + o2-analysis-je-jet-substructure-d0-output_mc: + executable: o2-analysis-je-jet-substructure-d0-output + dependencies: o2-analysis-je-jet-substructure-d0_mc requires_mc: yes - tables: [D0MCPO, D0MCPSSO] + tables: [D0MCDO, D0MCDSSO, D0MCPO, D0MCPSSO] # QA