Skip to content

[PWGDQ] update dqeff direct #18191

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

Open
ypwangg wants to merge 1 commit into
base: master
Choose a base branch
from
+41 −1
Open

[PWGDQ] update dqeff direct #18191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 18 additions & 0 deletions PWGDQ/Core/CutsLibrary.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3660,6 +3660,11 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName)
return cut;
}

if (!nameStr.compare("pairX3872Minitree")) {
cut->AddCut(GetAnalysisCut("pairX3872_minitree"));
return cut;
}

if (nameStr == "DipionPairCut1") {
cut->AddCut(GetAnalysisCut("DipionMassCut1"));
return cut;
Expand Down Expand Up @@ -7124,6 +7129,19 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName)
return cut;
}

std::shared_ptr<TF1> fDeltaR2High = std::make_shared<TF1>("fDeltaR2High", "[0]+[1]*x", 0.0, 5.0);
fDeltaR2High->SetParameters(3.0, -0.4);
if (!nameStr.compare("pairX3872_minitree")) {
cut->AddCut(VarManager::kRap, -0.8, 0.8);
cut->AddCut(VarManager::kQuadDefaultDileptonMass, 3.0, 5.0);
cut->AddCut(VarManager::kDeltaR2, 0.0, 1.0, false, VarManager::kPt, 5.0, 1000.0);
cut->AddCut(VarManager::kDeltaR2, 0.0, fDeltaR2High, false, VarManager::kPt, 0.0, 5.0);
cut->AddCut(VarManager::kQuadPt, 0.0, 1000.0);
cut->AddCut(VarManager::kVertexingProcCode, 0.5, 2.5);
cut->AddCut(VarManager::kVertexingQuadProcCode, 0.5, 2.5);
return cut;
}

if (nameStr == "pairPtLow1") {
cut->AddCut(VarManager::kPt, 2.0, 1000.0);
return cut;
Expand Down
3 changes: 3 additions & 0 deletions PWGDQ/Core/VarManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1059,6 +1059,7 @@ class VarManager : public TObject
kDeltaR1,
kDeltaR2,
kDeltaR,
kVertexingQuadProcCode,

// DQ-HF correlation variables
kMassCharmHadron,
Expand Down Expand Up @@ -6782,6 +6783,8 @@ void VarManager::FillDileptonTrackTrackVertexing(C const& collision, T1 const& l
// o2::track::TrackParCov parsDilepton = VarManager::fgFitterTwoProngBarrel.createParentTrackParCov(0);
// procCodeDileptonTrackTrack = VarManager::fgFitterThreeProngBarrel.process(parsDilepton, pars3, pars4);
procCodeDileptonTrackTrack = VarManager::fgFitterFourProngBarrel.process(pars1, pars2, pars3, pars4);
values[kVertexingProcCode] = procCodeDilepton;
values[kVertexingQuadProcCode] = procCodeDileptonTrackTrack;

// fill values
if (procCodeDilepton == 0 || procCodeDileptonTrackTrack == 0) {
Expand Down
21 changes: 20 additions & 1 deletion PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3321,6 +3321,17 @@ struct AnalysisDileptonTrackTrack {
if (!cfgTrackSelection_TrackCuts.empty()) {
cfgTrackSelection_objArrayTrackCuts = TString(cfgTrackSelection_TrackCuts).Tokenize(",");
}
getTaskOptionValue<string>(context, "analysis-track-selection", "cfgBarrelTrackCutsJSON", cfgTrackSelection_TrackCuts, false);
if (!cfgTrackSelection_TrackCuts.empty()) {
if (cfgTrackSelection_objArrayTrackCuts == nullptr) {
cfgTrackSelection_objArrayTrackCuts = new TObjArray();
}
std::vector<AnalysisCut*> addTrackCuts = dqcuts::GetCutsFromJSON(cfgTrackSelection_TrackCuts.data());
for (const auto& t : addTrackCuts) {
auto tempObjStr = new TObjString(t->GetName());
cfgTrackSelection_objArrayTrackCuts->Add(tempObjStr);
}
}
for (Int_t icut = 0; icut < cfgTrackSelection_objArrayTrackCuts->GetEntries(); ++icut) {
TString cutName = cfgTrackSelection_objArrayTrackCuts->At(icut)->GetName();
fTrackCutNames.push_back(cutName);
Expand Down Expand Up @@ -3721,7 +3732,7 @@ struct AnalysisDileptonTrackTrack {
PROCESS_SWITCH(AnalysisDileptonTrackTrack, processX3872, "Run X(3872) -> J/psi + pi+ pi- pairing, using skimmed data", false);
PROCESS_SWITCH(AnalysisDileptonTrackTrack, processMCGen, "Loop over MC particle stack and fill generator level histograms", false);
PROCESS_SWITCH(AnalysisDileptonTrackTrack, processMCGenWithEventSelection, "Loop over MC particle stack and fill generator level histograms with event selection", false);
PROCESS_SWITCH(AnalysisDileptonTrackTrack, processDummy, "Dummy function", false);
PROCESS_SWITCH(AnalysisDileptonTrackTrack, processDummy, "Dummy function", true);
};

WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
Expand Down Expand Up @@ -3824,6 +3835,10 @@ void DefineHistograms(HistogramManager* histMan, const TString& histClasses, con
// dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "mctruth_track");
// }

if (classStr.Contains("MCTruthGenQuad")) {
dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "mctruth_quad", histName);
}

if (classStr.Contains("DileptonsSelected")) {
dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "pair", histName);
}
Expand All @@ -3847,5 +3862,9 @@ void DefineHistograms(HistogramManager* histMan, const TString& histClasses, con
if (classStr.Contains("DileptonHadronCorrelation")) {
dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "dilepton-hadron-correlation");
}

if (classStr.Contains("Quadruplet")) {
dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "dilepton-dihadron", histName);
}
} // end loop over histogram classes
}
Loading