Skip to content

Commit c44b58a

Browse files
JiYuanjingJiYuanjing
authored
Merge branch 'AliceO2Group:master' into pjpsi_femto
2 parents 4f9df24 + 847753f commit c44b58a

File tree

4 files changed

+67
-29
lines changed

4 files changed

+67
-29
lines changed

‎PWGCF/EbyEFluctuations/Tasks/CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ o2physics_add_dpl_workflow(netproton-cumulants
2424
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGCFCore
2525
COMPONENT_NAME Analysis)
2626

27+
o2physics_add_dpl_workflow(netproton-cumulants-mc
28+
SOURCES netprotonCumulantsMc.cxx
29+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGCFCore
30+
COMPONENT_NAME Analysis)
31+
2732
o2physics_add_dpl_workflow(identified-meanpt-fluctuations
2833
SOURCES IdentifiedMeanPtFluctuations.cxx
2934
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGCFCore

‎PWGCF/EbyEFluctuations/Tasks/netprotonCumulantsMc.cxx‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -816,6 +816,11 @@ struct NetprotonCumulantsMc {
816816
template <typename T>
817817
bool selectionPIDnew(const T& candidate)
818818
{
819+
// electron rejection
820+
if (candidate.tpcNSigmaEl() > -3.0f && candidate.tpcNSigmaEl() < 5.0f && std::abs(candidate.tpcNSigmaPi()) > 3.0f && std::abs(candidate.tpcNSigmaKa()) > 3.0f && std::abs(candidate.tpcNSigmaPr()) > 3.0f) {
821+
return false;
822+
}
823+
819824
//! if pt < threshold
820825
if (candidate.pt() > 0.2f && candidate.pt() <= cfgCutPtUpperTPC) {
821826
if (!candidate.hasTOF() && std::abs(candidate.tpcNSigmaPr()) < cfgnSigmaCutTPC && std::abs(candidate.tpcNSigmaPi()) > cfgnSigmaCutTPC && std::abs(candidate.tpcNSigmaKa()) > cfgnSigmaCutTPC) {
@@ -1070,6 +1075,9 @@ struct NetprotonCumulantsMc {
10701075
{
10711076
continue;
10721077
}
1078+
if ((track.pt() < cfgCutPtLower) || (track.pt() > 5.0f) || (std::abs(track.eta()) > 0.8f)) {
1079+
continue;
1080+
}
10731081

10741082
histos.fill(HIST("hrecPtAll"), track.pt());
10751083
histos.fill(HIST("hrecEtaAll"), track.eta());

‎PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx‎

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include "Framework/RunningWorkflowInfo.h"
2525
#include "Framework/StepTHn.h"
2626
#include "Framework/O2DatabasePDGPlugin.h"
27-
#include "TDatabasePDG.h"
2827
#include "ReconstructionDataFormats/PID.h"
2928
#include "Common/DataModel/PIDResponse.h"
3029

@@ -239,13 +238,13 @@ struct femtoUniversePairTaskTrackTrackSpherHarMultKtExtended {
239238
// ConfNsigmaCombined -> TPC and TOF Sigma (combined) for momentum > 0.5
240239

241240
if (mom < twotracksconfigs.ConfTOFPtMin) {
242-
if (TMath::Abs(nsigmaTPCPr) < twotracksconfigs.ConfNsigmaTPC) {
241+
if (std::abs(nsigmaTPCPr) < twotracksconfigs.ConfNsigmaTPC) {
243242
return true;
244243
} else {
245244
return false;
246245
}
247246
} else {
248-
if (TMath::Hypot(nsigmaTOFPr, nsigmaTPCPr) < twotracksconfigs.ConfNsigmaCombined) {
247+
if (std::hypot(nsigmaTOFPr, nsigmaTPCPr) < twotracksconfigs.ConfNsigmaCombined) {
249248
return true;
250249
} else {
251250
return false;
@@ -257,33 +256,33 @@ struct femtoUniversePairTaskTrackTrackSpherHarMultKtExtended {
257256
bool IsKaonNSigma(float mom, float nsigmaTPCK, float nsigmaTOFK)
258257
{
259258
if (mom < 0.3) { // 0.0-0.3
260-
if (TMath::Abs(nsigmaTPCK) < 3.0) {
259+
if (std::abs(nsigmaTPCK) < 3.0) {
261260
return true;
262261
} else {
263262
return false;
264263
}
265264
} else if (mom < 0.45) { // 0.30 - 0.45
266-
if (TMath::Abs(nsigmaTPCK) < 2.0) {
265+
if (std::abs(nsigmaTPCK) < 2.0) {
267266
return true;
268267
} else {
269268
return false;
270269
}
271270
} else if (mom < 0.55) { // 0.45-0.55
272-
if (TMath::Abs(nsigmaTPCK) < 1.0) {
271+
if (std::abs(nsigmaTPCK) < 1.0) {
273272
return true;
274273
} else {
275274
return false;
276275
}
277276
} else if (mom < 1.5) { // 0.55-1.5 (now we use TPC and TOF)
278-
if ((TMath::Abs(nsigmaTOFK) < 3.0) && (TMath::Abs(nsigmaTPCK) < 3.0)) {
277+
if ((std::abs(nsigmaTOFK) < 3.0) && (std::abs(nsigmaTPCK) < 3.0)) {
279278
{
280279
return true;
281280
}
282281
} else {
283282
return false;
284283
}
285284
} else if (mom > 1.5) { // 1.5 -
286-
if ((TMath::Abs(nsigmaTOFK) < 2.0) && (TMath::Abs(nsigmaTPCK) < 3.0)) {
285+
if ((std::abs(nsigmaTOFK) < 2.0) && (std::abs(nsigmaTPCK) < 3.0)) {
287286
return true;
288287
} else {
289288
return false;
@@ -304,13 +303,13 @@ struct femtoUniversePairTaskTrackTrackSpherHarMultKtExtended {
304303
// ConfNsigmaCombined -> TPC and TOF Pion Sigma (combined) for momentum > 0.5
305304
if (true) {
306305
if (mom < twotracksconfigs.ConfTOFPtMin) {
307-
if (TMath::Abs(nsigmaTPCPi) < twotracksconfigs.ConfNsigmaTPC) {
306+
if (std::abs(nsigmaTPCPi) < twotracksconfigs.ConfNsigmaTPC) {
308307
return true;
309308
} else {
310309
return false;
311310
}
312311
} else {
313-
if (TMath::Hypot(nsigmaTOFPi, nsigmaTPCPi) < twotracksconfigs.ConfNsigmaCombined) {
312+
if (std::hypot(nsigmaTOFPi, nsigmaTPCPi) < twotracksconfigs.ConfNsigmaCombined) {
314313
return true;
315314
} else {
316315
return false;
@@ -547,8 +546,8 @@ struct femtoUniversePairTaskTrackTrackSpherHarMultKtExtended {
547546
/// process function for to call doSameEvent with Data
548547
/// \param col subscribe to the collision table (Data)
549548
/// \param parts subscribe to the femtoUniverseParticleTable
550-
void processSameEvent(FilteredFDCollision& col,
551-
FilteredFemtoFullParticles& parts)
549+
void processSameEvent(FilteredFDCollision const& col,
550+
FilteredFemtoFullParticles const& parts)
552551
{
553552
fillCollision(col, ConfIsCent);
554553

@@ -587,9 +586,9 @@ struct femtoUniversePairTaskTrackTrackSpherHarMultKtExtended {
587586
/// \param col subscribe to the collision table (Monte Carlo Reconstructed reconstructed)
588587
/// \param parts subscribe to joined table FemtoUniverseParticles and FemtoUniverseMCLables to access Monte Carlo truth
589588
/// \param FemtoUniverseMCParticles subscribe to the Monte Carlo truth table
590-
void processSameEventMC(o2::aod::FdCollision& col,
591-
soa::Join<FilteredFemtoFullParticles, aod::FDMCLabels>& parts,
592-
o2::aod::FdMCParticles&)
589+
void processSameEventMC(o2::aod::FdCollision const& col,
590+
soa::Join<FilteredFemtoFullParticles, aod::FDMCLabels> const& parts,
591+
o2::aod::FdMCParticles const&)
593592
{
594593
fillCollision(col, ConfIsCent);
595594

@@ -694,8 +693,8 @@ struct femtoUniversePairTaskTrackTrackSpherHarMultKtExtended {
694693
/// process function for to call doMixedEvent with Data
695694
/// @param cols subscribe to the collisions table (Data)
696695
/// @param parts subscribe to the femtoUniverseParticleTable
697-
void processMixedEventCent(FilteredFDCollisions& cols,
698-
FilteredFemtoFullParticles& parts)
696+
void processMixedEventCent(FilteredFDCollisions const& cols,
697+
FilteredFemtoFullParticles const& parts)
699698
{
700699
randgen = new TRandom2(0);
701700

@@ -734,8 +733,8 @@ struct femtoUniversePairTaskTrackTrackSpherHarMultKtExtended {
734733
/// process function for to call doMixedEvent with Data
735734
/// @param cols subscribe to the collisions table (Data)
736735
/// @param parts subscribe to the femtoUniverseParticleTable
737-
void processMixedEventNtr(FilteredFDCollisions& cols,
738-
FilteredFemtoFullParticles& parts)
736+
void processMixedEventNtr(FilteredFDCollisions const& cols,
737+
FilteredFemtoFullParticles const& parts)
739738
{
740739
randgen = new TRandom2(0);
741740

@@ -769,13 +768,13 @@ struct femtoUniversePairTaskTrackTrackSpherHarMultKtExtended {
769768
}
770769
delete randgen;
771770
}
772-
PROCESS_SWITCH(femtoUniversePairTaskTrackTrackSpherHarMultKtExtended, processMixedEventNtr, "Enable processing mixed events for centrality", true);
771+
PROCESS_SWITCH(femtoUniversePairTaskTrackTrackSpherHarMultKtExtended, processMixedEventNtr, "Enable processing mixed events for centrality", false);
773772

774773
/// process function for to fill covariance histograms
775774
/// \param col subscribe to the collision table (Data)
776775
/// \param parts subscribe to the femtoUniverseParticleTable
777-
void processCov(soa::Filtered<o2::aod::FdCollisions>::iterator& /*col*/,
778-
FilteredFemtoFullParticles& /*parts*/)
776+
void processCov(soa::Filtered<o2::aod::FdCollisions>::iterator const& /*col*/,
777+
FilteredFemtoFullParticles const& /*parts*/)
779778
{
780779
int JMax = (ConfLMax + 1) * (ConfLMax + 1);
781780
if (cfgProcessMM) {
@@ -789,15 +788,15 @@ struct femtoUniversePairTaskTrackTrackSpherHarMultKtExtended {
789788
mixedEventMultCont.fillMultkTCov(femto_universe_sh_container::EventType::mixed, JMax);
790789
}
791790
}
792-
PROCESS_SWITCH(femtoUniversePairTaskTrackTrackSpherHarMultKtExtended, processCov, "Enable processing same event covariance", true);
791+
PROCESS_SWITCH(femtoUniversePairTaskTrackTrackSpherHarMultKtExtended, processCov, "Enable processing same event covariance", false);
793792

794793
/// brief process function for to call doMixedEvent with Monte Carlo
795794
/// @param cols subscribe to the collisions table (Monte Carlo Reconstructed reconstructed)
796795
/// @param parts subscribe to joined table FemtoUniverseParticles and FemtoUniverseMCLables to access Monte Carlo truth
797796
/// @param FemtoUniverseMCParticles subscribe to the Monte Carlo truth table
798-
void processMixedEventMCCent(o2::aod::FdCollisions& cols,
799-
soa::Join<FilteredFemtoFullParticles, aod::FDMCLabels>& parts,
800-
o2::aod::FdMCParticles&)
797+
void processMixedEventMCCent(o2::aod::FdCollisions const& cols,
798+
soa::Join<FilteredFemtoFullParticles, aod::FDMCLabels> const& parts,
799+
o2::aod::FdMCParticles const&)
801800
{
802801
randgen = new TRandom2(0);
803802

@@ -839,9 +838,9 @@ struct femtoUniversePairTaskTrackTrackSpherHarMultKtExtended {
839838
/// @param cols subscribe to the collisions table (Monte Carlo Reconstructed reconstructed)
840839
/// @param parts subscribe to joined table FemtoUniverseParticles and FemtoUniverseMCLables to access Monte Carlo truth
841840
/// @param FemtoUniverseMCParticles subscribe to the Monte Carlo truth table
842-
void processMixedEventMCNtr(o2::aod::FdCollisions& cols,
843-
soa::Join<FilteredFemtoFullParticles, aod::FDMCLabels>& parts,
844-
o2::aod::FdMCParticles&)
841+
void processMixedEventMCNtr(o2::aod::FdCollisions const& cols,
842+
soa::Join<FilteredFemtoFullParticles, aod::FDMCLabels> const& parts,
843+
o2::aod::FdMCParticles const&)
845844
{
846845
randgen = new TRandom2(0);
847846

‎PWGCF/Flow/Tasks/flowPbpbPikp.cxx‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,14 @@ struct FlowPbpbPikp {
7070
O2_DEFINE_CONFIGURABLE(cfgCutPtMin, float, 0.2f, "Minimal pT for ref tracks")
7171
O2_DEFINE_CONFIGURABLE(cfgCutPtMax, float, 3.0f, "Maximal pT for ref tracks")
7272
O2_DEFINE_CONFIGURABLE(cfgCutEta, float, 0.8f, "Eta range for tracks")
73+
O2_DEFINE_CONFIGURABLE(cfgTpcCluster, int, 70, "Number of TPC clusters")
7374
O2_DEFINE_CONFIGURABLE(cfgCutChi2prTPCcls, float, 2.5, "Chi2 per TPC clusters")
7475
O2_DEFINE_CONFIGURABLE(cfgUseNch, bool, false, "Use Nch for flow observables")
7576
O2_DEFINE_CONFIGURABLE(cfgNbootstrap, int, 10, "Number of subsamples")
7677
O2_DEFINE_CONFIGURABLE(cfgFillWeights, bool, true, "Fill NUA weights")
78+
O2_DEFINE_CONFIGURABLE(cfgOutputNUAWeights, bool, false, "Fill and output NUA weights")
79+
O2_DEFINE_CONFIGURABLE(cfgEfficiency, std::string, "", "CCDB path to efficiency object")
80+
O2_DEFINE_CONFIGURABLE(cfgAcceptance, std::string, "", "CCDB path to acceptance object")
7781
O2_DEFINE_CONFIGURABLE(cfgTpcNsigmaCut, float, 2.0f, "TPC N-sigma cut for pions, kaons, protons")
7882
O2_DEFINE_CONFIGURABLE(cfgTofPtCut, float, 0.5f, "Minimum pt to use TOF N-sigma")
7983
O2_DEFINE_CONFIGURABLE(cfgCutDCAxy, float, 2.0f, "DCAxy range for tracks")
@@ -133,6 +137,10 @@ struct FlowPbpbPikp {
133137
fPtAxis = new TAxis(nPtBins, ptBins);
134138

135139
TObjArray* oba = new TObjArray();
140+
oba->Add(new TNamed("ChFull22", "ChFull22"));
141+
for (int i = 0; i < fPtAxis->GetNbins(); i++)
142+
oba->Add(new TNamed(Form("ChFull22_pt_%i", i + 1), "ChFull22_pTDiff"));
143+
136144
oba->Add(new TNamed("Ch08Gap22", "Ch08Gap22"));
137145
for (int i = 0; i < fPtAxis->GetNbins(); i++)
138146
oba->Add(new TNamed(Form("Ch08Gap22_pt_%i", i + 1), "Ch08Gap22_pTDiff"));
@@ -145,10 +153,24 @@ struct FlowPbpbPikp {
145153
oba->Add(new TNamed("Pr08Gap22", "Pr08Gap22"));
146154
for (int i = 0; i < fPtAxis->GetNbins(); i++)
147155
oba->Add(new TNamed(Form("Pr08Gap22_pt_%i", i + 1), "Pr08Gap22_pTDiff"));
156+
148157
oba->Add(new TNamed("ChFull24", "ChFull24"));
149158
for (int i = 0; i < fPtAxis->GetNbins(); i++)
150159
oba->Add(new TNamed(Form("ChFull24_pt_%i", i + 1), "ChFull24_pTDiff"));
151160

161+
oba->Add(new TNamed("Ch08Gap24", "Ch08Gap24"));
162+
for (int i = 0; i < fPtAxis->GetNbins(); i++)
163+
oba->Add(new TNamed(Form("Ch08Gap24_pt_%i", i + 1), "Ch08Gap24_pTDiff"));
164+
oba->Add(new TNamed("Pi08Gap24", "Pi08Gap24"));
165+
for (int i = 0; i < fPtAxis->GetNbins(); i++)
166+
oba->Add(new TNamed(Form("Pi08Gap24_pt_%i", i + 1), "Pi08Gap24_pTDiff"));
167+
oba->Add(new TNamed("Ka08Gap24", "Ka08Gap24"));
168+
for (int i = 0; i < fPtAxis->GetNbins(); i++)
169+
oba->Add(new TNamed(Form("Ka08Gap24_pt_%i", i + 1), "Ka08Gap24_pTDiff"));
170+
oba->Add(new TNamed("Pr08Gap24", "Pr08Gap24"));
171+
for (int i = 0; i < fPtAxis->GetNbins(); i++)
172+
oba->Add(new TNamed(Form("Pr08Gap24_pt_%i", i + 1), "Pr08Gap24_pTDiff"));
173+
152174
fFC->SetName("FlowContainer");
153175
fFC->SetXAxis(fPtAxis);
154176
fFC->Initialize(oba, axisMultiplicity, cfgNbootstrap);
@@ -177,6 +199,8 @@ struct FlowPbpbPikp {
177199
fGFW->AddRegion("poiNpr", -0.8, -0.4, 1 + fPtAxis->GetNbins(), 8);
178200
fGFW->AddRegion("olNpr", -0.8, -0.4, 1 + fPtAxis->GetNbins(), 64);
179201

202+
// reference particles
203+
corrconfigs.push_back(fGFW->GetCorrelatorConfig("full {2 -2}", "ChFull22", kFALSE));
180204
corrconfigs.push_back(fGFW->GetCorrelatorConfig("refN08 {2} refP08 {-2}", "Ch08Gap22", kFALSE));
181205
corrconfigs.push_back(fGFW->GetCorrelatorConfig("refN08 {2} refP08 {-2}", "Pi08Gap22", kFALSE));
182206
corrconfigs.push_back(fGFW->GetCorrelatorConfig("refN08 {2} refP08 {-2}", "Ka08Gap22", kFALSE));
@@ -187,6 +211,8 @@ struct FlowPbpbPikp {
187211
corrconfigs.push_back(fGFW->GetCorrelatorConfig("refN08 {2 2} refP08 {-2 -2}", "Ka08Gap24", kFALSE));
188212
corrconfigs.push_back(fGFW->GetCorrelatorConfig("refN08 {2 2} refP08 {-2 -2}", "Pr08Gap24", kFALSE));
189213

214+
// pt differential pois
215+
corrconfigs.push_back(fGFW->GetCorrelatorConfig("poi full | ol {2 -2}", "ChFull22", kTRUE));
190216
corrconfigs.push_back(fGFW->GetCorrelatorConfig("poiN refN08 | olN {2} refP08 {-2}", "Ch08Gap22", kTRUE));
191217
corrconfigs.push_back(fGFW->GetCorrelatorConfig("poiNpi refN08 | olNpi {2} refP08 {-2}", "Pi08Gap22", kTRUE));
192218
corrconfigs.push_back(fGFW->GetCorrelatorConfig("poiNk refN08 | olNk {2} refP08 {-2}", "Ka08Gap22", kTRUE));

0 commit comments

Comments
 (0)