Skip to content

Commit de2dde8

Browse files
authored
Merge 743edc9 into sapling-pr-archive-ktf
2 parents d24bc6d + 743edc9 commit de2dde8

5 files changed

Lines changed: 8 additions & 8 deletions

File tree

‎DataFormats/simulation/include/SimulationDataFormat/InteractionSampler.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ class FixedSkipBC_InteractionSampler : public InteractionSampler
128128
private:
129129
int mEveryN; // the skip number ---> fills every N-th BC in the bunch filling scheme
130130
int mMultiplicity; // how many events to put if bc is filled
131-
ClassDef(FixedSkipBC_InteractionSampler, 1);
131+
ClassDefOverride(FixedSkipBC_InteractionSampler, 1);
132132
};
133133

134134
// A version of the interaction sampler which can sample according to non-uniform mu(bc) as
@@ -152,7 +152,7 @@ class NonUniformMuInteractionSampler : public InteractionSampler
152152
private:
153153
// non-uniformity
154154
std::vector<float> mBCIntensityScales;
155-
ClassDef(NonUniformMuInteractionSampler, 1);
155+
ClassDefOverride(NonUniformMuInteractionSampler, 1);
156156
};
157157

158158
} // namespace steer

‎Detectors/TPC/base/src/TPCBaseLinkDef.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,15 @@
7272
#pragma link C++ function o2::tpc::utils::saveCanvas(TCanvas*, std::string_view, std::string_view);
7373

7474
#pragma link C++ namespace o2::tpc::cru_calib_helpers;
75-
#pragma link C++ defined_in "TPCBase/CRUCalibHelpers.h"
75+
#pragma link C++ defined_in "TPCBase/CRUCalibHelpers.h";
7676
#pragma link C++ function o2::tpc::cru_calib_helpers::getHWChannel(int, int, int);
7777
#pragma link C++ function o2::tpc::cru_calib_helpers::getSampaInfo(int, int);
7878
#pragma link C++ function o2::tpc::cru_calib_helpers::floatToFixedSize < 12, 2>(float);
7979
#pragma link C++ function o2::tpc::cru_calib_helpers::floatToFixedSize < 8, 6>(float);
8080
#pragma link C++ function o2::tpc::cru_calib_helpers::fixedSizeToFloat < 2>(float);
8181
#pragma link C++ function o2::tpc::cru_calib_helpers::fixedSizeToFloat < 6>(float);
8282
#pragma link C++ function o2::tpc::cru_calib_helpers::writeValues(const std::string_view, const o2::tpc::cru_calib_helpers::DataMap&, bool);
83-
#pragma link C++ function o2::tpc::cru_calib_helpers::getCalPad < 2>(const std::string_view, const std::string_view, std::string_view)
84-
#pragma link C++ function o2::tpc::cru_calib_helpers::getCalPad < 6>(const std::string_view, const std::string_view, std::string_view)
83+
#pragma link C++ function o2::tpc::cru_calib_helpers::getCalPad < 2>(const std::string_view, const std::string_view, std::string_view);
84+
#pragma link C++ function o2::tpc::cru_calib_helpers::getCalPad < 6>(const std::string_view, const std::string_view, std::string_view);
8585

8686
#endif

‎Detectors/Upgrades/ALICE3/ECal/base/src/ECalBaseLinkDef.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#pragma link off all functions;
1717

1818
#pragma link C++ class o2::ecal::Geometry + ;
19-
#pragma link C++ class o2::ecal::GeometryTGeo +
19+
#pragma link C++ class o2::ecal::GeometryTGeo + ;
2020
#pragma link C++ class o2::ecal::ECalBaseParam + ;
2121
#pragma link C++ class o2::ecal::Hit + ;
2222
#pragma link C++ class o2::conf::ConfigurableParamHelper < o2::ecal::ECalBaseParam> + ;

‎Detectors/Upgrades/ALICE3/MID/base/src/MI3BaseLinkDef.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#pragma link off all classes;
1616
#pragma link off all functions;
1717

18-
#pragma link C++ class o2::mi3::GeometryTGeo +
18+
#pragma link C++ class o2::mi3::GeometryTGeo + ;
1919
#pragma link C++ class o2::mi3::MIDBaseParam + ;
2020
#pragma link C++ class o2::conf::ConfigurableParamHelper < o2::mi3::MIDBaseParam> + ;
2121

‎Detectors/Upgrades/ALICE3/RICH/base/src/RICHBaseLinkDef.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#pragma link off all classes;
1616
#pragma link off all functions;
1717

18-
#pragma link C++ class o2::rich::GeometryTGeo +
18+
#pragma link C++ class o2::rich::GeometryTGeo + ;
1919
#pragma link C++ class o2::rich::RICHBaseParam + ;
2020
#pragma link C++ class o2::conf::ConfigurableParamHelper < o2::rich::RICHBaseParam> + ;
2121

0 commit comments

Comments
 (0)