Skip to content

Commit a7c9421

Browse files
zhangbiao-phyzhangbiao-phy
committed
fix comments from vit
1 parent 1b7ce84 commit a7c9421

File tree

5 files changed

+45
-29
lines changed

5 files changed

+45
-29
lines changed

‎PWGHF/DataModel/CandidateReconstructionTables.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
namespace o2::aod
4040
{
4141
// Table aliases
42-
using BCFullInfos = soa::Join<aod::BCsWithTimestamps, aod::BcSels, aod::Run3MatchedToBCSparse>;
42+
using BcFullInfos = soa::Join<aod::BCsWithTimestamps, aod::BcSels, aod::Run3MatchedToBCSparse>;
4343

4444
using TracksWCov = soa::Join<Tracks, TracksCov>;
4545
using TracksWDca = soa::Join<Tracks, TracksDCA>;

‎PWGHF/TableProducer/candidateCreator2Prong.cxx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ struct HfCandidateCreator2Prong {
124124

125125
std::array<bool, 4> processesCollisions = {doprocessCollisions, doprocessCollisionsCentFT0C, doprocessCollisionsCentFT0M, doprocessCollisionsUpc};
126126
const int nProcessesCollisions = std::accumulate(processesCollisions.begin(), processesCollisions.end(), 0);
127-
std::array<bool, 5> processesCollisionsUpc = {doprocessPvRefitWithDCAFitterNUpc, doprocessNoPvRefitWithDCAFitterNUpc, doprocessPvRefitWithKFParticleUpc, doprocessNoPvRefitWithKFParticleUpc, doprocessCollisionsUpc};
128-
const int nProcessesCollisionsUpc = std::accumulate(processesCollisionsUpc.begin(), processesCollisionsUpc.end(), 0);
127+
std::array<bool, 5> processesUpc = {doprocessPvRefitWithDCAFitterNUpc, doprocessNoPvRefitWithDCAFitterNUpc, doprocessPvRefitWithKFParticleUpc, doprocessNoPvRefitWithKFParticleUpc, doprocessCollisionsUpc};
128+
const int nprocessesUpc = std::accumulate(processesUpc.begin(), processesUpc.end(), 0);
129129
if (nProcessesCollisions > 1) {
130130
LOGP(fatal, "At most one process function for collision monitoring can be enabled at a time.");
131131
}
@@ -140,7 +140,7 @@ struct HfCandidateCreator2Prong {
140140
LOGP(fatal, "Process function for collision monitoring not correctly enabled. Did you enable \"processCollisionsCentFT0M\"?");
141141
}
142142
}
143-
if (nProcessesCollisionsUpc > 0 && isRun2) {
143+
if (nprocessesUpc > 0 && isRun2) {
144144
LOGP(fatal, "Process function for UPC is only available in Run 3!");
145145
}
146146

@@ -648,7 +648,7 @@ struct HfCandidateCreator2Prong {
648648
void processPvRefitWithDCAFitterNUpc(soa::Join<aod::Collisions, aod::EvSels> const& collisions,
649649
soa::Join<aod::Hf2Prongs, aod::HfPvRefit2Prong> const& rowsTrackIndexProng2,
650650
TracksWCovExtraPidPiKa const& tracks,
651-
aod::BCFullInfos const& bcWithTimeStamps,
651+
aod::BcFullInfos const& bcWithTimeStamps,
652652
aod::FT0s const& /*ft0s*/,
653653
aod::FV0As const& /*fv0as*/,
654654
aod::FDDs const& /*fdds*/,
@@ -662,7 +662,7 @@ struct HfCandidateCreator2Prong {
662662
void processNoPvRefitWithDCAFitterNUpc(soa::Join<aod::Collisions, aod::EvSels> const& collisions,
663663
aod::Hf2Prongs const& rowsTrackIndexProng2,
664664
TracksWCovExtraPidPiKa const& tracks,
665-
aod::BCFullInfos const& bcWithTimeStamps,
665+
aod::BcFullInfos const& bcWithTimeStamps,
666666
aod::FT0s const& /*ft0s*/,
667667
aod::FV0As const& /*fv0as*/,
668668
aod::FDDs const& /*fdds*/,
@@ -676,7 +676,7 @@ struct HfCandidateCreator2Prong {
676676
void processPvRefitWithKFParticleUpc(soa::Join<aod::Collisions, aod::EvSels> const& collisions,
677677
soa::Join<aod::Hf2Prongs, aod::HfPvRefit2Prong> const& rowsTrackIndexProng2,
678678
TracksWCovExtraPidPiKa const& tracks,
679-
aod::BCFullInfos const& bcWithTimeStamps,
679+
aod::BcFullInfos const& bcWithTimeStamps,
680680
aod::FT0s const& /*ft0s*/,
681681
aod::FV0As const& /*fv0as*/,
682682
aod::FDDs const& /*fdds*/,
@@ -690,7 +690,7 @@ struct HfCandidateCreator2Prong {
690690
void processNoPvRefitWithKFParticleUpc(soa::Join<aod::Collisions, aod::EvSels> const& collisions,
691691
aod::Hf2Prongs const& rowsTrackIndexProng2,
692692
TracksWCovExtraPidPiKa const& tracks,
693-
aod::BCFullInfos const& bcWithTimeStamps,
693+
aod::BcFullInfos const& bcWithTimeStamps,
694694
aod::FT0s const& /*ft0s*/,
695695
aod::FV0As const& /*fv0as*/,
696696
aod::FDDs const& /*fdds*/,
@@ -762,7 +762,7 @@ struct HfCandidateCreator2Prong {
762762

763763
/// @brief process function to monitor collisions - UPC collision
764764
void processCollisionsUpc(soa::Join<aod::Collisions, aod::EvSels> const& collisions,
765-
aod::BCFullInfos const& bcs,
765+
aod::BcFullInfos const& bcs,
766766
aod::FT0s const& /*ft0s*/,
767767
aod::FV0As const& /*fv0as*/,
768768
aod::FDDs const& /*fdds*/,
@@ -774,7 +774,7 @@ struct HfCandidateCreator2Prong {
774774
/// bitmask with event. selection info
775775
float centrality{-1.f};
776776
float occupancy = getOccupancyColl(collision, OccupancyEstimator::Its);
777-
const auto rejectionMask = hfEvSel.getHfCollisionRejectionMaskWithUpc<true, CentralityEstimator::None, aod::BCFullInfos>(collision, centrality, ccdb, registry, bcs);
777+
const auto rejectionMask = hfEvSel.getHfCollisionRejectionMaskWithUpc<true, CentralityEstimator::None, aod::BcFullInfos>(collision, centrality, ccdb, registry, bcs);
778778

779779
/// monitor the satisfied event selections
780780
hfEvSel.fillHistograms(collision, rejectionMask, centrality, occupancy);

‎PWGHF/TableProducer/candidateCreator3Prong.cxx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ struct HfCandidateCreator3Prong {
148148
std::array<bool, 4> processesCollisions = {doprocessCollisions, doprocessCollisionsCentFT0C, doprocessCollisionsCentFT0M, doprocessCollisionsUpc};
149149
const int nProcessesCollisions = std::accumulate(processesCollisions.begin(), processesCollisions.end(), 0);
150150

151-
std::array<bool, 5> processesCollisionsUpc = {doprocessPvRefitWithDCAFitterNUpc, doprocessNoPvRefitWithDCAFitterNUpc, doprocessPvRefitWithKFParticleUpc, doprocessNoPvRefitWithKFParticleUpc, doprocessCollisionsUpc};
152-
const int nProcessesCollisionsUpc = std::accumulate(processesCollisionsUpc.begin(), processesCollisionsUpc.end(), 0);
151+
std::array<bool, 5> processesUpc = {doprocessPvRefitWithDCAFitterNUpc, doprocessNoPvRefitWithDCAFitterNUpc, doprocessPvRefitWithKFParticleUpc, doprocessNoPvRefitWithKFParticleUpc, doprocessCollisionsUpc};
152+
const int nprocessesUpc = std::accumulate(processesUpc.begin(), processesUpc.end(), 0);
153153

154154
if (nProcessesCollisions > 1) {
155155
LOGP(fatal, "At most one process function for collision monitoring can be enabled at a time.");
@@ -165,7 +165,7 @@ struct HfCandidateCreator3Prong {
165165
LOGP(fatal, "Process function for collision monitoring not correctly enabled. Did you enable \"processCollisionsCentFT0M\"?");
166166
}
167167
}
168-
if (nProcessesCollisionsUpc > 0 && isRun2) {
168+
if (nprocessesUpc > 0 && isRun2) {
169169
LOGP(fatal, "Process function for UPC is only available in Run 3!");
170170
}
171171
std::array<bool, 4> creationFlags = {createDplus, createDs, createLc, createXic};
@@ -805,7 +805,7 @@ struct HfCandidateCreator3Prong {
805805
void processPvRefitWithDCAFitterNUpc(soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Ms> const& collisions,
806806
FilteredPvRefitHf3Prongs const& rowsTrackIndexProng3,
807807
TracksWCovExtraPidPiKaPr const& tracks,
808-
aod::BCFullInfos const& bcWithTimeStamps,
808+
aod::BcFullInfos const& bcWithTimeStamps,
809809
aod::FT0s const& /*ft0s*/,
810810
aod::FV0As const& /*fv0as*/,
811811
aod::FDDs const& /*fdds*/,
@@ -819,7 +819,7 @@ struct HfCandidateCreator3Prong {
819819
void processNoPvRefitWithDCAFitterNUpc(soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Ms> const& collisions,
820820
FilteredHf3Prongs const& rowsTrackIndexProng3,
821821
TracksWCovExtraPidPiKaPr const& tracks,
822-
aod::BCFullInfos const& bcWithTimeStamps,
822+
aod::BcFullInfos const& bcWithTimeStamps,
823823
aod::FT0s const& /*ft0s*/,
824824
aod::FV0As const& /*fv0as*/,
825825
aod::FDDs const& /*fdds*/,
@@ -833,7 +833,7 @@ struct HfCandidateCreator3Prong {
833833
void processPvRefitWithKFParticleUpc(soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Ms> const& collisions,
834834
FilteredPvRefitHf3Prongs const& rowsTrackIndexProng3,
835835
TracksWCovExtraPidPiKaPr const& tracks,
836-
aod::BCFullInfos const& bcWithTimeStamps,
836+
aod::BcFullInfos const& bcWithTimeStamps,
837837
aod::FT0s const& /*ft0s*/,
838838
aod::FV0As const& /*fv0as*/,
839839
aod::FDDs const& /*fdds*/,
@@ -847,7 +847,7 @@ struct HfCandidateCreator3Prong {
847847
void processNoPvRefitWithKFParticleUpc(soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Ms> const& collisions,
848848
FilteredHf3Prongs const& rowsTrackIndexProng3,
849849
TracksWCovExtraPidPiKaPr const& tracks,
850-
aod::BCFullInfos const& bcWithTimeStamps,
850+
aod::BcFullInfos const& bcWithTimeStamps,
851851
aod::FT0s const& /*ft0s*/,
852852
aod::FV0As const& /*fv0as*/,
853853
aod::FDDs const& /*fdds*/,
@@ -919,7 +919,7 @@ struct HfCandidateCreator3Prong {
919919

920920
/// @brief process function to monitor collisions - UPC
921921
void processCollisionsUpc(soa::Join<aod::Collisions, aod::EvSels> const& collisions,
922-
aod::BCFullInfos const& bcs,
922+
aod::BcFullInfos const& bcs,
923923
aod::FT0s const& /*ft0s*/,
924924
aod::FV0As const& /*fv0as*/,
925925
aod::FDDs const& /*fdds*/,
@@ -931,7 +931,7 @@ struct HfCandidateCreator3Prong {
931931
/// bitmask with event. selection info
932932
float centrality{-1.f};
933933
float occupancy = getOccupancyColl(collision, OccupancyEstimator::Its);
934-
const auto rejectionMask = hfEvSel.getHfCollisionRejectionMaskWithUpc<true, CentralityEstimator::None, aod::BCFullInfos>(collision, centrality, ccdb, registry, bcs);
934+
const auto rejectionMask = hfEvSel.getHfCollisionRejectionMaskWithUpc<true, CentralityEstimator::None, aod::BcFullInfos>(collision, centrality, ccdb, registry, bcs);
935935

936936
/// monitor the satisfied event selections
937937
hfEvSel.fillHistograms(collision, rejectionMask, centrality, occupancy);

‎PWGHF/TableProducer/trackIndexSkimCreator.cxx‎

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -163,54 +163,70 @@ struct HfTrackIndexSkimCreatorTagSelCollisions {
163163
}
164164

165165
/// Event selection with trigger and FT0A centrality selection
166-
void
167-
processTrigAndCentFT0ASel(soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0As>::iterator const& collision, aod::BCFullInfos const& bcs)
166+
void processTrigAndCentFT0ASel(soa::Join<aod::Collisions,
167+
aod::EvSels, aod::CentFT0As>::iterator const& collision,
168+
aod::BcFullInfos const& bcs)
168169
{
169170
selectCollision<true, false, CentralityEstimator::FT0A>(collision, bcs);
170171
}
171172
PROCESS_SWITCH(HfTrackIndexSkimCreatorTagSelCollisions, processTrigAndCentFT0ASel, "Use trigger and centrality selection with FT0A", false);
172173

173174
/// Event selection with trigger and FT0C centrality selection
174-
void processTrigAndCentFT0CSel(soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Cs>::iterator const& collision, aod::BCFullInfos const& bcs)
175+
void processTrigAndCentFT0CSel(soa::Join<aod::Collisions,
176+
aod::EvSels, aod::CentFT0Cs>::iterator const& collision,
177+
aod::BcFullInfos const& bcs)
175178
{
176179
selectCollision<true, false, CentralityEstimator::FT0C>(collision, bcs);
177180
}
178181
PROCESS_SWITCH(HfTrackIndexSkimCreatorTagSelCollisions, processTrigAndCentFT0CSel, "Use trigger and centrality selection with FT0C", false);
179182

180183
/// Event selection with trigger and FT0M centrality selection
181-
void processTrigAndCentFT0MSel(soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Ms>::iterator const& collision, aod::BCFullInfos const& bcs)
184+
void processTrigAndCentFT0MSel(soa::Join<aod::Collisions,
185+
aod::EvSels, aod::CentFT0Ms>::iterator const& collision,
186+
aod::BcFullInfos const& bcs)
182187
{
183188
selectCollision<true, false, CentralityEstimator::FT0M>(collision, bcs);
184189
}
185190
PROCESS_SWITCH(HfTrackIndexSkimCreatorTagSelCollisions, processTrigAndCentFT0MSel, "Use trigger and centrality selection with FT0M", false);
186191

187192
/// Event selection with trigger and FV0A centrality selection
188-
void processTrigAndCentFV0ASel(soa::Join<aod::Collisions, aod::EvSels, aod::CentFV0As>::iterator const& collision, aod::BCFullInfos const& bcs)
193+
void processTrigAndCentFV0ASel(soa::Join<aod::Collisions,
194+
aod::EvSels, aod::CentFV0As>::iterator const& collision,
195+
aod::BcFullInfos const& bcs)
189196
{
190197
selectCollision<true, false, CentralityEstimator::FV0A>(collision, bcs);
191198
}
192199
PROCESS_SWITCH(HfTrackIndexSkimCreatorTagSelCollisions, processTrigAndCentFV0ASel, "Use trigger and centrality selection with FV0A", false);
193200

194201
/// Event selection with trigger selection
195-
void processTrigSel(soa::Join<aod::Collisions, aod::EvSels>::iterator const& collision, aod::BCFullInfos const& bcs)
202+
void processTrigSel(soa::Join<aod::Collisions,
203+
aod::EvSels>::iterator const& collision,
204+
aod::BcFullInfos const& bcs)
196205
{
197206
selectCollision<true, false, CentralityEstimator::None>(collision, bcs);
198207
}
199208
PROCESS_SWITCH(HfTrackIndexSkimCreatorTagSelCollisions, processTrigSel, "Use trigger selection", false);
200209

201210
/// Event selection without trigger selection
202-
void processNoTrigSel(aod::Collision const& collision, aod::BCFullInfos const& bcs)
211+
void processNoTrigSel(aod::Collision const& collision,
212+
aod::BcFullInfos const& bcs)
203213
{
204214
selectCollision<false, false, CentralityEstimator::None>(collision, bcs);
205215
}
206216
PROCESS_SWITCH(HfTrackIndexSkimCreatorTagSelCollisions, processNoTrigSel, "Do not use trigger selection", true);
207217

208218
/// Event selection with UPC
209-
void processUpcSel(soa::Join<aod::Collisions, aod::EvSels>::iterator const& collision, aod::BCFullInfos const& bcs, aod::FT0s const& /*ft0s*/, aod::FV0As const& /*fv0as*/, aod::FDDs const& /*fdds*/, aod::Zdcs const& /*zdcs*/)
219+
void processUpcSel(soa::Join<aod::Collisions,
220+
aod::EvSels>::iterator const& collision,
221+
aod::BcFullInfos const& bcs,
222+
aod::FT0s const& /*ft0s*/,
223+
aod::FV0As const& /*fv0as*/,
224+
aod::FDDs const& /*fdds*/,
225+
aod::Zdcs const& /*zdcs*/)
210226
{
211227
selectCollision<true, true, CentralityEstimator::None>(collision, bcs);
212228
}
213-
PROCESS_SWITCH(HfTrackIndexSkimCreatorTagSelCollisions, processUpcSel, "Use upc selection", false);
229+
PROCESS_SWITCH(HfTrackIndexSkimCreatorTagSelCollisions, processUpcSel, "Use UPC event selection", false);
214230
};
215231

216232
/// Track selection

‎PWGHF/Utils/utilsEvSelHf.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ struct HfEventSelection : o2::framework::ConfigurableGroup {
228228
hPosYAfterEvSel = registry.add<TH1>(NameHistPosYAfterEvSel, "selected events;#it{y}_{prim. vtx.} (cm);entries", {o2::framework::HistType::kTH1D, {{200, -0.5, 0.5}}});
229229
hNumPvContributorsAfterSel = registry.add<TH1>(NameHistNumPvContributorsAfterSel, "selected events;#it{y}_{prim. vtx.} (cm);entries", {o2::framework::HistType::kTH1D, {{500, -0.5, 499.5}}});
230230
setEventRejectionLabels(hCollisions, softwareTrigger);
231-
hUpCollisions = registry.add<TH1>(NameHistUpCollisions, "HF upc counter;;# of upc events", {o2::framework::HistType::kTH1D, {axisUpcEvents}});
231+
hUpCollisions = registry.add<TH1>(NameHistUpCollisions, "HF UPC counter;;# of UPC events", {o2::framework::HistType::kTH1D, {axisUpcEvents}});
232232
const o2::framework::AxisSpec th2AxisCent{th2ConfigAxisCent, "Centrality"};
233233
const o2::framework::AxisSpec th2AxisOccupancy{th2ConfigAxisOccupancy, "Occupancy"};
234234
hCollisionsCentOcc = registry.add<TH2>(NameHistCollisionsCentOcc, "selected events;Centrality; Occupancy", {o2::framework::HistType::kTH2D, {th2AxisCent, th2AxisOccupancy}});

0 commit comments

Comments
 (0)