Skip to content

Commit f280544

Browse files
FDUEnrichFDUEnrich
authored
Merge branch 'AliceO2Group:master' into master
2 parents c8b855c + 47e7fe3 commit f280544

17 files changed

Lines changed: 1576 additions & 149 deletions

‎PWGCF/EbyEFluctuations/Tasks/stronglyIntensiveCorr.cxx‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ struct StronglyIntensiveCorr {
4545
// ------------------------------------------------------------------
4646
// Configurables
4747
// ------------------------------------------------------------------
48-
Configurable<bool> cfgIsMC{"cfgIsMC", false, "Run MC histograms/processes"};
4948

5049
Configurable<float> cfgCutVertex{"cfgCutVertex", 10.0f, "Accepted z-vertex range"};
5150
Configurable<float> cfgCutEta{"cfgCutEta", 0.8f, "absolute eta cut"};
@@ -65,7 +64,7 @@ struct StronglyIntensiveCorr {
6564

6665
Configurable<float> cfgCentMin{"cfgCentMin", 0.0f, "Minimum centrality"};
6766
Configurable<float> cfgCentMax{"cfgCentMax", 90.0f, "Maximum centrality"};
68-
Configurable<int> cfgCentralityChoice{"cfgCentralityChoice", 0, "Centrality estimator: 0=FT0C, 1=FT0A, 2=FT0M, 3=FV0A"};
67+
Configurable<int> cfgCentralityChoice{"cfgCentralityChoice", 0, "Centrality estimator: 0=FT0C, 1=FT0M"};
6968
Configurable<float> cfgCentWindowWidth{"cfgCentWindowWidth", 10.0f, "Centrality window width around class centers"};
7069

7170
Configurable<int> cfgNSubsamples{"cfgNSubsamples", 20, "Number of subsamples; max is nSubsamplesMax"};
@@ -89,7 +88,7 @@ struct StronglyIntensiveCorr {
8988

9089
// F = (etaMin[i], etaMax[i]), B = (-etaMax[i], -etaMin[i])
9190
// Gap = 2*etaMin[i]. Last two bins are adjacent narrow windows around midrapidity.
92-
std::array<double, nEtaGaps> etaMin = {0.6, 0.5, 0.4, 0.3, 0.2, 0.1, 0.0, 0.0};
91+
std::array<double, nEtaGaps> etaMin = {0.6, 0.5, 0.4, 0.3, 0.2, 0.1, 0.0, -0.1};
9392
std::array<double, nEtaGaps> etaMax = {0.8, 0.7, 0.6, 0.5, 0.4, 0.3, 0.2, 0.1};
9493

9594
std::array<double, nPtBins + 1> ptEdges = {0.2, 0.5, 0.8, 1.0, 1.5, 2.0, 5.0};
@@ -639,17 +638,10 @@ struct StronglyIntensiveCorr {
639638
std::array<double, nEtaGaps> const& nB)
640639
{
641640
for (int i = 0; i < nEtaGaps; ++i) {
642-
const double gap = 2.0 * etaMin[i];
643641

644642
histos.fill(HIST("QA/hNF"), nF[i]);
645643
histos.fill(HIST("QA/hNB"), nB[i]);
646644
histos.fill(HIST("QA/hNFvsNB"), nF[i], nB[i]);
647-
648-
histos.fill(HIST("SI/pNF_etaGap"), gap, nF[i]);
649-
histos.fill(HIST("SI/pNB_etaGap"), gap, nB[i]);
650-
histos.fill(HIST("SI/pNF2_etaGap"), gap, nF[i] * nF[i]);
651-
histos.fill(HIST("SI/pNB2_etaGap"), gap, nB[i] * nB[i]);
652-
histos.fill(HIST("SI/pNFNB_etaGap"), gap, nF[i] * nB[i]);
653645
}
654646
}
655647

‎PWGCF/TwoParticleCorrelations/TableProducer/longrangeMaker.cxx‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ struct LongrangeMaker {
112112
} cfgCcdbParam;
113113

114114
struct : ConfigurableGroup {
115+
std::string prefix = "EventSelection_group";
115116
Configurable<bool> isApplyTrigTvx{"isApplyTrigTvx", false, "Enable Ft0a and Ft0c coincidence"};
116117
Configurable<bool> isApplyTfborder{"isApplyTfborder", false, "Enable TF border cut"};
117118
Configurable<bool> isApplyItsRofborder{"isApplyItsRofborder", false, "Enable ITS ROF border cut"};
@@ -138,10 +139,12 @@ struct LongrangeMaker {
138139
} cfgevtsel;
139140

140141
struct : ConfigurableGroup {
142+
std::string prefix = "MidTrackSelection_group";
141143
Configurable<float> cfgEtaCut{"cfgEtaCut", 0.8f, "Eta range to consider"};
142144
Configurable<float> cfgPtCutMin{"cfgPtCutMin", 0.2f, "minimum accepted track pT"};
143145
Configurable<float> cfgPtCutMax{"cfgPtCutMax", 10.0f, "maximum accepted track pT"};
144-
Configurable<float> cfgPtCutMult{"cfgPtCutMult", 3.0f, "maximum track pT for multiplicity classification"};
146+
Configurable<float> cfgPtCutMinForMult{"cfgPtCutMinForMult", 0.2f, "minimum track pT for multiplicity classification"};
147+
Configurable<float> cfgPtCutMaxForMult{"cfgPtCutMaxForMult", 3.0f, "maximum track pT for multiplicity classification"};
145148
Configurable<float> minNCrossedRowsTPC{"minNCrossedRowsTPC", 70.f, "cut on minimum number of TPC crossed rows"};
146149
Configurable<float> minTPCNClsFound{"minTPCNClsFound", 50.f, "cut on minimum value of TPC found clusters"};
147150
Configurable<float> minNCrossedRowsOverFindableClustersTPC{"minNCrossedRowsOverFindableClustersTPC", 0.8f, "cut on minNCrossedRowsOverFindableClustersTPC"};
@@ -155,6 +158,7 @@ struct LongrangeMaker {
155158
} cfgtrksel;
156159

157160
struct : ConfigurableGroup {
161+
std::string prefix = "MftTrackSelection_group";
158162
Configurable<bool> cfgUseChi2Cut{"cfgUseChi2Cut", false, "Use condition on MFT track: chi2/Nclusters"};
159163
Configurable<bool> useMftPtCut{"useMftPtCut", true, "Choose to apply MFT track pT cut"};
160164
Configurable<int> cfgMftCluster{"cfgMftCluster", 5, "cut on MFT Cluster"};
@@ -168,6 +172,7 @@ struct LongrangeMaker {
168172
} cfgmfttrksel;
169173

170174
struct : ConfigurableGroup {
175+
std::string prefix = "FitTrackSelection_group";
171176
Configurable<float> cfgFt0aEtaMax{"cfgFt0aEtaMax", 4.9f, "Maximum FT0A eta cut"};
172177
Configurable<float> cfgFt0aEtaMin{"cfgFt0aEtaMin", 3.5f, "Minimum FT0A eta cut"};
173178
Configurable<float> cfgFt0cEtaMax{"cfgFt0cEtaMax", -2.1f, "Maximum FT0C eta cut"};
@@ -180,6 +185,7 @@ struct LongrangeMaker {
180185
} cfgfittrksel;
181186

182187
struct : ConfigurableGroup {
188+
std::string prefix = "V0TrackSelection_group";
183189
Configurable<float> minTPCcrossedrows{"minTPCcrossedrows", 70.f, "cut on minimum number of crossed rows in TPC"};
184190
Configurable<float> minTPCcrossedrowsoverfindcls{"minTPCcrossedrowsoverfindcls", 0.8f, "cut on minimum value of the ratio between crossed rows and findable clusters in the TPC"};
185191
Configurable<float> v0etaCut{"v0etaCut", 0.8f, "maximum v0 track pseudorapidity"};
@@ -207,6 +213,7 @@ struct LongrangeMaker {
207213
} cfgv0trksel;
208214

209215
struct : ConfigurableGroup {
216+
std::string prefix = "ConfigAxis_group";
210217
ConfigurableAxis axisAmplitude{"axisAmplitude", {5000, 0, 10000}, "FT0 amplitude"};
211218
ConfigurableAxis axisChannel{"axisChannel", {208, 0, 208}, "FT0 channel"};
212219
ConfigurableAxis axisMFTAmbDegree{"axisMFTAmbDegree", {50, -0.5, 49.5}, "Track Ambiguity axis"};
@@ -775,7 +782,7 @@ struct LongrangeMaker {
775782
{
776783
auto multiplicity = 0;
777784
for (const auto& particle : mcparticles) {
778-
if (!isGenPartSelected(particle) || std::abs(particle.eta()) > cfgtrksel.cfgEtaCut || particle.pt() < cfgtrksel.cfgPtCutMin || particle.pt() > cfgtrksel.cfgPtCutMult)
785+
if (!isGenPartSelected(particle) || std::abs(particle.eta()) > cfgtrksel.cfgEtaCut || particle.pt() < cfgtrksel.cfgPtCutMinForMult || particle.pt() > cfgtrksel.cfgPtCutMaxForMult)
779786
continue;
780787
multiplicity++;
781788
}
@@ -967,7 +974,7 @@ struct LongrangeMaker {
967974
for (const auto& particle : mcparticles) {
968975
if (!isGenPartSelected(particle))
969976
continue;
970-
if (std::abs(particle.eta()) < cfgtrksel.cfgEtaCut && particle.pt() > cfgtrksel.cfgPtCutMin && particle.pt() < cfgtrksel.cfgPtCutMult)
977+
if (std::abs(particle.eta()) < cfgtrksel.cfgEtaCut && particle.pt() > cfgtrksel.cfgPtCutMinForMult && particle.pt() < cfgtrksel.cfgPtCutMaxForMult)
971978
multiplicity++;
972979
if (cfgfittrksel.cfgFt0cEtaMin < particle.eta() && particle.eta() < cfgfittrksel.cfgFt0cEtaMax)
973980
multMCFT0C++;
@@ -1085,7 +1092,7 @@ struct LongrangeMaker {
10851092
continue;
10861093
if (!myTrackFilter.IsSelected(track))
10871094
continue;
1088-
if (track.pt() < cfgtrksel.cfgPtCutMin || track.pt() > cfgtrksel.cfgPtCutMult) {
1095+
if (track.pt() < cfgtrksel.cfgPtCutMinForMult || track.pt() > cfgtrksel.cfgPtCutMaxForMult) {
10891096
continue;
10901097
}
10911098
float trkeff = 1.0f;

‎PWGEM/Dilepton/Core/Dilepton.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,6 @@ using MyElectron = MyElectrons::iterator;
9494
using FilteredMyElectrons = o2::soa::Filtered<MyElectrons>;
9595
using FilteredMyElectron = FilteredMyElectrons::iterator;
9696

97-
using MyElectronsSCT = o2::soa::Join<o2::aod::EMPrimaryElectrons, o2::aod::EMPrimaryElectronEMEventIds, o2::aod::EMAmbiguousElectronSelfIds, o2::aod::EMPrimaryElectronsPrefilterBit, o2::aod::EMPrimaryElectronsPrefilterBitDerived, o2::aod::EMPrimaryElectronsBDTSCT>;
98-
using MyElectronSCT = MyElectronsSCT::iterator;
99-
using FilteredMyElectronsSCT = o2::soa::Filtered<MyElectronsSCT>;
100-
using FilteredMyElectronSCT = FilteredMyElectronsSCT::iterator;
101-
10297
using MyMuons = o2::soa::Join<o2::aod::EMPrimaryMuons, o2::aod::EMPrimaryMuonEMEventIds, o2::aod::EMAmbiguousMuonSelfIds, o2::aod::EMGlobalMuonSelfIds, o2::aod::EMPrimaryMuonsPrefilterBitDerived>;
10398
using MyMuon = MyMuons::iterator;
10499
using FilteredMyMuons = o2::soa::Filtered<MyMuons>;

0 commit comments

Comments
 (0)