v1.0.0-rc.31

This commit is contained in:
2025-03-02 13:15:28 +01:00
parent aeabc81a4c
commit ddf4c75645
309 changed files with 8705 additions and 1421 deletions

View File

@@ -48,9 +48,9 @@ void FilterSpotsByResolution(const DiffractionExperiment& experiment,
size_t output_size = std::min<size_t>(input.size(), experiment.GetMaxSpotCount());
std::vector<res_id> res_id_vector(input.size());
DiffractionGeometry geom = experiment.GetDiffractionGeometry();
for (int i = 0; i < input.size(); i++) {
res_id_vector[i].res = input[i].GetResolution(experiment);
res_id_vector[i].res = input[i].GetResolution(geom);
res_id_vector[i].id = i;
}
std::partial_sort(res_id_vector.begin(), res_id_vector.begin() + output_size, res_id_vector.end(),
@@ -139,6 +139,17 @@ std::vector<DiffractionSpot> StrongPixelSet::sparseccl() {
}
void StrongPixelSet::FindSpotsImage(const SpotFindingSettings &settings, std::vector<DiffractionSpot> &spots) {
if (!pixels.empty()) {
for (const auto &spot: sparseccl()) {
if ((spot.PixelCount() <= settings.max_pix_per_spot)
&& (spot.PixelCount() >= settings.min_pix_per_spot)) {
spots.push_back(spot);
}
}
}
}
void StrongPixelSet::FindSpots(const DiffractionExperiment &experiment, const SpotFindingSettings &settings,
std::vector<DiffractionSpot> &spots, uint16_t module_number) {
if (!pixels.empty()) {