Skip to content

Commit

Permalink
Merge pull request #746 from ngageoint/decorr-rate-issue
Browse files Browse the repository at this point in the history
Adjusted decorr rate to match spec
  • Loading branch information
adam-beauchamp authored Jul 2, 2024
2 parents 16351bc + 9590db5 commit 448e6d6
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions six/projects/csm/source/SIXSensorModel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1030,7 +1030,7 @@ std::vector<double> SIXSensorModel::getCrossCovarianceMatrix(
const six::DateTime timeP2 =
comparisonSIXModel.getReferenceDateAndTimeImpl();
const double time =
1000.0 * (timeP1.getTimeInMillis() - timeP2.getTimeInMillis());
0.001 * (timeP1.getTimeInMillis() - timeP2.getTimeInMillis());
std::vector<size_t> m(numGroups);

for (size_t ii = 0; ii < numGroups; ++ii)
Expand Down Expand Up @@ -1119,13 +1119,13 @@ double SIXSensorModel::getCorrelationCoefficient(size_t cpGroupIndex,
{
const double coeff = errors.mPositionCorrCoefZero -
errors.mPositionDecorrRate * std::abs(deltaTime);
return std::min(1.0, std::max(-1.0, coeff));
return std::min(1.0, std::max(0.0, coeff));
}
case 1:
{
const double coeff = errors.mRangeCorrCoefZero -
errors.mRangeDecorrRate * std::abs(deltaTime);
return std::min(1.0, std::max(-1.0, coeff));
return std::min(1.0, std::max(0.0, coeff));
}
default:
throw csm::Error(csm::Error::INDEX_OUT_OF_RANGE,
Expand Down

0 comments on commit 448e6d6

Please sign in to comment.