Skip to content

Commit

Permalink
Make sure ptk uses entire plate
Browse files Browse the repository at this point in the history
The original code was hard coded for just covering the area touch the
plate equi.
  • Loading branch information
Zack Moratto committed May 18, 2011
1 parent 07c6eec commit 9a15844
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
3 changes: 1 addition & 2 deletions src/asp/PhotometryTK/mipmap.cc
Expand Up @@ -79,8 +79,7 @@ void perform_mipmap( Options & opt ) {
// Process everything!
opt.level = platefile->num_levels()-1;
int32 full = 1 << opt.level;
int32 quarter = full/4;
opt.region_bbox = BBox2i(0,quarter,full-1,quarter*2-1);
opt.region_bbox = BBox2i(0,0,full-1,full-1);
}
vw_out() << "Processing: " << opt.region_bbox
<< " at level " << opt.level << "\n";
Expand Down
6 changes: 2 additions & 4 deletions src/asp/PhotometryTK/phoiterror.cc
Expand Up @@ -53,8 +53,7 @@ void update_error( Options& opt ) {

if (opt.level < 0 )
opt.level = drg_plate->num_levels() - 1;
}
else {
} else {
minidx = 0;
maxidx = 0;
}
Expand All @@ -66,8 +65,7 @@ void update_error( Options& opt ) {
ErrorNRAccumulatorFunc<double,Vector2i> funcProto(opt.level, j+1, cam_info.exposure_t(), drg_plate, albedo_plate);

int32 full = 1 << opt.level;
int32 quarter = full/4;
BBox2i affected_tiles(0,quarter,full-1,quarter*2-1);
BBox2i affected_tiles(0,0,full-1,full-1);

RecursiveBBoxAccumulator<ErrorNRAccumulatorFunc<double,Vector2i> > accum(32, funcProto);

Expand Down
3 changes: 1 addition & 2 deletions src/asp/PhotometryTK/phoittime.cc
Expand Up @@ -67,8 +67,7 @@ void update_exposure( Options& opt ) {
if ( opt.level < 0 )
opt.level = drg_plate->num_levels() - 1;
int32 full = 1 << opt.level;
int32 quarter = full/4;
BBox2i affected_tiles(0,quarter,full-1,quarter*2-1);
BBox2i affected_tiles(0,0,full,full);
std::list<TileHeader> drg_tiles =
drg_plate->search_by_region(opt.level, affected_tiles,j+1,j+1,1);
ImageView<PixelGrayA<float32> > drg_temp, albedo_temp;
Expand Down

0 comments on commit 9a15844

Please sign in to comment.