Skip to content

[Common,DPG] Please consider the following formatting changes to #11747 #14

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

[Common,DPG] Please consider the following formatting changes to #11747 #14

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 Common/TableProducer/PID/pidTPCBase.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
#include "TableHelper.h"
#include "pidTPCBase.h"

#include "Common/DataModel/FT0Corrected.h"
#include "Common/CCDB/ctpRateFetcher.h"
#include "Common/DataModel/FT0Corrected.h"

#include "CCDB/BasicCCDBManager.h"
#include "Framework/AnalysisTask.h"
Expand Down Expand Up @@ -89,7 +89,7 @@
Service<o2::ccdb::BasicCCDBManager> ccdb;
ctpRateFetcher mRateFetcher;

Str_dEdx_correction str_dedx_correction;

Check failure on line 92 in Common/TableProducer/PID/pidTPCBase.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& initContext)
void init(o2::framework::InitContext&)
Expand All @@ -105,7 +105,7 @@
FullTracksIU const& tracks,
aod::BCsWithTimestamps const& bcs)
{
const uint64_t outTable_size = tracks.size();

Check failure on line 108 in Common/TableProducer/PID/pidTPCBase.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/function-variable] 

Use lowerCamelCase for names of functions and variables.
dEdxCorrected.reserve(outTable_size);

for (auto const& trk : tracks) {
Expand All @@ -132,7 +132,7 @@

float fTrackOccN = occupancy / 1000.;
float fOccTPCN = fNormMultTPC * 10; //(fNormMultTPC*10).clip(0,12)
if (fOccTPCN > 12)

Check failure on line 135 in Common/TableProducer/PID/pidTPCBase.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
fOccTPCN = 12;
else if (fOccTPCN < 0)
fOccTPCN = 0;
Expand All @@ -143,23 +143,23 @@
float a1pt2 = a1pt * a1pt;
float atgl = std::abs(trk.tgl());
float mbb0R = 50 / fTPCSignal;
if (mbb0R > 1.05)

Check failure on line 146 in Common/TableProducer/PID/pidTPCBase.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
mbb0R = 1.05;
else if (mbb0R < 0.05)

Check failure on line 148 in Common/TableProducer/PID/pidTPCBase.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
mbb0R = 0.05;
// float mbb0R = max(0.05, min(50 / fTPCSignal, 1.05));
float a1ptmbb0R = a1pt * mbb0R;
float atglmbb0R = atgl * mbb0R;

std::vector<float> vec_occu = {fTrackOccN, fOccTPCN, fTrackOccMeanN};

Check failure on line 154 in Common/TableProducer/PID/pidTPCBase.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/function-variable] 

Use lowerCamelCase for names of functions and variables.
std::vector<float> vec_track = {mbb0R, a1pt, atgl, atglmbb0R, a1ptmbb0R, side, a1pt2};

Check failure on line 155 in Common/TableProducer/PID/pidTPCBase.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/function-variable] 

Use lowerCamelCase for names of functions and variables.

float fTPCSignalN_CR0 = str_dedx_correction.fReal_fTPCSignalN(vec_occu, vec_track);

Check failure on line 157 in Common/TableProducer/PID/pidTPCBase.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/function-variable] 

Use lowerCamelCase for names of functions and variables.

float mbb0R1 = 50 / (fTPCSignal / fTPCSignalN_CR0);
if (mbb0R1 > 1.05)

Check failure on line 160 in Common/TableProducer/PID/pidTPCBase.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
mbb0R1 = 1.05;
else if (mbb0R1 < 0.05)

Check failure on line 162 in Common/TableProducer/PID/pidTPCBase.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
mbb0R1 = 0.05;

std::vector<float> vec_track1 = {mbb0R1, a1pt, atgl, atgl * mbb0R1, a1pt * mbb0R1, side, a1pt2};
Expand Down
10 changes: 5 additions & 5 deletions DPG/Tasks/TPC/tpcSkimsTableCreator.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -855,11 +855,11 @@ struct TreeWriterTPCTOF {
aod::pidTOFFullPr, aod::pidTOFFullDe, aod::pidTOFFullTr,
aod::TrackSelection>;
using TrksWithDEdxCorrection = soa::Join<aod::Tracks, aod::TracksExtra,
aod::pidTPCFullEl, aod::pidTPCFullPi, aod::pidTPCFullKa,
aod::pidTPCFullPr, aod::pidTPCFullDe, aod::pidTPCFullTr,
aod::pidTOFFullEl, aod::pidTOFFullPi, aod::pidTOFFullKa,
aod::pidTOFFullPr, aod::pidTOFFullDe, aod::pidTOFFullTr,
aod::TrackSelection, aod::DEdxsCorrected>;
aod::pidTPCFullEl, aod::pidTPCFullPi, aod::pidTPCFullKa,
aod::pidTPCFullPr, aod::pidTPCFullDe, aod::pidTPCFullTr,
aod::pidTOFFullEl, aod::pidTOFFullPi, aod::pidTOFFullKa,
aod::pidTOFFullPr, aod::pidTOFFullDe, aod::pidTOFFullTr,
aod::TrackSelection, aod::DEdxsCorrected>;
using Colls = soa::Join<aod::Collisions, aod::Mults, aod::EvSels>;
using MyBCTable = soa::Join<aod::BCsWithTimestamps, aod::BCTFinfoTable>;

Expand Down
Loading