Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
U
Usgscsm
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
aflab
astrogeology
Usgscsm
Commits
6e8db600
Commit
6e8db600
authored
May 4, 2022
by
Jesse Mapel
Committed by
Jesse Mapel
May 4, 2022
Browse files
Options
Downloads
Patches
Plain Diff
Clipped push frame search to within the image
parent
ef2ff5d0
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/usgscsm/UsgsAstroPushFrameSensorModel.h
+0
-4
0 additions, 4 deletions
include/usgscsm/UsgsAstroPushFrameSensorModel.h
src/UsgsAstroPushFrameSensorModel.cpp
+3
-21
3 additions, 21 deletions
src/UsgsAstroPushFrameSensorModel.cpp
with
3 additions
and
25 deletions
include/usgscsm/UsgsAstroPushFrameSensorModel.h
+
0
−
4
View file @
6e8db600
...
...
@@ -941,10 +941,6 @@ class UsgsAstroPushFrameSensorModel : public csm::RasterGM,
const
std
::
vector
<
double
>&
adj
)
// Parameter Adjustments for partials
const
;
double
calcSensorDistance
(
int
frameletNumber
,
const
csm
::
EcefCoord
&
groundPt
,
const
std
::
vector
<
double
>&
adj
)
const
;
// Computes the line distance from the center of a frame to the image point
// that a ground point reprojects to at that frame.
double
calcFrameDistance
(
int
frameletNumber
,
...
...
This diff is collapsed.
Click to expand it.
src/UsgsAstroPushFrameSensorModel.cpp
+
3
−
21
View file @
6e8db600
...
...
@@ -669,6 +669,7 @@ csm::ImageCoord UsgsAstroPushFrameSensorModel::groundToImage(
// Secant search for the where the ground point is closest to the middle of the framelet.
int
summedFrameletHeight
=
m_frameletHeight
/
m_detectorLineSumming
;
int
numFramelets
=
m_nLines
/
summedFrameletHeight
;
int
startFramelet
=
0
;
double
startDistance
=
calcFrameDistance
(
startFramelet
,
groundPt
,
adj
);
int
endFramelet
=
m_nLines
/
summedFrameletHeight
-
1
;
...
...
@@ -680,6 +681,8 @@ csm::ImageCoord UsgsAstroPushFrameSensorModel::groundToImage(
startFramelet
=
endFramelet
;
startDistance
=
endDistance
;
endFramelet
=
std
::
round
(
endFramelet
-
offset
);
// Clip to the image bounds
endFramelet
=
std
::
max
(
0
,
std
::
min
(
numFramelets
,
endFramelet
));
endDistance
=
calcFrameDistance
(
endFramelet
,
groundPt
,
adj
);
}
...
...
@@ -2432,27 +2435,6 @@ csm::EcefVector UsgsAstroPushFrameSensorModel::getSunPosition(
}
double
UsgsAstroPushFrameSensorModel
::
calcSensorDistance
(
int
frameletNumber
,
const
csm
::
EcefCoord
&
groundPt
,
const
std
::
vector
<
double
>&
adj
)
const
{
MESSAGE_LOG
(
"Calculating sensor distance for framelet {} "
"at ground point ({}, {}, {})"
,
frameletNumber
,
groundPt
.
x
,
groundPt
.
y
,
groundPt
.
z
)
int
summedFrameletHeight
=
m_frameletHeight
/
m_detectorLineSumming
;
double
time
=
getImageTime
(
csm
::
ImageCoord
(
0.5
+
summedFrameletHeight
*
frameletNumber
,
0.0
));
double
xc
,
yc
,
zc
,
vx
,
vy
,
vz
;
getAdjSensorPosVel
(
time
,
adj
,
xc
,
yc
,
zc
,
vx
,
vy
,
vz
);
csm
::
EcefVector
sensorToGround
(
groundPt
.
x
-
xc
,
groundPt
.
y
-
yc
,
groundPt
.
z
-
zc
);
double
dist
=
norm
(
sensorToGround
);
MESSAGE_LOG
(
"Calculated distance is {}"
,
dist
);
return
dist
;
}
double
UsgsAstroPushFrameSensorModel
::
calcFrameDistance
(
int
frameletNumber
,
const
csm
::
EcefCoord
&
groundPt
,
const
std
::
vector
<
double
>&
adj
)
const
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment