Skip to content

Commit

Permalink
Change integer types in more places
Browse files Browse the repository at this point in the history
  • Loading branch information
@peterfpeterson
peterfpeterson committed Feb 20, 2025
1 parent b87faef commit c01c3bf
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 27 deletions.
4 changes: 2 additions & 2 deletions Framework/DataHandling/inc/MantidDataHandling/LoadILLSANS.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ class MANTID_DATAHANDLING_DLL LoadILLSANS : public API::IFileLoader<Kernel::Nexu
void initWorkSpaceD33(NeXus::NXEntry &, const std::string &);
void initWorkSpaceD16(NeXus::NXEntry &, const std::string &);
void createEmptyWorkspace(const size_t, const size_t, const MultichannelType type = MultichannelType::TOF);
void getDataDimensions(const NeXus::NXInt &data, int &numberOfChannels, int &numberOfTubes,
int &numberOfPixelsPerTube);
void getDataDimensions(const NeXus::NXInt &data, size_t &numberOfChannels, size_t &numberOfTubes,
size_t &numberOfPixelsPerTube);
size_t loadDataFromMonitors(NeXus::NXEntry &firstEntry, size_t firstIndex = 0,
const MultichannelType type = MultichannelType::TOF);
size_t loadDataFromD16ScanMonitors(const NeXus::NXEntry &firstEntry, size_t firstIndex,
Expand Down
32 changes: 16 additions & 16 deletions Framework/DataHandling/src/LoadILLSANS.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,16 +276,16 @@ LoadILLSANS::DetectorPosition LoadILLSANS::getDetectorPositionD33(const NeXus::N
* @param numberOfTubes
* @param numberOfPixelsPerTube
*/
void LoadILLSANS::getDataDimensions(const NeXus::NXInt &data, int &numberOfChannels, int &numberOfTubes,
int &numberOfPixelsPerTube) {
void LoadILLSANS::getDataDimensions(const NeXus::NXInt &data, size_t &numberOfChannels, size_t &numberOfTubes,
size_t &numberOfPixelsPerTube) {
if (m_isD16Omega) {
numberOfChannels = static_cast<int>(data.dim0());
numberOfTubes = static_cast<int>(data.dim1());
numberOfPixelsPerTube = static_cast<int>(data.dim2());
numberOfChannels = static_cast<size_t>(data.dim0());
numberOfTubes = static_cast<size_t>(data.dim1());
numberOfPixelsPerTube = static_cast<size_t>(data.dim2());
} else {
numberOfPixelsPerTube = static_cast<int>(data.dim1());
numberOfChannels = static_cast<int>(data.dim2());
numberOfTubes = static_cast<int>(data.dim0());
numberOfPixelsPerTube = static_cast<size_t>(data.dim1());
numberOfChannels = static_cast<size_t>(data.dim2());
numberOfTubes = static_cast<size_t>(data.dim0());
}
g_log.debug() << "Dimensions found:\n- Number of tubes: " << numberOfTubes
<< "\n- Number of pixels per tube: " << numberOfPixelsPerTube
Expand Down Expand Up @@ -360,7 +360,7 @@ void LoadILLSANS::initWorkSpace(NeXus::NXEntry &firstEntry, const std::string &i
}
}

int numberOfTubes, numberOfPixelsPerTubes, numberOfChannels;
size_t numberOfTubes, numberOfPixelsPerTubes, numberOfChannels;
getDataDimensions(data, numberOfChannels, numberOfTubes, numberOfPixelsPerTubes);

// For these monochromatic instruments, one bin is "TOF" mode, and more than that is a scan
Expand Down Expand Up @@ -408,7 +408,7 @@ void LoadILLSANS::initWorkSpaceD11B(NeXus::NXEntry &firstEntry, const std::strin
dataLeft.dim0() * dataLeft.dim1()) +
m_numberOfMonitors;

int numberOfChannels, numberOfPixelsPerTubeCenter, numberOfTubesCenter;
size_t numberOfChannels, numberOfPixelsPerTubeCenter, numberOfTubesCenter;
getDataDimensions(dataCenter, numberOfChannels, numberOfTubesCenter, numberOfPixelsPerTubeCenter);

MultichannelType type = (numberOfChannels != 1) ? MultichannelType::KINETIC : MultichannelType::TOF;
Expand All @@ -418,8 +418,8 @@ void LoadILLSANS::initWorkSpaceD11B(NeXus::NXEntry &firstEntry, const std::strin
// we need to adjust the default binning after loadmetadata
if (numberOfChannels != 1) {
std::vector<double> frames(numberOfChannels, 0);
for (int i = 0; i < numberOfChannels; ++i) {
frames[i] = i;
for (size_t i = 0; i < numberOfChannels; ++i) {
frames[i] = static_cast<double>(i);
}
m_defaultBinning.resize(numberOfChannels);
std::copy(frames.cbegin(), frames.cend(), m_defaultBinning.begin());
Expand Down Expand Up @@ -464,7 +464,7 @@ void LoadILLSANS::initWorkSpaceD22B(NeXus::NXEntry &firstEntry, const std::strin
static_cast<size_t>(data2_data.dim0() * data2_data.dim1() + data1_data.dim0() * data1_data.dim1()) +
m_numberOfMonitors;

int numberOfChannels, numberOfPixelsPerTubeCenter, numberOfTubesCenter;
size_t numberOfChannels, numberOfPixelsPerTubeCenter, numberOfTubesCenter;
getDataDimensions(data1_data, numberOfChannels, numberOfTubesCenter, numberOfPixelsPerTubeCenter);

MultichannelType type = (numberOfChannels != 1) ? MultichannelType::KINETIC : MultichannelType::TOF;
Expand All @@ -475,8 +475,8 @@ void LoadILLSANS::initWorkSpaceD22B(NeXus::NXEntry &firstEntry, const std::strin
// we need to adjust the default binning after loadmetadata
if (numberOfChannels != 1) {
std::vector<double> frames(numberOfChannels, 0);
for (int i = 0; i < numberOfChannels; ++i) {
frames[i] = i;
for (size_t i = 0; i < numberOfChannels; ++i) {
frames[i] = static_cast<double>(i);
}
m_defaultBinning.resize(numberOfChannels);
std::copy(frames.cbegin(), frames.cend(), m_defaultBinning.begin());
Expand Down Expand Up @@ -723,7 +723,7 @@ size_t LoadILLSANS::loadDataFromD16ScanMonitors(const NeXus::NXEntry &firstEntry
size_t LoadILLSANS::loadDataFromTubes(NeXus::NXInt const &data, const std::vector<double> &timeBinning,
size_t firstIndex, const MultichannelType type) {

int numberOfTubes, numberOfChannels, numberOfPixelsPerTube;
size_t numberOfTubes, numberOfChannels, numberOfPixelsPerTube;
getDataDimensions(data, numberOfChannels, numberOfTubes, numberOfPixelsPerTube);

bool pointData = true;
Expand Down
18 changes: 9 additions & 9 deletions Framework/Muon/src/LoadMuonNexus2.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ void LoadMuonNexus2::exec() {

NXFloat raw_time = dataGroup.openNXFloat("raw_time");
raw_time.load();
int64_t nBins = raw_time.dim0();
int nBins = raw_time.dim0();
std::vector<double> timeBins;
timeBins.assign(raw_time(), raw_time() + nBins);
timeBins.emplace_back(raw_time[nBins - 1] + raw_time[1] - raw_time[0]);
Expand Down Expand Up @@ -453,12 +453,12 @@ std::map<int, std::set<int>> LoadMuonNexus2::loadDetectorMapping(const Mantid::L
const auto detIndex = dataGroup.openNXInt("detector_index");
const auto detCount = dataGroup.openNXInt("detector_count");
const auto detList = dataGroup.openNXInt("detector_list");
const int nDet = static_cast<int>(detIndex.dim0());
for (int i = 0; i < nDet; ++i) {
const int start = detIndex[i];
const int nDetectors = detCount[i];
std::set<int> detIDs;
for (int jDet = 0; jDet < nDetectors; ++jDet) {
const detid_t nDet = static_cast<detid_t>(detIndex.dim0());
for (detid_t i = 0; i < nDet; ++i) {
const auto start = static_cast<detid_t>(detIndex[i]);
const auto nDetectors = detCount[i];
std::set<detid_t> detIDs;
for (detid_t jDet = 0; jDet < nDetectors; ++jDet) {
detIDs.insert(detList[start + jDet]);
}
mapping[i] = detIDs;
Expand All @@ -470,8 +470,8 @@ std::map<int, std::set<int>> LoadMuonNexus2::loadDetectorMapping(const Mantid::L
throw std::runtime_error(message.str());
}
} else {
for (int i = 0; i < nSpectra; ++i) {
mapping[i] = std::set<int>{spectrumIndex[i]};
for (specnum_t i = 0; i < nSpectra; ++i) {
mapping[i] = std::set<detid_t>{spectrumIndex[i]};
}
}

Expand Down

0 comments on commit c01c3bf

Please sign in to comment.