Skip to content

[PWGEM] Please consider the following formatting changes to #15076 #3

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

Closed
alibuild wants to merge 1 commit into from
Closed

[PWGEM] Please consider the following formatting changes to #15076 #3

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
4 changes: 2 additions & 2 deletions PWGEM/PhotonMeson/Core/V0PhotonCandidate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ struct V0PhotonCandidate {
alpha = v0.alpha();
qt = v0.qtarm();
psipair = 999.f; // default if V0PhotonPhiVPsi table is not included
phiv = 999.f; // default if V0PhotonPhiVPsi table is not included
if constexpr( requires{ v0.psipair(); v0.phiv(); } ) {
phiv = 999.f; // default if V0PhotonPhiVPsi table is not included
if constexpr (requires { v0.psipair(); v0.phiv(); }) {
psipair = v0.psipair();
phiv = v0.phiv();
}
Expand Down
2 changes: 1 addition & 1 deletion PWGEM/PhotonMeson/Core/V0PhotonCut.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@
#include <cstdint>
#include <functional>
#include <set>
#include <span>
#include <string>
#include <utility>
#include <vector>
#include <span>

namespace o2::analysis
{
Expand Down
6 changes: 3 additions & 3 deletions PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ struct PhotonConversionBuilder {
return cospaRZ;
}

template <bool isMC, typename TTrack, typename TShiftedTrack>
template <bool isMC, typename TTrack, typename TShiftedTrack>
void fillTrackTable(TTrack const& track, TShiftedTrack const& shiftedtrack, const float dcaXY, const float dcaZ)
{
v0legs(track.collisionId(), track.globalIndex(), track.sign(),
Expand Down Expand Up @@ -609,9 +609,9 @@ struct PhotonConversionBuilder {
}
}
if (phiv == 999.f || psipair == 999.f) {
LOG(debug) << "Propagation failed for all radii ("<< propV0LegsRadius << ", 30, 10 cm). Using default values for phiv and psipair (999.f).";
LOG(debug) << "Propagation failed for all radii (" << propV0LegsRadius << ", 30, 10 cm). Using default values for phiv and psipair (999.f).";
}

KFPTrack kfp_track_pos = createKFPTrackFromTrackParCov(pTrack, pos.sign(), pos.tpcNClsFound(), pos.tpcChi2NCl());
KFPTrack kfp_track_ele = createKFPTrackFromTrackParCov(nTrack, ele.sign(), ele.tpcNClsFound(), ele.tpcChi2NCl());
KFParticle kfp_pos(kfp_track_pos, kPositron);
Expand Down
3 changes: 2 additions & 1 deletion PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMPCMML.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,5 @@
return WorkflowSpec{
adaptAnalysisTask<Pi0EtaToGammaGamma<PairType::kPCMPCM, MyV0Photons, aod::V0Legs>>(cfgc, TaskName{"pi0eta-to-gammagamma-pcmpcm"}),
};
}
}

Check failure on line 37 in PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMPCMML.cxx

View workflow job for this annotation

GitHub Actions / PR formatting / whitespace

Trailing spaces 

Remove the trailing spaces at the end of the line.
12 changes: 6 additions & 6 deletions PWGEM/PhotonMeson/Tasks/pcmQC.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ struct PCMQC {
fRegistry.add("V0/hKFChi2vsZ", "KF chi2 vs. conversion point in Z;Z (cm);KF chi2/NDF", kTH2F, {{200, -100.0f, 100.0f}, {100, 0.f, 100.0f}}, false);
fRegistry.add("V0/hsConvPoint", "photon conversion point;r_{xy} (cm);#varphi (rad.);#eta;", kTHnSparseF, {{100, 0.0f, 100}, {90, 0, o2::constants::math::TwoPI}, {80, -2, +2}}, false);
fRegistry.add("V0/hNgamma", "Number of #gamma candidates per collision", kTH1F, {{101, -0.5f, 100.5f}});

if (pcmcuts.cfg_apply_ml_cuts) {
if (pcmcuts.cfg_nclasses_ml == 2) {
fRegistry.add("V0/hBDTBackgroundScoreVsPt", "BDT background score vs pT; pT (GeV/c); BDT background score", {HistType::kTH2F, {{1000, 0.0f, 20.0f}, {1000, 0.0f, 1.0f}}});
Expand Down Expand Up @@ -281,7 +281,7 @@ struct PCMQC {
fRegistry.add("V0Leg/hPvsConvPointvsTPCNsigmaElvsEta_Pos", "momentum of pos leg vs. conversion point of V0 vs. TPC n sigma pos vs. eta of pos leg; p (GeV/c); r_{xy} (cm); n #sigma_{e}^{TPC}; #eta", kTHnSparseF, {{200, 0, 20}, {100, 0, 100}, {500, -5, 5}, {200, -1, +1}}, false);
fRegistry.add("V0Leg/hPvsConvPointvsTPCNsigmaElvsEta_Ele", "momentum of neg leg vs. conversion point of V0 vs. TPC n sigma el vs. eta of neg leg; p (GeV/c); r_{xy} (cm); n #sigma_{e}^{TPC}; #eta", kTHnSparseF, {{200, 0, 20}, {100, 0, 100}, {500, -5, 5}, {200, -1, +1}}, false);
}
// fRegistry.add("V0Leg/hXY", "X vs. Y;X (cm);Y (cm)", kTH2F, {{100, 0, 100}, {80, -20, 20}}, false);
// fRegistry.add("V0Leg/hXY", "X vs. Y;X (cm);Y (cm)", kTH2F, {{100, 0, 100}, {80, -20, 20}}, false);
// fRegistry.add("V0Leg/hZX", "Z vs. X;Z (cm);X (cm)", kTH2F, {{200, -100, 100}, {100, 0, 100}}, false);
// fRegistry.add("V0Leg/hZY", "Z vs. Y;Z (cm);Y (cm)", kTH2F, {{200, -100, 100}, {80, -20, 20}}, false);
}
Expand Down Expand Up @@ -429,9 +429,9 @@ struct PCMQC {
// BDT response histogram can be filled here when apply BDT is true
if (pcmcuts.cfg_apply_ml_cuts) {
const std::span<const float>& bdtValue = fV0PhotonCut.getBDTValue();
float psipair = 999.f;
float psipair = 999.f;
float phiv = 999.f;
if constexpr( requires{ v0.psipair(); v0.phiv(); } ) {
if constexpr (requires { v0.psipair(); v0.phiv(); }) {
psipair = v0.psipair();
phiv = v0.phiv();
}
Expand Down Expand Up @@ -483,7 +483,7 @@ struct PCMQC {
using FilteredMyCollisions = soa::Filtered<MyCollisions>;

template <typename TV0Photon>
void process(FilteredMyCollisions const& collisions, TV0Photon const& v0photons, aod::V0Legs const& v0legs)
void process(FilteredMyCollisions const& collisions, TV0Photon const& v0photons, aod::V0Legs const& v0legs)
{
for (const auto& collision : collisions) {
initCCDB(collision);
Expand Down Expand Up @@ -530,7 +530,7 @@ struct PCMQC {

void processQCML(FilteredMyCollisions const& collisions, MyV0PhotonsML const& v0photonsML, aod::V0Legs const& v0legs)
{
process(collisions, v0photonsML, v0legs);
process(collisions, v0photonsML, v0legs);
} // end of ML process

void processDummy(MyCollisions const&) {}
Expand Down
6 changes: 3 additions & 3 deletions PWGEM/PhotonMeson/Tasks/pcmQCMC.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ struct PCMQCMC {
const std::span<const float>& bdtValue = fV0PhotonCut.getBDTValue();
float psipair = 999.f;
float phiv = 999.f;
if constexpr( requires{ v0.psipair(); v0.phiv(); } ) {
if constexpr (requires { v0.psipair(); v0.phiv(); }) {
psipair = v0.psipair();
phiv = v0.phiv();
}
Expand Down Expand Up @@ -573,7 +573,7 @@ struct PCMQCMC {
Filter collisionFilter_occupancy_track = eventcuts.cfgTrackOccupancyMin <= o2::aod::evsel::trackOccupancyInTimeRange && o2::aod::evsel::trackOccupancyInTimeRange < eventcuts.cfgTrackOccupancyMax;
Filter collisionFilter_occupancy_ft0c = eventcuts.cfgFT0COccupancyMin <= o2::aod::evsel::ft0cOccupancyInTimeRange && o2::aod::evsel::ft0cOccupancyInTimeRange < eventcuts.cfgFT0COccupancyMax;
using FilteredMyCollisions = soa::Filtered<MyCollisions>;

template <typename TV0Photons>
void processMC(FilteredMyCollisions const& collisions, TV0Photons const& v0photons, aod::EMMCParticles const& mcparticles, MyMCV0Legs const&, aod::EMMCEvents const&)
{
Expand Down Expand Up @@ -686,7 +686,7 @@ struct PCMQCMC {
processMC(collisions, v0photons, mcparticles, mcv0legs, mcevents);
} // end of QC process

void processQCMCML(FilteredMyCollisions const& collisions, MyV0PhotonsML const& v0photonsML, aod::EMMCParticles const& mcparticles, MyMCV0Legs const& mcv0legs, aod::EMMCEvents const& mcevents)
void processQCMCML(FilteredMyCollisions const& collisions, MyV0PhotonsML const& v0photonsML, aod::EMMCParticles const& mcparticles, MyMCV0Legs const& mcv0legs, aod::EMMCEvents const& mcevents)
{
processMC(collisions, v0photonsML, mcparticles, mcv0legs, mcevents);
} // end of QC process with ML cuts
Expand Down
Loading