v1.0.0-rc.31
This commit is contained in:
@@ -56,7 +56,8 @@ void MXAnalyzer::ReadFromCPU(DeviceOutput *output, const SpotFindingSettings &se
|
||||
return;
|
||||
|
||||
std::vector<float> d_map(RAW_MODULE_SIZE);
|
||||
CalcSpotFinderResolutionMap(d_map.data(), experiment, module_number);
|
||||
|
||||
experiment.CalcSpotFinderResolutionMap(d_map.data(), module_number);
|
||||
|
||||
arr_mean.resize(RAW_MODULE_SIZE);
|
||||
arr_sttdev.resize(RAW_MODULE_SIZE);
|
||||
@@ -106,7 +107,7 @@ void MXAnalyzer::ReadFromCPU(const int16_t *image,
|
||||
DeviceOutput output{};
|
||||
memcpy(output.pixels, image, RAW_MODULE_SIZE * sizeof(int16_t));
|
||||
|
||||
CalcSpotFinderResolutionMap(d_map.data(), experiment, module_number);
|
||||
experiment.CalcSpotFinderResolutionMap(d_map.data(), module_number);
|
||||
|
||||
arr_mean.resize(experiment.GetModulesNum() * RAW_MODULE_SIZE);
|
||||
arr_sttdev.resize(experiment.GetModulesNum() * RAW_MODULE_SIZE);
|
||||
@@ -137,8 +138,9 @@ uint32_t MXAnalyzer::FilterSpotsInPowderRings(const std::vector<DiffractionSpot>
|
||||
|
||||
std::vector<std::vector<uint32_t> > bins(bin_count);
|
||||
|
||||
DiffractionGeometry geom = experiment.GetDiffractionGeometry();
|
||||
for (int i = 0; i < spots_filter.size(); i++) {
|
||||
double q = 2 * M_PI / spots_filter[i].GetResolution(experiment);
|
||||
double q = 2 * M_PI / spots_filter[i].GetResolution(geom);
|
||||
if ((q >= low_q) && (q < high_q)) {
|
||||
int32_t q_bin = std::floor((q - low_q) / q_spacing);
|
||||
bins[q_bin].push_back(i);
|
||||
@@ -180,8 +182,10 @@ void MXAnalyzer::Process(DataMessage &message, const SpotFindingSettings& settin
|
||||
if (indexer && settings.indexing) {
|
||||
std::vector<Coord> recip;
|
||||
recip.reserve(spots_out.size());
|
||||
DiffractionGeometry geom = experiment.GetDiffractionGeometry();
|
||||
|
||||
for (const auto &i: spots_out)
|
||||
recip.push_back(i.ReciprocalCoord(experiment));
|
||||
recip.push_back(i.ReciprocalCoord(geom));
|
||||
|
||||
std::vector<IndexingResult> indexer_result;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user