Skip to content

[PWGJE] Please consider the following formatting changes to #8728 #5

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

Merged
fjonasALICE merged 1 commit into from
Nov 29, 2024
Merged

[PWGJE] Please consider the following formatting changes to #8728 #5

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
2 changes: 1 addition & 1 deletion PWGJE/DataModel/GammaJetAnalysisTree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ DECLARE_SOA_COLUMN(LeadingTrackPt, leadingtrackpt, float);
DECLARE_SOA_COLUMN(PerpConeRho, perpconerho, float);
DECLARE_SOA_COLUMN(NConstituents, nConstituents, ushort);
} // namespace gjchjet
DECLARE_SOA_TABLE(GjChargedJets, "AOD", "GJCHJET", gjchjet::GjEventId, gjchjet::Pt, gjchjet::Eta, gjchjet::Phi, gjchjet::Radius, gjchjet::Energy, gjchjet::Mass, gjchjet::Area, gjchjet::LeadingTrackPt,gjchjet::PerpConeRho,gjchjet::NConstituents)
DECLARE_SOA_TABLE(GjChargedJets, "AOD", "GJCHJET", gjchjet::GjEventId, gjchjet::Pt, gjchjet::Eta, gjchjet::Phi, gjchjet::Radius, gjchjet::Energy, gjchjet::Mass, gjchjet::Area, gjchjet::LeadingTrackPt, gjchjet::PerpConeRho, gjchjet::NConstituents)
} // namespace o2::aod

#endif // PWGJE_DATAMODEL_GAMMAJETANALYSISTREE_H_
2 changes: 1 addition & 1 deletion PWGJE/TableProducer/emcalCorrectionTask.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ struct EmcalCorrectionTask {
mClusterLabels.clear();
mClusterFactories.reset();
// in preparation for future O2 changes
//mClusterFactories.setClusterizerSettings(mClusterDefinitions.at(iClusterizer).minCellEnergy, mClusterDefinitions.at(iClusterizer).timeMin, mClusterDefinitions.at(iClusterizer).timeMax, mClusterDefinitions.at(iClusterizer).recalcShowerShape5x5);
// mClusterFactories.setClusterizerSettings(mClusterDefinitions.at(iClusterizer).minCellEnergy, mClusterDefinitions.at(iClusterizer).timeMin, mClusterDefinitions.at(iClusterizer).timeMax, mClusterDefinitions.at(iClusterizer).recalcShowerShape5x5);
if (cellLabels) {
mClusterFactories.setContainer(*emcalClusters, cellsBC, *emcalClustersInputIndices, cellLabels);
} else {
Expand Down
10 changes: 6 additions & 4 deletions PWGJE/Tasks/gammaJetTreeProducer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ struct GammaJetTreeProducer {
const o2Axis energyAxis{100, 0, 100, "E (GeV)"};
const o2Axis m02Axis{100, 0, 3, "m02"};
const o2Axis etaAxis{100, -1, 1, "#eta"};
const o2Axis phiAxis{100, 0 , 2*TMath::Pi(), "#phi"};
const o2Axis phiAxis{100, 0, 2 * TMath::Pi(), "#phi"};
const o2Axis occupancyAxis{300, 0, 30000, "occupancy"};
mHistograms.add("clusterE", "Energy of cluster", o2HistType::kTH1F, {energyAxis});
mHistograms.add("trackPt", "pT of track", o2HistType::kTH1F, {ptAxis});
Expand Down Expand Up @@ -264,7 +264,8 @@ struct GammaJetTreeProducer {
{
// event selection
int32_t storedColIndex = getStoredColIndex(collision);
if (storedColIndex == -1) return;
if (storedColIndex == -1)
return;

// eventsTable(collision.multiplicity(), collision.centrality(), collision.rho(), collision.eventSel(), collision.trackOccupancyInTimeRange(), collision.alias_raw());
// collisionMapping[collision.globalIndex()] = eventsTable.lastIndex();
Expand Down Expand Up @@ -296,7 +297,7 @@ struct GammaJetTreeProducer {
auto emcTracksPerTrack = emctracks.sliceBy(EMCTrackPerTrack, track.globalIndex());
auto emcTrack = emcTracksPerTrack.iteratorAt(0);
// find closest track that still has E/p < trackMatchingEoverP
if (cluster.energy()/track.p() > trackMatchingEoverP) {
if (cluster.energy() / track.p() > trackMatchingEoverP) {
continue;
} else {
dEta = cluster.eta() - emcTrack.etaEmcal();
Expand All @@ -321,7 +322,8 @@ struct GammaJetTreeProducer {
{
// event selection
int32_t storedColIndex = getStoredColIndex(collision);
if (storedColIndex == -1) return;
if (storedColIndex == -1)
return;
float leadingTrackPt = 0;
ushort nconst = 0;
// loop over charged jets
Expand Down
Loading