CreateBraggPrediction: No rotation for now
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 7m46s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 9m9s
Build Packages / Generate python client (push) Successful in 32s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 9m42s
Build Packages / Build documentation (push) Successful in 53s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 10m34s
Build Packages / build:rpm (rocky8) (push) Successful in 13m48s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 14m1s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 14m0s
Build Packages / build:rpm (rocky9) (push) Successful in 14m34s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 9m24s
Build Packages / Unit tests (push) Successful in 54m42s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 7m46s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 9m9s
Build Packages / Generate python client (push) Successful in 32s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 9m42s
Build Packages / Build documentation (push) Successful in 53s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 10m34s
Build Packages / build:rpm (rocky8) (push) Successful in 13m48s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 14m1s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 14m0s
Build Packages / build:rpm (rocky9) (push) Successful in 14m34s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 9m24s
Build Packages / Unit tests (push) Successful in 54m42s
This commit is contained in:
@@ -28,7 +28,7 @@ double stddev(const std::vector<float> &v) {
|
||||
MXAnalysisAfterFPGA::MXAnalysisAfterFPGA(const DiffractionExperiment &in_experiment, IndexAndRefine &indexer)
|
||||
: experiment(in_experiment),
|
||||
indexer(indexer),
|
||||
prediction(CreateBraggPrediction(in_experiment.IsRotationIndexing())) {
|
||||
prediction(CreateBraggPrediction()) {
|
||||
if (experiment.IsSpotFindingEnabled())
|
||||
find_spots = true;
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@ MXAnalysisWithoutFPGA::MXAnalysisWithoutFPGA(const DiffractionExperiment &in_exp
|
||||
mask_1bit(npixels, false),
|
||||
spotFinder(CreateImageSpotFinder(experiment.GetXPixelsNum(), experiment.GetYPixelsNum())),
|
||||
indexer(in_indexer),
|
||||
prediction(CreateBraggPrediction(in_experiment.IsRotationIndexing())),
|
||||
prediction(CreateBraggPrediction()),
|
||||
updated_image(spotFinder->GetInputBuffer()),
|
||||
azint_bins(in_integration.GetBinNumber()),
|
||||
saturation_limit(experiment.GetSaturationLimit()),
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "BraggPredictionGPU.h"
|
||||
#endif
|
||||
|
||||
std::unique_ptr<BraggPrediction> CreateBraggPrediction(bool rotation_indexing, int max_reflections) {
|
||||
std::unique_ptr<BraggPrediction> CreateBraggPrediction(int max_reflections) {
|
||||
#ifdef JFJOCH_USE_CUDA
|
||||
if (get_gpu_count() > 0)
|
||||
return std::make_unique<BraggPredictionGPU>(max_reflections);
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
|
||||
#include "BraggPrediction.h"
|
||||
|
||||
std::unique_ptr<BraggPrediction> CreateBraggPrediction(bool rotation_indexing,
|
||||
int max_reflections = 10000);
|
||||
std::unique_ptr<BraggPrediction> CreateBraggPrediction(int max_reflections = 10000);
|
||||
|
||||
#endif //JFJOCH_BRAGGPREDICTIONFACTORY_H
|
||||
Reference in New Issue
Block a user