Commit 692a7787 authored by Yaroslav Gevorkov's avatar Yaroslav Gevorkov
Browse files

added indexerData to cmakeLists

parent 7604b919
......@@ -16,22 +16,23 @@ find_package(Eigen3 3.4 NO_MODULE)
include_directories(include)
set(SOURCES src/Chronometer.cpp
src/ReciprocalToRealProjection.cpp
src/SimpleProjection.cpp
src/Lattice.cpp
set(SOURCES src/Backprojection.cpp
src/Chronometer.cpp
src/ExperimentSettings.cpp
src/Backprojection.cpp
src/ReflectionsInRangeFinder.cpp
src/Sinogram.cpp
src/Lattice.cpp
src/PinkIndexer.cpp
src/ReciprocalToRealProjection.cpp
src/Refinement.cpp
src/ReflectionsInRangeFinder.cpp
src/SimpleDiffractionPatternPrediction.cpp
src/PinkIndexer.cpp
src/SimpleProjection.cpp
src/Sinogram.cpp
src/adaptions/crystfel/ExperimentSettings.cpp
src/adaptions/crystfel/indexerData.cpp
src/adaptions/crystfel/PinkIndexer.cpp
src/adaptions/crystfel/SimpleDiffractionPatternPrediction.cpp
src/adaptions/crystfel/projectionData.cpp
src/adaptions/crystfel/SimpleDiffractionPatternPrediction.cpp
src/adaptions/crystfel/SimpleProjection.cpp
)
......
......@@ -50,7 +50,7 @@ int PinkIndexer::indexPattern(Lattice& indexedLattice, Eigen::RowVectorXf& inten
{
sinogram.computeSinogramParallel(ucsDirections_reduced, ucsBorderNorms_reduced, threadCount);
}
else // probably not run in parellel to other instances
else // probably not ran in parellel to other instances
{
int slaveThreadCount = threadCount - 1;
sinogram.computeSinogramParallel2(ucsDirections_reduced, ucsBorderNorms_reduced, slaveThreadCount);
......
......@@ -86,7 +86,7 @@ void Sinogram::computeSinogram(const Eigen::Matrix3Xf& ucsDirections, const Eige
Matrix<uint32_t, 28, 1> validSinogramPoints_matrix_lin_dilated;
int measuredPeaksCount = ucsDirections.cols();
cout << "peak count: " << measuredPeaksCount << endl;
cout << "peak count used for indexing: " << measuredPeaksCount << endl;
for (int measuredPeakNumber = 0; measuredPeakNumber < measuredPeaksCount; measuredPeakNumber++)
{
if (measuredPeakNumber % 16 == 0)
......@@ -193,7 +193,7 @@ void Sinogram::computeSinogramParallel(const Eigen::Matrix3Xf& ucsDirections, co
sinogram_oneMeasuredPeak_matrixMapped(sinogram_oneMeasuredPeak.data(), sinogram_oneMeasuredPeak.size());
int measuredPeaksCount = ucsDirections.cols();
cout << "peak count: " << measuredPeaksCount << endl;
cout << "peak count used for indexing: " << measuredPeaksCount << endl;
for (int measuredPeakNumber = 0; measuredPeakNumber < measuredPeaksCount; measuredPeakNumber++)
{
if (measuredPeakNumber % 16 == 0)
......@@ -238,7 +238,7 @@ void Sinogram::computeSinogramParallel2(const Eigen::Matrix3Xf& ucsDirections, c
Map<Matrix<uint8_t, Dynamic, 1>> sinogram_matrixMapped(sinogram.data(), sinogram.size());
int measuredPeaksCount = ucsDirections.cols();
cout << "peak count: " << measuredPeaksCount << endl;
cout << "peak count used for indexing: " << measuredPeaksCount << endl;
for (int measuredPeakNumber = 0; measuredPeakNumber < measuredPeaksCount; measuredPeakNumber++)
{
if (measuredPeakNumber % 16 == 0)
......
#include "adaptions/crystfel/indexerData.h"
void allocReciprocalPeaks(reciprocalPeaks_1_per_A_t* reciprocalPeaks_1_per_A)
{
reciprocalPeaks_1_per_A->coordinates_x = new float[MAX_PEAK_COUNT_FOR_INDEXER];
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment