Skip to content

Commit 6a4299d

Browse files
vkuceravkucera
committed
Fix runtime/int
1 parent 56b93f8 commit 6a4299d

22 files changed

Lines changed: 45 additions & 44 deletions

‎Common/Core/PID/TPCPIDResponse.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class Response
7777
float GetExpectedSigma(const CollisionType& collision, const TrackType& trk, const o2::track::PID::ID id) const;
7878
/// Gets the expected resolution of the track with multTPC explicitly provided
7979
template <typename TrackType>
80-
float GetExpectedSigmaAtMultiplicity(const long multTPC, const TrackType& trk, const o2::track::PID::ID id) const;
80+
float GetExpectedSigmaAtMultiplicity(const int64_t multTPC, const TrackType& trk, const o2::track::PID::ID id) const;
8181
/// Gets the number of sigmas with respect the expected value
8282
template <typename CollisionType, typename TrackType>
8383
float GetNumberOfSigma(const CollisionType& collision, const TrackType& trk, const o2::track::PID::ID id) const;
@@ -86,7 +86,7 @@ class Response
8686
float GetNumberOfSigmaMCTuned(const CollisionType& collision, const TrackType& trk, const o2::track::PID::ID id, float mcTunedTPCSignal) const;
8787
// Number of sigmas with respect to expected for MC, defining a tune-on-data signal value, explicit multTPC
8888
template <typename TrackType>
89-
float GetNumberOfSigmaMCTunedAtMultiplicity(const long multTPC, const TrackType& trk, const o2::track::PID::ID id, float mcTunedTPCSignal) const;
89+
float GetNumberOfSigmaMCTunedAtMultiplicity(const int64_t multTPC, const TrackType& trk, const o2::track::PID::ID id, float mcTunedTPCSignal) const;
9090
/// Gets the deviation to the expected signal
9191
template <typename TrackType>
9292
float GetSignalDelta(const TrackType& trk, const o2::track::PID::ID id) const;
@@ -99,7 +99,7 @@ class Response
9999
private:
100100
/// Compute expected sigma given a pre-computed expected signal, avoiding a redundant Bethe-Bloch call.
101101
template <typename TrackType>
102-
float sigmaFromSignal(float expectedSignal, const long multTPC, const TrackType& track, const o2::track::PID::ID id) const;
102+
float sigmaFromSignal(float expectedSignal, const int64_t multTPC, const TrackType& track, const o2::track::PID::ID id) const;
103103

