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 all commits
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
33 changes: 19 additions & 14 deletions Common/Core/PID/ParamBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,13 @@
/// These are the basic storage elements to be kept in the CCDB
///

#ifndef O2_FRAMEWORK_PARAMBASE_H_
#define O2_FRAMEWORK_PARAMBASE_H_
#ifndef COMMON_CORE_PID_PARAMBASE_H_
#define COMMON_CORE_PID_PARAMBASE_H_

#include <algorithm> // std::copy
#include <map> // std::map
#include <string> // std::string
#include <vector> // std::vector

// ROOT includes
#include "TNamed.h"
Expand All @@ -40,15 +45,15 @@ class Parameters : public TNamed

/// Parametric constructor
/// \param size Number of parameters in the container
Parameters(unsigned int size) : mPar(std::vector<pidvar_t>(size)){};
explicit Parameters(unsigned int size) : mPar(std::vector<pidvar_t>(size)) {}

/// Parametric constructor
/// \param size Number of parameters in the container
Parameters(const TString name, unsigned int size) : TNamed(name, name), mPar(std::vector<pidvar_t>(size)){};
Parameters(const TString name, unsigned int size) : TNamed(name, name), mPar(std::vector<pidvar_t>(size)) {}

/// Parametric constructor
/// \param params Parameters to initialize the container
Parameters(const TString name, const std::vector<pidvar_t> params) : TNamed(name, name), mPar{} { SetParameters(params); };
Parameters(const TString name, const std::vector<pidvar_t> params) : TNamed(name, name), mPar{} { SetParameters(params); }

/// Default destructor
~Parameters() override = default;
Expand All @@ -68,11 +73,11 @@ class Parameters : public TNamed

/// Setter for the parameter, using a parameter object
/// \param params parameter object with parameters
void SetParameters(const Parameters params) { SetParameters(params.mPar); };
void SetParameters(const Parameters params) { SetParameters(params.mPar); }

/// Setter for the parameter, using a parameter pointer
/// \param params pointer to parameter object with parameters
void SetParameters(const Parameters* params) { SetParameters(params->mPar); };
void SetParameters(const Parameters* params) { SetParameters(params->mPar); }

/// Printer of the parameter values
void Print(Option_t* option = "") const override;
Expand Down Expand Up @@ -108,7 +113,7 @@ class PidParameters : public TNamed
{
public:
/// Default constructor
PidParameters(TString name = "DefaultParameters") : TNamed(name, name), mPar{} {};
explicit PidParameters(TString name = "DefaultParameters") : TNamed(name, name), mPar{} {};

/// Default destructor
~PidParameters() override = default;
Expand All @@ -133,11 +138,11 @@ class PidParameters : public TNamed

/// Setter for the parameter, using a parameter object
/// \param params parameter object with parameters
void SetParameters(const PidParameters<nPar> params) { SetParameters(params.mPar); };
void SetParameters(const PidParameters<nPar> params) { SetParameters(params.mPar); }

/// Setter for the parameter, using a parameter pointer
/// \param params pointer to parameter object with parameters
void SetParameters(const PidParameters<nPar>* params) { SetParameters(params->mPar); };
void SetParameters(const PidParameters<nPar>* params) { SetParameters(params->mPar); }

/// Printer of the parameter values
void Print(Option_t* /*option = ""*/) const override
Expand Down Expand Up @@ -183,7 +188,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 All @@ -210,12 +215,12 @@ class Parametrization : public TNamed
/// Parametric constructor
/// \param name Name (and title) of the parametrization
/// \param size Number of parameters of the parametrization
Parametrization(TString name, unsigned int size) : TNamed(name, name), mParameters(name + "Parameters", size){};
Parametrization(TString name, unsigned int size) : TNamed(name, name), mParameters(name + "Parameters", size) {}

/// Parametric constructor
/// \param name Name (and title) of the parametrization
/// \param params Parameters of the parametrization
Parametrization(TString name, const std::vector<pidvar_t> params) : TNamed(name, name), mParameters{name + "Parameters", params} {};
Parametrization(TString name, const std::vector<pidvar_t> params) : TNamed(name, name), mParameters{name + "Parameters", params} {}

/// Default destructor
~Parametrization() override = default;
Expand Down Expand Up @@ -260,4 +265,4 @@ class Parametrization : public TNamed

} // namespace o2::pid

#endif // O2_FRAMEWORK_PARAMBASE_H_
#endif // COMMON_CORE_PID_PARAMBASE_H_
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
29 changes: 15 additions & 14 deletions Common/TableProducer/mcCollsExtra.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,19 @@
//
// Quick and dirty task to correlate MC <-> data
//

#include <cmath>
#include <array>
#include <cstdlib>

#include "Math/Vector4D.h"
#include <TFile.h>
#include <TH2F.h>
#include <TProfile.h>
#include <TLorentzVector.h>
#include <TPDGCode.h>
#include <TDatabasePDG.h>

#include "Framework/runDataProcessing.h"
#include "Framework/AnalysisTask.h"
#include "Framework/AnalysisDataModel.h"
Expand All @@ -32,18 +45,6 @@
#include "DataFormatsParameters/GRPMagField.h"
#include "CCDB/BasicCCDBManager.h"

#include <TFile.h>
#include <TH2F.h>
#include <TProfile.h>
#include <TLorentzVector.h>
#include <Math/Vector4D.h>
#include <TPDGCode.h>
#include <TDatabasePDG.h>
#include <cmath>
#include <array>
#include <cstdlib>
#include "Framework/ASoAHelpers.h"

using namespace o2;
using namespace o2::framework;
using namespace o2::framework::expressions;
Expand Down Expand Up @@ -133,8 +134,8 @@ struct mcCollisionExtra {
auto mcCollision = collision.mcCollision();
auto iter = std::find(sortedIndices.begin(), sortedIndices.end(), mcCollision.index());
if (iter != sortedIndices.end()) {
int index = iter - sortedIndices.begin();
for (int iMcColl = index + 1; iMcColl < index + 17; iMcColl++) {
auto index = std::distance(iter, sortedIndices.begin());
for (size_t iMcColl = index + 1; iMcColl < index + 17; iMcColl++) {
if (iMcColl >= sortedIndices.size())
continue;
if (mcCollisionHasPoI[sortedIndices[iMcColl]])
Expand Down
5 changes: 5 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,34 +74,39 @@ 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]];
case 4:
// Run 3 kFirst, i.e. 1 hit in first layer of ITS
if (isRun3) {
LOG(info) << "setting up getGlobalTrackSelectionRun3ITSMatch(TrackSelection::GlobalTrackRun3ITSMatching::Run3ITSibFirst, " << dcaSetup.value << ");";
globalTracks = getGlobalTrackSelectionRun3ITSMatch(TrackSelection::GlobalTrackRun3ITSMatching::Run3ITSibFirst, dcaSetup.value);
break;
}
[[fallthrough]];
default:
LOG(fatal) << "TrackSelectionTask with undefined cuts. Fix it!";
break;
Expand Down
Loading