v1.0.0-rc.41
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
|
||||
ImageAnalysisCPU::ImageAnalysisCPU(const DiffractionExperiment &in_experiment,
|
||||
const AzimuthalIntegration &in_integration,
|
||||
const std::vector<uint32_t> &in_mask)
|
||||
const PixelMask &in_mask)
|
||||
: experiment(in_experiment),
|
||||
integration(in_integration),
|
||||
npixels(experiment.GetPixelsNum()),
|
||||
@@ -17,14 +17,15 @@ ImageAnalysisCPU::ImageAnalysisCPU(const DiffractionExperiment &in_experiment,
|
||||
mask_1byte(npixels, 0),
|
||||
spotFinder(in_integration),
|
||||
saturation_limit(experiment.GetSaturationLimit()),
|
||||
integrate(in_experiment) {
|
||||
integrate(in_experiment),
|
||||
roi_count(0) {
|
||||
|
||||
nquads = 2;
|
||||
|
||||
UpdateROI();
|
||||
|
||||
for (int i = 0; i < npixels; i++)
|
||||
mask_1byte[i] = (in_mask[i] != 0);
|
||||
mask_1byte[i] = (in_mask.GetMask().at(i) != 0);
|
||||
|
||||
indexer = CreateIndexer(experiment);
|
||||
}
|
||||
@@ -159,9 +160,11 @@ void ImageAnalysisCPU::Analyze(DataMessage &output,
|
||||
if (indexer && spot_finding_settings.indexing) {
|
||||
auto latt = indexer->Run(output, spots_out);
|
||||
if (latt && spot_finding_settings.quick_integration) {
|
||||
output.reflections = integrate.Integrate(
|
||||
auto res = integrate.Integrate(
|
||||
CompressedImage(updated_image, experiment.GetXPixelsNum(),
|
||||
experiment.GetYPixelsNum()), latt.value());
|
||||
experiment.GetYPixelsNum()), latt.value(), spot_finding_settings.quick_integration_d_min_A);
|
||||
output.reflections = res.reflections;
|
||||
output.b_factor = res.b_factor;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user