104104
std::array<float, 5> mBetheBlochParams = {0.03209809958934784, 19.9768009185791, 2.5266601063857674e-16, 2.7212300300598145, 6.080920219421387};
105105
std::array<float, 2> mResolutionParamsDefault = {0.07, 0.0};
@@ -135,7 +135,7 @@ inline float Response::GetExpectedSigma(const CollisionType& collision, const Tr
135135

136136
/// Gets the expected resolution of the measurement
137137
template <typename TrackType>
138-
inline float Response::GetExpectedSigmaAtMultiplicity(const long multTPC, const TrackType& track, const o2::track::PID::ID id) const
138+
inline float Response::GetExpectedSigmaAtMultiplicity(const int64_t multTPC, const TrackType& track, const o2::track::PID::ID id) const
139139
{
140140
if (!track.hasTPC()) {
141141
return -999.f;
@@ -144,7 +144,7 @@ inline float Response::GetExpectedSigmaAtMultiplicity(const long multTPC, const
144144
}
145145

146146
template <typename TrackType>
147-
inline float Response::sigmaFromSignal(float expectedSignal, const long multTPC, const TrackType& track, const o2::track::PID::ID id) const
147+
inline float Response::sigmaFromSignal(float expectedSignal, const int64_t multTPC, const TrackType& track, const o2::track::PID::ID id) const
148148
{
149149
float resolution = 0.f;
150150
if (mUseDefaultResolutionParam) {
@@ -188,7 +188,7 @@ inline float Response::GetNumberOfSigmaMCTuned(const CollisionType& collision, c
188188
}
189189

190190
template <typename TrackType>
191-
inline float Response::GetNumberOfSigmaMCTunedAtMultiplicity(const long multTPC, const TrackType& trk, const o2::track::PID::ID id, float mcTunedTPCSignal) const
191+
inline float Response::GetNumberOfSigmaMCTunedAtMultiplicity(const int64_t multTPC, const TrackType& trk, const o2::track::PID::ID id, float mcTunedTPCSignal) const
192192
{
193193
const float signal = GetExpectedSignal(trk, id);
194194
if (signal < 0.f) {

‎Common/Tasks/flowTest.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ struct flowTest {
100100
if (evPhi < 0)
101101
evPhi += 2. * TMath::Pi();
102102

103-
long nCh = 0;
103+
int64_t nCh = 0;
104104

105105
if (imp > minB && imp < maxB) {
106106
// event within range

‎Common/Tasks/multiplicityQa.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,8 @@ struct MultiplicityQa {
290290
return;
291291
}
292292

293-
long NcontribsTOF = 0;
294-
long NcontribsTRD = 0;
293+
int64_t NcontribsTOF = 0;
294+
int64_t NcontribsTRD = 0;
295295
for (auto& track : tracks) {
296296
if (track.isPVContributor()) {
297297
if (track.hasTRD())

‎DPG/Tasks/AOTTrack/qaEventTrackLite.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ DECLARE_SOA_COLUMN(Pt, pt, float);
106106
DECLARE_SOA_COLUMN(Eta, eta, float); //! Eta
107107
DECLARE_SOA_COLUMN(Phi, phi, float); //! Phi
108108
DECLARE_SOA_COLUMN(PtReso, ptReso, float); //! Pt resolution
109-
DECLARE_SOA_COLUMN(Sign, sign, short); //! Sign
109+
DECLARE_SOA_COLUMN(Sign, sign, int16_t); //! Sign
110110
DECLARE_SOA_COLUMN(HasITS, hasITS, bool); //! Track has the ITS
111111
DECLARE_SOA_COLUMN(HasTPC, hasTPC, bool); //! Track has the TPC
112112
DECLARE_SOA_COLUMN(HasTRD, hasTRD, bool); //! Track has the TRD

‎DPG/Tasks/TOF/tofSkimsTableCreator.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ DECLARE_SOA_COLUMN(DeltaTPi, deltaTPi, float); //! Difference betw
4646
DECLARE_SOA_COLUMN(DeltaTKa, deltaTKa, float); //! Difference between the tofSignal and the kaon expected signal
4747
DECLARE_SOA_COLUMN(DeltaTPr, deltaTPr, float); //! Difference between the tofSignal and the proton expected signal
4848
DECLARE_SOA_COLUMN(DoubleDelta, doubleDelta, float); //! Double difference between DeltaT
49-
DECLARE_SOA_COLUMN(RefSign, refSign, short); //! Sign of the reference track
49+
DECLARE_SOA_COLUMN(RefSign, refSign, int16_t); //! Sign of the reference track
5050
DECLARE_SOA_COLUMN(PIDForTracking, pidForTracking, uint8_t); //! Index for mass hypothesis used in tracking see PID.h for definition
5151
DECLARE_SOA_COLUMN(EvTimeT0AC, evTimeT0AC, float); //! Event time of the track computed with the T0AC
5252
DECLARE_SOA_COLUMN(EvTimeT0ACErr, evTimeT0ACErr, float); //! Resolution of the event time of the track computed with the T0AC

‎PWGCF/Core/CorrelationContainer.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ CorrelationContainer::CorrelationContainer(const char* name, const char* objTitl
112112

113113
std::vector<o2::framework::AxisSpec> pairAxis(correlationAxis);
114114
pairAxis.insert(pairAxis.end(), userAxis.begin(), userAxis.end());
115-
long bins = 1;
115+
int64_t bins = 1;
116116
for (const auto& axis : pairAxis) {
117117
bins *= axis.getNbins();
118118
}

‎PWGCF/FemtoWorld/TableProducer/femtoWorldProducerReducedTask.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ struct femtoWorldProducerReducedTask {
131131
ccdb->setCaching(true);
132132
ccdb->setLocalObjectValidityChecking();
133133

134-
long now = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count();
134+
int64_t now = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count();
135135
ccdb->setCreatedNotAfter(now);
136136
}
137137

‎PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTaskV0Only.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ struct femtoWorldProducerTaskV0Only {
183183
ccdb->setCaching(true);
184184
ccdb->setLocalObjectValidityChecking();
185185

186-
long now = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count();
186+
int64_t now = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count();
187187
ccdb->setCreatedNotAfter(now);
188188
}
189189

‎PWGEM/Dilepton/DataModel/dileptonTables.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1234,7 +1234,7 @@ DECLARE_SOA_COLUMN(Signed1Pt, signed1Pt, float); //! (sign of charge)/Pt in c/
12341234
DECLARE_SOA_COLUMN(Eta, eta, float); //!
12351235
DECLARE_SOA_COLUMN(Phi, phi, float); //!
12361236
DECLARE_SOA_DYNAMIC_COLUMN(Pt, pt, [](float signed1Pt) -> float { return 1.f / std::fabs(signed1Pt); });
1237-
DECLARE_SOA_DYNAMIC_COLUMN(Sign, sign, [](float signed1Pt) -> short { return (signed1Pt > 0) ? 1 : -1; }); //! Charge: positive: 1, negative: -1
1237+
DECLARE_SOA_DYNAMIC_COLUMN(Sign, sign, [](float signed1Pt) -> int16_t { return (signed1Pt > 0) ? 1 : -1; }); //! Charge: positive: 1, negative: -1
12381238
} // namespace emprimarytrack
12391239

12401240
DECLARE_SOA_TABLE_VERSIONED(EMPrimaryTracks_000, "AOD", "EMPRIMARYTRACK", 0, //! primary charged track table for 2PC
@@ -1281,13 +1281,13 @@ DECLARE_SOA_INDEX_COLUMN(EMThinEvent, emthinevent); //!
12811281
DECLARE_SOA_COLUMN(Pt1, pt1, float); //!
12821282
DECLARE_SOA_COLUMN(Eta1, eta1, float); //!
12831283
DECLARE_SOA_COLUMN(Phi1, phi1, float); //!
1284-
DECLARE_SOA_COLUMN(Sign1, sign1, short); //!
1284+
DECLARE_SOA_COLUMN(Sign1, sign1, int16_t); //!
12851285
DECLARE_SOA_COLUMN(DCA1, dca1, float); //! DCA in sigma. Users should decide 3D or XY or Z
12861286
DECLARE_SOA_COLUMN(Pt2, pt2, float); //!
12871287
DECLARE_SOA_COLUMN(Eta2, eta2, float); //!
12881288
DECLARE_SOA_COLUMN(Phi2, phi2, float); //!
12891289
DECLARE_SOA_COLUMN(DCA2, dca2, float); //! DCA in sigma. Users should decide 3D or XY or Z
1290-
DECLARE_SOA_COLUMN(Sign2, sign2, short); //!
1290+
DECLARE_SOA_COLUMN(Sign2, sign2, int16_t); //!
12911291
DECLARE_SOA_COLUMN(Weight, weight, float); //! possible pair weight
12921292
} // namespace emdilepton
12931293

‎PWGEM/Dilepton/DataModel/lmeeMLTables.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ DECLARE_SOA_COLUMN(TPCNClsFound, tpcNClsFound, uint8_t); //!
6262
DECLARE_SOA_COLUMN(TPCNClsCrossedRows, tpcNClsCrossedRows, uint8_t); //!
6363
DECLARE_SOA_COLUMN(TPCNClsPID, tpcNClsPID, uint8_t); //!
6464
DECLARE_SOA_COLUMN(IsForValidation, isForValidation, bool); //!
65-
DECLARE_SOA_COLUMN(Sign, sign, short); //!
65+
DECLARE_SOA_COLUMN(Sign, sign, int16_t); //!
6666
DECLARE_SOA_COLUMN(P, p, float); //!
6767
DECLARE_SOA_COLUMN(PtGen, ptGen, float); //!
6868
DECLARE_SOA_COLUMN(EtaGen, etaGen, float); //!

0 commit comments

Comments
 (0)