Skip to content
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

Jump to bottom

Common: Fix compilation warnings #5764

Merged
merged 7 commits into from
Jun 10, 2024
Merged

Common: Fix compilation warnings #5764

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1df5211
Common: Fix compilation warnings
vkucera Apr 22, 2024
b35ff1c
Fix cpplint
vkucera Apr 22, 2024
f71a743
Please consider the following formatting changes (#70)
alibuild Apr 22, 2024
45cf00b
Fix cpplint error
vkucera Apr 22, 2024
c0f733a
Get index with std::distance
vkucera Apr 22, 2024
8e62a8d
Fix cpplint
vkucera Apr 22, 2024
4c8d702
Merge branch 'master' into fix-Common
vkucera Apr 26, 2024
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/Core/PID/ParamBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ class PidParameters : public TNamed

/// Getter for the parameters
/// \return returns an array of parameters
const pidvar_t GetParameter(int i) const { return mPar[i]; }
pidvar_t GetParameter(int i) const { return mPar[i]; }

/// Getter for the size of the parameter
/// \return returns the size of the parameter array
Expand Down
10 changes: 5 additions & 5 deletions Common/Core/PID/TPCPIDResponse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ class Response
const std::array<float, 5> GetBetheBlochParams() const { return mBetheBlochParams; }
const std::array<float, 2> GetResolutionParamsDefault() const { return mResolutionParamsDefault; }
const std::vector<double> GetResolutionParams() const { return mResolutionParams; }
const float GetMIP() const { return mMIP; }
const float GetNClNormalization() const { return nClNorm; }
const float GetChargeFactor() const { return mChargeFactor; }
const float GetMultiplicityNormalization() const { return mMultNormalization; }
const bool GetUseDefaultResolutionParam() const { return mUseDefaultResolutionParam; }
float GetMIP() const { return mMIP; }
float GetNClNormalization() const { return nClNorm; }
float GetChargeFactor() const { return mChargeFactor; }
float GetMultiplicityNormalization() const { return mMultNormalization; }
bool GetUseDefaultResolutionParam() const { return mUseDefaultResolutionParam; }

/// Gets the expected signal of the track
template <typename TrackType>
Expand Down
2 changes: 1 addition & 1 deletion Common/TableProducer/mcCollsExtra.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ struct mcCollisionExtra {
if (iter != sortedIndices.end()) {
int index = iter - sortedIndices.begin();
for (int iMcColl = index + 1; iMcColl < index + 17; iMcColl++) {
aalkin marked this conversation as resolved.
Show resolved Hide resolved
if (iMcColl >= sortedIndices.size())
if (iMcColl >= static_cast<int>(sortedIndices.size()))
continue;
if (mcCollisionHasPoI[sortedIndices[iMcColl]])
bitset(forwardHistory, iMcColl - index - 1);
Expand Down
4 changes: 4 additions & 0 deletions Common/TableProducer/trackselection.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,27 +74,31 @@ struct TrackSelectionTask {
break;
}
LOG(warning) << "isRun3 == true and itsMatching == 0: not setting globalTracks = getGlobalTrackSelection();, but going to itsMatching == 1 and set getGlobalTrackSelectionRun3ITSMatch(TrackSelection::GlobalTrackRun3ITSMatching::Run3ITSibAny)";
[[fallthrough]];
case 1:
// Run 3 kAny on 3 IB layers of ITS
if (isRun3) {
LOG(info) << "setting up getGlobalTrackSelectionRun3ITSMatch(TrackSelection::GlobalTrackRun3ITSMatching::Run3ITSibAny, " << dcaSetup.value << ");";
globalTracks = getGlobalTrackSelectionRun3ITSMatch(TrackSelection::GlobalTrackRun3ITSMatching::Run3ITSibAny, dcaSetup.value);
break;
}
[[fallthrough]];
case 2:
// Run 3 kAny on all 7 layers of ITS
if (isRun3) {
LOG(info) << "setting up getGlobalTrackSelectionRun3ITSMatch(TrackSelection::GlobalTrackRun3ITSMatching::Run3ITSallAny, " << dcaSetup.value << ");";
globalTracks = getGlobalTrackSelectionRun3ITSMatch(TrackSelection::GlobalTrackRun3ITSMatching::Run3ITSallAny, dcaSetup.value);
break;
}
[[fallthrough]];
case 3:
// Run 3 kAll on all 7 layers of ITS
if (isRun3) {
LOG(info) << "setting up getGlobalTrackSelectionRun3ITSMatch(TrackSelection::GlobalTrackRun3ITSMatching::Run3ITSall7Layers, " << dcaSetup.value << ");";
globalTracks = getGlobalTrackSelectionRun3ITSMatch(TrackSelection::GlobalTrackRun3ITSMatching::Run3ITSall7Layers, dcaSetup.value);
break;
}
[[fallthrough]];
default:
LOG(fatal) << "TrackSelectionTask with undefined cuts. Fix it!";
break;
Expand Down
Loading