Skip to content

[PWGUD] Please consider the following formatting changes to #10309 #55

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
rolavick merged 1 commit into from
Mar 4, 2025
Merged

[PWGUD] Please consider the following formatting changes to #10309 #55

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
19 changes: 9 additions & 10 deletions PWGUD/TableProducer/Converters/UDCollisionSelExtrasV002Converter.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.

Check warning on line 1 in PWGUD/TableProducer/Converters/UDCollisionSelExtrasV002Converter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/file-cpp] 

Use lowerCamelCase or UpperCamelCase for names of C++ files. See the O2 naming conventions for details.
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
Expand All @@ -23,7 +23,7 @@

// Converts UDCollisions for version 000 to 002 and 001 to 002
struct UDCollisionSelExtrasV002Converter {
Produces<o2::aod::UDCollisionSelExtras_002> udCollisionSelExtras_002;

Check warning on line 26 in PWGUD/TableProducer/Converters/UDCollisionSelExtrasV002Converter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/function-variable] 

Use lowerCamelCase for names of functions and variables.

void init(InitContext const&)
{
Expand Down Expand Up @@ -74,26 +74,25 @@
collision.trs(),
collision.trofs(),
collision.hmpr(),
0, // dummy tfb
0, // dummy itsROFb
0, // dummy sbp
0, // dummy zVtxFT0vPV
0); // dummy vtxITSTPC
0, // dummy tfb
0, // dummy itsROFb
0, // dummy sbp
0, // dummy zVtxFT0vPV
0); // dummy vtxITSTPC
}
}
PROCESS_SWITCH(UDCollisionSelExtrasV002Converter, processV001ToV002, "process v001-to-v002 conversion", true);

};

/// Spawn the extended table for UDCollisionSelExtras002 to avoid the call to the internal spawner and a consequent circular dependency
//struct UDCollisionSelExtrasSpawner {
// Spawns<aod::UDCollisionSelExtras_002> udCollisionSelExtras_002;
//};
// struct UDCollisionSelExtrasSpawner {
// Spawns<aod::UDCollisionSelExtras_002> udCollisionSelExtras_002;
// };

WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
{
return WorkflowSpec{
adaptAnalysisTask<UDCollisionSelExtrasV002Converter>(cfgc),
// adaptAnalysisTask<UDCollisionSelExtrasSpawner>(cfgc),
// adaptAnalysisTask<UDCollisionSelExtrasSpawner>(cfgc),
};
}
11 changes: 4 additions & 7 deletions PWGUD/Tasks/upcTauRl.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@
DECLARE_SOA_COLUMN(Trs, trs, int);
DECLARE_SOA_COLUMN(Trofs, trofs, int);
DECLARE_SOA_COLUMN(Hmpr, hmpr, int);
DECLARE_SOA_COLUMN(TFb, tfb, int);

Check warning on line 73 in PWGUD/Tasks/upcTauRl.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(ITSROFb, itsROFb, int);

Check warning on line 74 in PWGUD/Tasks/upcTauRl.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(Sbp, sbp, int);
DECLARE_SOA_COLUMN(ZvtxFT0vPV, zVtxFT0vPV, int);

Check warning on line 76 in PWGUD/Tasks/upcTauRl.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(VtxITSTPC, vtxITSTPC, int);
// FIT info
DECLARE_SOA_COLUMN(TotalFT0AmplitudeA, totalFT0AmplitudeA, float);
Expand Down Expand Up @@ -102,7 +102,7 @@
DECLARE_SOA_COLUMN(TrkTOFnSigmaKa, trkTOFnSigmaKa, float[2]);
DECLARE_SOA_COLUMN(TrkTOFnSigmaPr, trkTOFnSigmaPr, float[2]);

} // namespace reco_tree
} // namespace tau_tree
DECLARE_SOA_TABLE(TauTwoTracks, "AOD", "TAUTWOTRACK",
tau_tree::RunNumber, tau_tree::Bc, tau_tree::TotalTracks, tau_tree::NumContrib, tau_tree::GlobalNonPVtracks, tau_tree::PosX, tau_tree::PosY, tau_tree::PosZ,
tau_tree::RecoMode, tau_tree::OccupancyInTime, tau_tree::HadronicRate,
Expand All @@ -115,7 +115,6 @@

} // namespace o2::aod


struct UpcTauRl {
Produces<o2::aod::TauTwoTracks> tauTwoTracks;

Expand Down Expand Up @@ -601,7 +600,6 @@
histos.add("EventTwoTracks/ElectronMuPi/PID/hTOFnSigmaVsMPofO", ";Not-electron #it{p} (GeV/c);n#sigma^{#mu}_{TOF} (arb. units)", HistType::kTH2D, {confAxis.zzAxisMom, confAxis.zzAxisNsigma});
histos.add("EventTwoTracks/ElectronMuPi/PID/hTOFnSigmaVsPPofO", ";Not-electron #it{p} (GeV/c);n#sigma^{#pi}_{TOF} (arb. units)", HistType::kTH2D, {confAxis.zzAxisMom, confAxis.zzAxisNsigma});
histos.add("EventTwoTracks/ElectronMuPi/PID/hTOFnSigmaEvsnSigmaPofO", ";Not-electron n#sigma^{e}_{TOF} (arb. units);Not-electron n#sigma^{#pi}_{TOF} (arb. units)", HistType::kTH2D, {confAxis.zzAxisNsigma, confAxis.zzAxisNsigma});

}

if (doTruthHistos) {
Expand Down Expand Up @@ -1999,7 +1997,8 @@
}

template <typename C, typename Ts>
void outputTauEventCandidates(C const& collision, Ts const& tracks){
void outputTauEventCandidates(C const& collision, Ts const& tracks)
{

int countTracksPerCollision = 0;
int countGoodNonPVtracks = 0;
Expand All @@ -2026,7 +2025,7 @@
}
} // Loop over tracks with selections

if (countPVGTel == 2 || (countPVGTel == 1 && countPVGTmupi == 1)){
if (countPVGTel == 2 || (countPVGTel == 1 && countPVGTmupi == 1)) {
const auto& trk1 = tracks.iteratorAt(vecTrkIdx[0]);
const auto& trk2 = tracks.iteratorAt(vecTrkIdx[1]);

Expand Down Expand Up @@ -2058,10 +2057,8 @@
tpcSignal, tpcEl, tpcMu, tpcPi, tpcKa, tpcPr,
tofSignal, tofEl, tofMu, tofPi, tofKa, tofPr);
}

}


void processDataDG(FullUDCollision const& reconstructedCollision,
FullUDTracks const& reconstructedBarrelTracks)
{
Expand Down
Loading