Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixing geometrical factors #1132

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fixing geometrical factors #1132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b37f0aa
estimation of geometrical factors uses mirrorring and symmetries and…
Jan 12, 2023
564f3a9
undoing unnecessary printing and writing
Jan 12, 2023
7448723
undoing white spaces
Jan 13, 2023
dda38f7
Merge branch 'UCL:master' into makeGeofactors
danieldeidda Apr 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 36 additions & 28 deletions src/buildblock/ML_norm.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,14 +382,14 @@ void iterate_efficiencies(Array<1,float>& efficiencies,
for (int a = 0; a < num_detectors; ++a)
{
if (data_fan_sums[a] == 0)
efficiencies[a] = 0;
efficiencies[a] = 0;
else
{
//const float denominator = inner_product(efficiencies,model[a]);
float denominator = 0;
for (int b = model.get_min_index(a); b <= model.get_max_index(a); ++b)
denominator += efficiencies[b%num_detectors]*model(a,b);
efficiencies[a] = data_fan_sums[a] / denominator;
for (int b = model.get_min_index(a); b <= model.get_max_index(a); ++b)
denominator += efficiencies[b%num_detectors]*model(a,b);
efficiencies[a] = data_fan_sums[a] / denominator;
}
}
}
Expand Down Expand Up @@ -1347,24 +1347,24 @@ void apply_geo_norm(FanProjData& fan_data, const GeoData3D& geo_data, const bool
const int num_axial_detectors = fan_data.get_num_rings();
const int num_transaxial_detectors = fan_data.get_num_detectors_per_ring();
const int num_axial_crystals_per_block = geo_data.get_num_axial_crystals_per_block();
const int num_transaxial_crystals_per_block = geo_data.get_half_num_transaxial_crystals_per_block()*2;
const int num_transaxial_crystals_per_block = geo_data.get_half_num_transaxial_crystals_per_block();

const int num_transaxial_blocks = num_transaxial_detectors/num_transaxial_crystals_per_block;
const int num_axial_blocks = num_axial_detectors/num_axial_crystals_per_block;

FanProjData work = fan_data;
work.fill(0);

for (int ra = 0; ra < num_axial_crystals_per_block; ++ra)
for (int a = 0; a < num_transaxial_crystals_per_block /2; ++a)
for (int a = 0; a < num_transaxial_crystals_per_block ; ++a)
// loop rb from ra to avoid double counting
for (int rb = max(ra,fan_data.get_min_rb(ra)); rb <= fan_data.get_max_rb(ra); ++rb)
for (int b = fan_data.get_min_b(a); b <= fan_data.get_max_b(a); ++b)
{


// rotation

for (int axial_block_num = 0; axial_block_num<num_axial_blocks; ++axial_block_num)
{

Expand All @@ -1379,26 +1379,26 @@ void apply_geo_norm(FanProjData& fan_data, const GeoData3D& geo_data, const bool
const int new_ring_num_a = ra+axial_det_inc;
const int new_ring_num_b = rb+axial_det_inc;

const int ma = num_transaxial_detectors-1-new_det_num_a;
const int mb = (2*num_transaxial_detectors-1-new_det_num_b)%num_transaxial_detectors;
const int mra = num_axial_detectors-1-new_ring_num_a;
const int mrb = num_axial_detectors-1-new_ring_num_b;
// const int ma = num_transaxial_detectors-1-new_det_num_a;//mirror a
// const int mb = (2*num_transaxial_detectors-1-new_det_num_b)%num_transaxial_detectors;
// const int mra = num_axial_detectors-1-new_ring_num_a;
// const int mrb = num_axial_detectors-1-new_ring_num_b;

if (work.is_in_data(new_ring_num_a,new_det_num_a,new_ring_num_b,new_det_num_b))
work(new_ring_num_a, new_det_num_a,new_ring_num_b, new_det_num_b) =
geo_data(ra,a,rb,b%num_transaxial_detectors);

// if (work.is_in_data(new_ring_num_a,ma,new_ring_num_b,mb))
// work(new_ring_num_a,ma,new_ring_num_b,mb) = geo_data(ra,a,rb,b%num_transaxial_detectors);

if (work.is_in_data(new_ring_num_a,ma,new_ring_num_b,mb))
work(new_ring_num_a,ma,new_ring_num_b,mb) = geo_data(ra,a,rb,b%num_transaxial_detectors);

if (work.is_in_data(mra,new_det_num_a,mrb,new_det_num_b))
// if (work.is_in_data(mra,new_det_num_a,mrb,new_det_num_b))

work(mra,new_det_num_a,mrb,new_det_num_b) = geo_data(ra,a,rb,b%num_transaxial_detectors);
// work(mra,new_det_num_a,mrb,new_det_num_b) = geo_data(ra,a,rb,b%num_transaxial_detectors);

if (work.is_in_data(mra,ma,mrb,mb))
// if (work.is_in_data(mra,ma,mrb,mb))

work(mra,ma,mrb,mb) = geo_data(ra,a,rb,b%num_transaxial_detectors);
// work(mra,ma,mrb,mb) = geo_data(ra,a,rb,b%num_transaxial_detectors);



}
Expand Down Expand Up @@ -1545,8 +1545,10 @@ void make_geo_data(GeoData3D& geo_data, const FanProjData& fan_data)
const int num_axial_detectors = fan_data.get_num_rings();
const int num_transaxial_detectors = fan_data.get_num_detectors_per_ring();
const int num_axial_crystals_per_block = geo_data.get_num_axial_crystals_per_block();
const int num_transaxial_crystals_per_block = geo_data.get_half_num_transaxial_crystals_per_block()*2;
const int num_transaxial_blocks = num_transaxial_detectors/num_transaxial_crystals_per_block;

const int num_transaxial_crystals_per_block = geo_data.get_half_num_transaxial_crystals_per_block();

const int num_transaxial_blocks = num_transaxial_detectors/num_transaxial_crystals_per_block;
const int num_axial_blocks = num_axial_detectors/num_axial_crystals_per_block;


Expand Down Expand Up @@ -1581,7 +1583,7 @@ void make_geo_data(GeoData3D& geo_data, const FanProjData& fan_data)

for (int ra = 0; ra < num_axial_crystals_per_block; ++ra)
// for (int a = 0; a <= num_transaxial_detectors/2; ++a)
for (int a = 0; a <num_transaxial_crystals_per_block/2; ++a)
for (int a = 0; a <num_transaxial_crystals_per_block; ++a)
// loop rb from ra to avoid double counting
// for (int rb = fan_data.get_min_ra(); rb <= fan_data.get_max_ra(); ++rb)
for (int rb = max(ra,fan_data.get_min_rb(ra)); rb <= fan_data.get_max_rb(ra); ++rb)
Expand Down Expand Up @@ -1657,7 +1659,7 @@ void iterate_efficiencies(DetectorEfficiencies& efficiencies,
float denominator = 0;
for (int rb = model.get_min_rb(ra); rb <= model.get_max_rb(ra); ++rb)
for (int b = model.get_min_b(a); b <= model.get_max_b(a); ++b)
denominator += efficiencies[rb][b%num_detectors_per_ring]*model(ra,a,rb,b);
denominator += efficiencies[rb][b%num_detectors_per_ring]*model(ra,a,rb,b);
efficiencies[ra][a] = data_fan_sums[ra][a] / denominator;
}
}
Expand Down Expand Up @@ -1714,14 +1716,20 @@ void iterate_geo_norm(GeoData3D& norm_geo_data,
{
make_geo_data(norm_geo_data, model);
//norm_geo_data = measured_geo_data / norm_geo_data;


const int num_transaxial_detectors = model.get_num_detectors_per_ring();
const int num_axial_crystals_per_block = measured_geo_data.get_num_axial_crystals_per_block();
const int num_transaxial_crystals_per_block = measured_geo_data.get_half_num_transaxial_crystals_per_block()*2;


int num_trans_crystals_per_block = measured_geo_data.get_half_num_transaxial_crystals_per_block();
if (num_transaxial_detectors % num_trans_crystals_per_block != 0)
num_trans_crystals_per_block+=1;

const int num_transaxial_crystals_per_block = num_trans_crystals_per_block;

const float threshold = measured_geo_data.find_max()/10000.F;

for (int ra = 0; ra < num_axial_crystals_per_block; ++ra)
for (int a = 0; a <num_transaxial_crystals_per_block/2; ++a)
for (int a = 0; a <num_transaxial_crystals_per_block; ++a)
// loop rb from ra to avoid double counting
// for (int rb = model.get_min_ra(); rb <= model.get_max_ra(); ++rb)
for (int rb = max(ra,model.get_min_rb(ra)); rb <= model.get_max_rb(ra); ++rb)
Expand Down
7 changes: 4 additions & 3 deletions src/recon_buildblock/ML_estimate_component_based_normalisation.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,11 @@ ML_estimate_component_based_normalisation(const std::string& out_filename_prefix
FanProjData fan_data;
DetectorEfficiencies data_fan_sums(IndexRange2D(num_physical_rings, num_physical_detectors_per_ring));
DetectorEfficiencies efficiencies(IndexRange2D(num_physical_rings, num_physical_detectors_per_ring));

GeoData3D measured_geo_data(num_physical_axial_crystals_per_basic_unit, num_physical_transaxial_crystals_per_basic_unit / 2,
// if(num_physical_axial_crystals_per_basic_unit%2 ==0)
// num_physical_transaxial_crystals_per_basic_unit+=1;
GeoData3D measured_geo_data(num_physical_axial_crystals_per_basic_unit, num_physical_transaxial_crystals_per_basic_unit ,
num_physical_rings, num_physical_detectors_per_ring); // inputes have to be modified
GeoData3D norm_geo_data(num_physical_axial_crystals_per_basic_unit, num_physical_transaxial_crystals_per_basic_unit / 2,
GeoData3D norm_geo_data(num_physical_axial_crystals_per_basic_unit, num_physical_transaxial_crystals_per_basic_unit ,
num_physical_rings, num_physical_detectors_per_ring); // inputes have to be modified

BlockData3D measured_block_data(num_axial_blocks, num_transaxial_blocks, num_axial_blocks - 1, num_transaxial_blocks - 1);
Expand Down