diff --git a/codeHF/Compare.C b/codeHF/Compare.C index 185ed5c7..98f4c7f5 100644 --- a/codeHF/Compare.C +++ b/codeHF/Compare.C @@ -24,7 +24,7 @@ Int_t Compare(TString filerun3 = "AnalysisResults.root", TString filerun1 = "Ver return 1; } - const int nhisto = 19; + const int nhisto = 26; const int nhisto_2prong = 15; TString histonameRun1[nhisto] = {"hPtAllTracks", "hPtSelTracks", @@ -49,7 +49,14 @@ Int_t Compare(TString filerun3 = "AnalysisResults.root", TString filerun1 = "Ver //"hCovSVXX", "hDplusVertX", "hDplusVertY", - "hDplusVertZ" + "hDplusVertZ", + "hInvMassLc", + "hPtLc", + "hPtLcDau0", + "hPtLcDau1", + "hPtLcDau2", + "hDecLenLc", + "hCosPointLc" }; TString histonameRun3[nhisto] = {"hf-produce-sel-track/hpt_nocuts", "hf-produce-sel-track/hpt_cuts_2prong", @@ -66,7 +73,7 @@ Int_t Compare(TString filerun3 = "AnalysisResults.root", TString filerun1 = "Ver "hf-task-d0/hd0Prong1", "hf-task-d0/hd0d0", "hf-task-d0/hmass", - "hf-task-dplus/hmass", + "hf-task-dplus/hMass", //"hf-task-d0/hImpParErr", //"hf-task-d0/hDecLenErr", //"hf-task-d0/hDecLenXYErr", @@ -74,7 +81,14 @@ Int_t Compare(TString filerun3 = "AnalysisResults.root", TString filerun1 = "Ver //"hf-cand-creator-2prong/hCovSVXX", "hf-track-index-skims-creator/hvtx3_x", "hf-track-index-skims-creator/hvtx3_y", - "hf-track-index-skims-creator/hvtx3_z" + "hf-track-index-skims-creator/hvtx3_z", + "hf-task-lc/hmass", + "hf-task-lc/hptcand", + "hf-task-lc/hptprong0", + "hf-task-lc/hptprong1", + "hf-task-lc/hptprong2", + "hf-task-lc/hdeclength", + "hf-task-lc/hCPA" }; TString xaxis[nhisto] = {"#it{p}_{T} before selections", "#it{p}_{T} after selections", @@ -99,9 +113,17 @@ Int_t Compare(TString filerun3 = "AnalysisResults.root", TString filerun1 = "Ver //"XX element of SV cov. matrix", "secondary vtx x - 3prong", "secondary vtx y - 3prong", - "secondary vtx z - 3prong" + "secondary vtx z - 3prong", + "3-prong mass (p K #pi)", + "#Lambda_{c} #it{p}_{T} cand", + "#Lambda_{c} #it{p}_{T} prong 0", + "#Lambda_{c} #it{p}_{T} prong 1", + "#Lambda_{c} #it{p}_{T} prong 2", + "#Lambda_{c} Decay Length", + "#Lambda_{c} CPA" }; - int rebin[nhisto] = {2, 2, 2, 5, 5, 5, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2/*, 1, 1, 1, 1, 1*/, 5, 5, 5}; + //int rebin[nhisto] = {2, 2, 2, 5, 5, 5, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2/*, 1, 1, 1, 1, 1*/,5, 5, 5, 2, 1, 1, 1, 1, 1, 1, 5, 5, 5}; + int rebin[nhisto] = {2, 2, 2, 5, 5, 5, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2/*, 1, 1, 1, 1, 1*/,5, 5, 5, 2, 1, 1, 1, 1, 1, 1}; TH1F* hRun1[nhisto]; TH1F* hRun3[nhisto]; TH1F* hRatio[nhisto]; diff --git a/codeHF/config_tasks.sh b/codeHF/config_tasks.sh index 18fa82e0..0efa644d 100644 --- a/codeHF/config_tasks.sh +++ b/codeHF/config_tasks.sh @@ -33,7 +33,7 @@ DOO2_SEL_D0=0 # hf-d0-candidate-selector DOO2_SEL_LC=0 # hf-lc-candidate-selector DOO2_TASK_D0=1 # hf-task-d0 DOO2_TASK_DPLUS=1 # hf-task-dplus -DOO2_TASK_LC=0 # hf-task-lc +DOO2_TASK_LC=1 # hf-task-lc # Selection cuts APPLYCUTS_D0=0 # Apply D0 selection cuts. @@ -127,6 +127,7 @@ function MakeScriptO2 { O2ARGS_CAND_2PRONG+=" --doMC" O2ARGS_CAND_3PRONG+=" --doMC" O2ARGS_TASK_D0+=" --doMC" + O2ARGS_TASK_LC+=" --doMC" } # Pair O2 executables with their respective options. @@ -180,7 +181,7 @@ EOF function MakeScriptPostprocess { POSTEXEC="echo Postprocessing" - [[ $DOALI -eq 1 && $DOO2 -eq 1 && $DOO2_TASK_D0 -eq 1 && $DOO2_TASK_DPLUS -eq 1 ]] && POSTEXEC+=" && root -b -q -l \"$DIR_TASKS/Compare.C(\\\"\$FileO2\\\", \\\"\$FileAli\\\", $MASS)\"" + [[ $DOALI -eq 1 && $DOO2 -eq 1 && $DOO2_TASK_D0 -eq 1 && $DOO2_TASK_DPLUS -eq 1 && $DOO2_TASK_LC -eq 1 ]] && POSTEXEC+=" && root -b -q -l \"$DIR_TASKS/Compare.C(\\\"\$FileO2\\\", \\\"\$FileAli\\\", $MASS)\"" [[ $DOO2 -eq 1 && $DOO2_TASK_D0 -eq 1 && $ISMC -eq 1 ]] && POSTEXEC+=" && root -b -q -l \"$DIR_TASKS/PlotEfficiency.C(\\\"\$FileO2\\\")\"" cat << EOF > $SCRIPT_POSTPROCESS #!/bin/bash diff --git a/codeHF/dpl-config_run3.json b/codeHF/dpl-config_run3.json index 994f2531..ba3e6a7b 100644 --- a/codeHF/dpl-config_run3.json +++ b/codeHF/dpl-config_run3.json @@ -13,9 +13,11 @@ "d_tpcnclsfound": "71", "ptmintrack_2prong": "0.", "dcatoprimxymin_2prong": "0.03", + "dcatoprimxymax_2prong": "1.", "etamax_2prong": "999.", "ptmintrack_3prong": "0.", "dcatoprimxymin_3prong": "0.03", + "dcatoprimxymax_3prong": "1.", "etamax_3prong": "999." }, "hf-track-index-skims-creator": { @@ -45,8 +47,8 @@ "mCPADPlusMin": "0.95", "mDecLenDPlusMin": "0.05", "mPtLcMin": "4.", - "mInvMassLcMin": "2.15", - "mInvMassLcMax": "2.42", + "mInvMassLcMin": "1.88", + "mInvMassLcMax": "2.68", "mCPALcMin": "-2.", "mDecLenLcMin": "0.", "mPtDsMin": "1.5", @@ -113,7 +115,12 @@ "hf-task-dplus": { "d_selectionFlagDPlus": "0" }, - "hf-task-lc": { + "hf-task-lc": { + "cutEtaCandMax": "-1.", + "d_selectionFlagLc": "0" + }, + "hf-task-lc-mc": { + "cutEtaCandMax": "-1.", "d_selectionFlagLc": "0" }, "internal-dpl-aod-writer": { diff --git a/codeHF/dpl-config_run5.json b/codeHF/dpl-config_run5.json index a979d40c..f2f20986 100644 --- a/codeHF/dpl-config_run5.json +++ b/codeHF/dpl-config_run5.json @@ -13,9 +13,11 @@ "d_tpcnclsfound": "-999999", "ptmintrack_2prong": ".3", "dcatoprimxymin_2prong": "0.0", + "dcatoprimxymax_2prong": "0.0", "etamax_2prong": "1.44", "ptmintrack_3prong": ".3", "dcatoprimxymin_3prong": "0.0", + "dcatoprimxymax_3prong": "0.0", "etamax_3prong": "1.44" }, "hf-track-index-skims-creator": { @@ -45,8 +47,8 @@ "mCPADPlusMin": "0.95", "mDecLenDPlusMin": "0.05", "mPtLcMin": "4.", - "mInvMassLcMin": "2.15", - "mInvMassLcMax": "2.42", + "mInvMassLcMin": "1.88", + "mInvMassLcMax": "2.68", "mCPALcMin": "-2.", "mDecLenLcMin": "0.", "mPtDsMin": "1.5", @@ -113,7 +115,12 @@ "hf-task-dplus": { "d_selectionFlagDPlus": "0" }, - "hf-task-lc": { + "hf-task-lc": { + "cutEtaCandMax": "-1.", + "d_selectionFlagLc": "0" + }, + "hf-task-lc-mc": { + "cutEtaCandMax": "-1.", "d_selectionFlagLc": "0" }, "internal-dpl-aod-writer": {