Skip to content

Commit 412d07b

Browse files
sarjeetagamisarjeeta gami
sarjeetagami
and
sarjeeta gami
authored
[PWGLF] bug fix in phi analysis (#16145)
Co-authored-by: sarjeeta gami <sarjeetagami@sarjeetas-MacBook-Air-217.local>
1 parent 34c1bc0 commit 412d07b

2 files changed

Lines changed: 29 additions & 28 deletions

File tree

‎PWGLF/Tasks/Resonances/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ o2physics_add_dpl_workflow(phipbpb
135135
COMPONENT_NAME Analysis)
136136

137137
o2physics_add_dpl_workflow(phianalysisrun3pbpb
138-
SOURCES phianalysisrun3_PbPb.cxx
138+
SOURCES phianalysisrun3pbpb.cxx
139139
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
140140
COMPONENT_NAME Analysis)
141141

PWGLF/Tasks/Resonances/phianalysisrun3_PbPb.cxx renamed to PWGLF/Tasks/Resonances/phianalysisrun3pbpb.cxx

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
// In applying this license CERN does not waive the privileges and immunities
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
11-
/// \file phianalysisrun3_PbPb.cxx
11+
12+
/// \file phianalysisrun3pbpb.cxx
1213
/// \brief Code for phi resonance without resonance initializer
1314
/// \author Sarjeeta Gami
1415

@@ -55,7 +56,7 @@ using namespace o2::framework::expressions;
5556
using std::array;
5657
using namespace o2::aod::rctsel;
5758

58-
struct phianalysisrun3_PbPb {
59+
struct Phianalysisrun3pbpb {
5960
struct : ConfigurableGroup {
6061
Configurable<bool> requireRCTFlagChecker{"requireRCTFlagChecker", true, "Check event quality in run condition table"};
6162
Configurable<std::string> cfgEvtRCTFlagCheckerLabel{"cfgEvtRCTFlagCheckerLabel", "CBT_hadronPID", "Evt sel: RCT flag checker label"};
@@ -124,7 +125,7 @@ struct phianalysisrun3_PbPb {
124125
Configurable<int> centestimator{"centestimator", 0, "Select multiplicity estimator: 0 - FT0C, 1 - FT0A, 2 - FT0M, 3 - FV0A, 4 - PVTracks"};
125126
ConfigurableAxis binsMult{"binsMult", {500, 0.0f, +500.0f}, ""};
126127
Configurable<bool> isApplyCentFT0C{"isApplyCentFT0C", true, "Centrality based on FT0C"};
127-
Configurable<bool> isApplyCentFT0M{"isApplyCentFV0M", false, "Centrality based on FT0M"};
128+
Configurable<bool> isApplyCentFT0M{"isApplyCentFT0M", false, "Centrality based on FT0M"};
128129
Configurable<bool> isApplyInelgt0{"isApplyInelgt0", false, "Enable INEL > 0 condition"};
129130
Configurable<bool> isApplyTVX{"isApplyTVX", false, "Enable TVX trigger sel"};
130131
Configurable<bool> genacceptancecut{"genacceptancecut", true, "use acceptance cut for generated"};
@@ -349,11 +350,11 @@ struct phianalysisrun3_PbPb {
349350
return false;
350351

351352
} else if (pid == 1) {
352-
constexpr double kPtThresholdForTOF = 0.5;
353-
if (candidate.pt() < kPtThresholdForTOF && std::abs(candidate.tpcNSigmaKa()) < selectionConfig.nsigmacutTPC) {
353+
constexpr double PtThresholdForTOF = 0.5;
354+
if (candidate.pt() < PtThresholdForTOF && std::abs(candidate.tpcNSigmaKa()) < selectionConfig.nsigmacutTPC) {
354355
return true;
355356
}
356-
if (candidate.pt() >= kPtThresholdForTOF && candidate.hasTOF() && candidate.beta() > cfgCutTOFBeta &&
357+
if (candidate.pt() >= PtThresholdForTOF && candidate.hasTOF() && candidate.beta() > cfgCutTOFBeta &&
357358
std::abs(candidate.tpcNSigmaKa()) < selectionConfig.nsigmacutTPC && std::abs(candidate.tofNSigmaKa()) < selectionConfig.nsigmacutTOF) {
358359
return true;
359360
}
@@ -461,10 +462,10 @@ struct phianalysisrun3_PbPb {
461462
candidate1.pz() + candidate2.pz()},
462463
mass);
463464

464-
constexpr int kOppositeCharge = 0;
465+
constexpr int OppositeCharge = 0;
465466

466467
// default filling
467-
if (rapidity > rapiditycut1 && rapidity < rapiditycut2 && track1Sign * track2Sign < kOppositeCharge) {
468+
if (rapidity > rapiditycut1 && rapidity < rapiditycut2 && track1Sign * track2Sign < OppositeCharge) {
468469
if (unlike) {
469470
histos.fill(HIST("h3PhiInvMassUnlikeSign"), multiplicity, pT, mass);
470471
histos.fill(HIST("h2PhiRapidity"), pT, rapidity);
@@ -664,7 +665,7 @@ struct phianalysisrun3_PbPb {
664665
}
665666
}
666667

667-
PROCESS_SWITCH(phianalysisrun3_PbPb, processSameEvent, "Process Same event", false);
668+
PROCESS_SWITCH(Phianalysisrun3pbpb, processSameEvent, "Process Same event", false);
668669
void processMixedEvent1(EventCandidates const& collisions, TrackCandidates const& tracks)
669670
{
670671
auto tracksTuple = std::make_tuple(tracks);
@@ -740,7 +741,7 @@ struct phianalysisrun3_PbPb {
740741
}
741742
}
742743
}
743-
PROCESS_SWITCH(phianalysisrun3_PbPb, processMixedEvent1, "Process Mixed event", false);
744+
PROCESS_SWITCH(Phianalysisrun3pbpb, processMixedEvent1, "Process Mixed event", false);
744745
void processMixedEvent2(EventCandidates const& collisions, TrackCandidates const& tracks)
745746
{
746747
auto tracksTuple = std::make_tuple(tracks);
@@ -817,7 +818,7 @@ struct phianalysisrun3_PbPb {
817818
}
818819
}
819820

820-
PROCESS_SWITCH(phianalysisrun3_PbPb, processMixedEvent2, "Process Mixed event", false);
821+
PROCESS_SWITCH(Phianalysisrun3pbpb, processMixedEvent2, "Process Mixed event", false);
821822
void processMixedEvent3(EventCandidates const& collisions, TrackCandidates const& tracks)
822823
{
823824
auto tracksTuple = std::make_tuple(tracks);
@@ -894,7 +895,7 @@ struct phianalysisrun3_PbPb {
894895
}
895896
}
896897

897-
PROCESS_SWITCH(phianalysisrun3_PbPb, processMixedEvent3, "Process Mixed event", false);
898+
PROCESS_SWITCH(Phianalysisrun3pbpb, processMixedEvent3, "Process Mixed event", false);
898899
void processMixedEvent4(EventCandidates const& collisions, TrackCandidates const& tracks)
899900
{
900901
auto tracksTuple = std::make_tuple(tracks);
@@ -971,7 +972,7 @@ struct phianalysisrun3_PbPb {
971972
}
972973
}
973974

974-
PROCESS_SWITCH(phianalysisrun3_PbPb, processMixedEvent4, "Process Mixed event", false);
975+
PROCESS_SWITCH(Phianalysisrun3pbpb, processMixedEvent4, "Process Mixed event", false);
975976
void processRotEvent(EventCandidates::iterator const& collision, TrackCandidates const& tracks, aod::BCs const&)
976977
{
977978
if (!collision.sel8()) {
@@ -1057,7 +1058,7 @@ struct phianalysisrun3_PbPb {
10571058
}
10581059
}
10591060

1060-
PROCESS_SWITCH(phianalysisrun3_PbPb, processRotEvent, "Process Rot event", false);
1061+
PROCESS_SWITCH(Phianalysisrun3pbpb, processRotEvent, "Process Rot event", false);
10611062
void processMC(CollisionMCTrueTable::iterator const& /*TrueCollision*/, CollisionMCRecTableCentFT0C const& RecCollisions, TrackMCTrueTable const& GenParticles, FilTrackMCRecTable const& RecTracks)
10621063
{
10631064
histos.fill(HIST("hMC"), 0);
@@ -1270,7 +1271,7 @@ struct phianalysisrun3_PbPb {
12701271
} // rec collision loop
12711272

12721273
} // process MC
1273-
PROCESS_SWITCH(phianalysisrun3_PbPb, processMC, "Process Reconstructed", false);
1274+
PROCESS_SWITCH(Phianalysisrun3pbpb, processMC, "Process Reconstructed", false);
12741275
void processGen(aod::McCollision const& mcCollision, aod::McParticles const& mcParticles, const soa::SmallGroups<EventCandidatesMC>& collisions)
12751276
{
12761277

@@ -1358,7 +1359,7 @@ struct phianalysisrun3_PbPb {
13581359
}
13591360
}
13601361
}
1361-
PROCESS_SWITCH(phianalysisrun3_PbPb, processGen, "Process Generated", false);
1362+
PROCESS_SWITCH(Phianalysisrun3pbpb, processGen, "Process Generated", false);
13621363
void processRec(EventCandidatesMC::iterator const& collision, TrackCandidatesMC const& tracks, aod::McParticles const& /*mcParticles*/, aod::McCollisions const& /*mcCollisions*/)
13631364
{
13641365
if (!collision.has_mcCollision()) {
@@ -1487,7 +1488,7 @@ struct phianalysisrun3_PbPb {
14871488
}
14881489
}
14891490

1490-
PROCESS_SWITCH(phianalysisrun3_PbPb, processRec, "Process Reconstructed", false);
1491+
PROCESS_SWITCH(Phianalysisrun3pbpb, processRec, "Process Reconstructed", false);
14911492
void processSameEventMC(EventCandidatesMC::iterator const& collision, TrackCandidatesMC const& tracks, aod::McParticles const& /*mcParticles*/, aod::McCollisions const& /*mcCollisions*/)
14921493
{
14931494
if (!collision.sel8()) {
@@ -1599,7 +1600,7 @@ struct phianalysisrun3_PbPb {
15991600
}
16001601
}
16011602

1602-
PROCESS_SWITCH(phianalysisrun3_PbPb, processSameEventMC, "Process Same event", false);
1603+
PROCESS_SWITCH(Phianalysisrun3pbpb, processSameEventMC, "Process Same event", false);
16031604
void processMixedEventMC(EventCandidatesMC const& recCollisions, TrackCandidatesMC const& RecTracks, aod::McParticles const&)
16041605
{
16051606

@@ -1684,7 +1685,7 @@ struct phianalysisrun3_PbPb {
16841685
}
16851686
}
16861687
}
1687-
PROCESS_SWITCH(phianalysisrun3_PbPb, processMixedEventMC, "Process Mixed event MC", true);
1688+
PROCESS_SWITCH(Phianalysisrun3pbpb, processMixedEventMC, "Process Mixed event MC", true);
16881689
void processGen1(McCollisionMults::iterator const& mcCollision, aod::McParticles const& mcParticles, const soa::SmallGroups<EventCandidatesMC>& collisions)
16891690
{
16901691
// all events
@@ -1771,7 +1772,7 @@ struct phianalysisrun3_PbPb {
17711772
multiplicity = collision.centFV0A();
17721773
}
17731774
histos.fill(HIST("Centgen1"), multiplicity);
1774-
selectedEvents[nevts++] = collision.mcCollision_as<aod::McCollisions>().globalIndex();
1775+
selectedEvents[nevts++] = collision.mcCollision_as<McCollisionMults>().globalIndex();
17751776
}
17761777
selectedEvents.resize(nevts);
17771778
const auto evtReconstructedAndSelected = std::find(selectedEvents.begin(), selectedEvents.end(), mcCollision.globalIndex()) != selectedEvents.end();
@@ -1815,7 +1816,7 @@ struct phianalysisrun3_PbPb {
18151816
}
18161817
}
18171818

1818-
PROCESS_SWITCH(phianalysisrun3_PbPb, processGen1, "Process Generated", false);
1819+
PROCESS_SWITCH(Phianalysisrun3pbpb, processGen1, "Process Generated", false);
18191820
void processRec1(EventCandidatesMC::iterator const& collision, TrackCandidatesMC const& tracks, aod::McParticles const& /*mcParticles*/, aod::McCollisions const& /*mcCollisions*/)
18201821
{
18211822
if (!collision.has_mcCollision()) {
@@ -1964,7 +1965,7 @@ struct phianalysisrun3_PbPb {
19641965
}
19651966
}
19661967

1967-
PROCESS_SWITCH(phianalysisrun3_PbPb, processRec1, "Process Reconstructed", false);
1968+
PROCESS_SWITCH(Phianalysisrun3pbpb, processRec1, "Process Reconstructed", false);
19681969
void processEvtLossSigLossMC(McCollisionMults::iterator const& mcCollision, aod::McParticles const& mcParticles, const soa::SmallGroups<EventCandidatesMC>& recCollisions)
19691970
{
19701971

@@ -2040,7 +2041,7 @@ struct phianalysisrun3_PbPb {
20402041
}
20412042
} // end loop on gen particles
20422043
}
2043-
PROCESS_SWITCH(phianalysisrun3_PbPb, processEvtLossSigLossMC, "Process Signal Loss, Event Loss", false);
2044+
PROCESS_SWITCH(Phianalysisrun3pbpb, processEvtLossSigLossMC, "Process Signal Loss, Event Loss", false);
20442045
void processEvtLossSigLossMC1(McCollisionMults::iterator const& mcCollision, soa::SmallGroups<EventCandidatesMC> const& collisions, aod::McParticles const& GenParticles)
20452046
{
20462047
if (selectionConfig.cutvzgen &&
@@ -2092,8 +2093,8 @@ struct phianalysisrun3_PbPb {
20922093
continue;
20932094

20942095
auto daughters = particle.daughters_as<aod::McParticles>();
2095-
static constexpr int kPhiNDaughters = 2;
2096-
if (daughters.size() != kPhiNDaughters)
2096+
static constexpr int PhiNDaughters = 2;
2097+
if (daughters.size() != PhiNDaughters)
20972098
continue;
20982099

20992100
bool daup = false, daun = false;
@@ -2126,10 +2127,10 @@ struct phianalysisrun3_PbPb {
21262127
}
21272128
}
21282129
}
2129-
PROCESS_SWITCH(phianalysisrun3_PbPb, processEvtLossSigLossMC1, "Process Signal Loss, Event Loss", false);
2130+
PROCESS_SWITCH(Phianalysisrun3pbpb, processEvtLossSigLossMC1, "Process Signal Loss, Event Loss", false);
21302131
};
21312132
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
21322133
{
21332134
return WorkflowSpec{
2134-
adaptAnalysisTask<phianalysisrun3_PbPb>(cfgc, TaskName{"phianalysisrun3_PbPb"})};
2135+
adaptAnalysisTask<Phianalysisrun3pbpb>(cfgc)};
21352136
}

0 commit comments

Comments
 (0)