diff options
Diffstat (limited to 'src/ipa/libipa/lux.cpp')
| -rw-r--r-- | src/ipa/libipa/lux.cpp | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/src/ipa/libipa/lux.cpp b/src/ipa/libipa/lux.cpp index 61f8fea8..899e8824 100644 --- a/src/ipa/libipa/lux.cpp +++ b/src/ipa/libipa/lux.cpp @@ -44,11 +44,6 @@ namespace ipa { */ /** - * \var Lux::binSize_ - * \brief The maximum count of each bin - */ - -/** * \var Lux::referenceExposureTime_ * \brief The exposure time of the reference image, in microseconds */ @@ -65,9 +60,8 @@ namespace ipa { /** * \var Lux::referenceY_ - * \brief The measured luminance of the reference image, out of the bin size + * \brief The measured luminance of the reference image, normalized to 1 * - * \sa binSize_ */ /** @@ -76,11 +70,9 @@ namespace ipa { */ /** - * \brief Construct the Lux helper module - * \param[in] binSize The maximum count of each bin - */ -Lux::Lux(unsigned int binSize) - : binSize_(binSize) + * \brief Construct the Lux helper module + */ +Lux::Lux() { } @@ -97,7 +89,7 @@ Lux::Lux(unsigned int binSize) * referenceExposureTime: 10000 * referenceAnalogueGain: 4.0 * referenceDigitalGain: 1.0 - * referenceY: 12000 + * referenceY: 0.1831 * referenceLux: 1000 * \endcode * @@ -167,7 +159,7 @@ double Lux::estimateLux(utils::Duration exposureTime, double exposureTimeRatio = referenceExposureTime_ / exposureTime; double aGainRatio = referenceAnalogueGain_ / aGain; double dGainRatio = referenceDigitalGain_ / dGain; - double yRatio = currentY * (binSize_ / yHist.bins()) / referenceY_; + double yRatio = (currentY / yHist.bins()) / referenceY_; double estimatedLux = exposureTimeRatio * aGainRatio * dGainRatio * yRatio * referenceLux_; |