-
Notifications
You must be signed in to change notification settings - Fork 63
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.
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
Refactor GaussMarkov sensor noise handling #881
Open
Natsoulas
wants to merge
7
commits into
develop
Choose a base branch
from
refactor-sensor-noise-handling
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
b26e254
imuSensor errorBounds future name change warning, getters and setters
Natsoulas b297976
GM scenario rst update
Natsoulas ee6cf0d
starTracker refactor: getters + setters, initialize GM in constructor
Natsoulas d99b5df
simpleVoltEstimator: added setter + getter, initialize noise model in…
Natsoulas 16be932
Magnetometer refactor: initialize noise model in constructor, update …
Natsoulas 74aea31
coarseSunSensor refactor: add a prop matrix setter + getter
Natsoulas e04558d
update known issues + release notes
Natsoulas File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -64,7 +64,7 @@ class CoarseSunSensor: public SysModel { | |
void scaleSensorValues(); //!< scale the sensor values | ||
void applySaturation(); //!< apply saturation effects to sensed output (floor and ceiling) | ||
void writeOutputMessages(uint64_t Clock); //!< @brief method to write the output message to the system | ||
|
||
public: | ||
ReadFunctor<SpicePlanetStateMsgPayload> sunInMsg; //!< [-] input message for sun data | ||
ReadFunctor<SCStatesMsgPayload> stateInMsg; //!< [-] input message for spacecraft state | ||
|
@@ -88,7 +88,7 @@ class CoarseSunSensor: public SysModel { | |
double kellyFactor; //!< [-] Kelly curve fit for output cosine curve | ||
double fov; //!< [-] rad, field of view half angle | ||
Eigen::Vector3d r_B; //!< [m] position vector in body frame | ||
Eigen::Vector3d r_PB_B; //!< [m] misalignment of CSS platform wrt spacecraft body frame | ||
Eigen::Vector3d r_PB_B; //!< [m] misalignment of CSS platform wrt spacecraft body frame | ||
double senBias; //!< [-] Sensor bias value | ||
double senNoiseStd; //!< [-] Sensor noise value | ||
double faultNoiseStd; //!< [-] Sensor noise value if CSSFAULT_RAND is triggered | ||
|
@@ -99,6 +99,9 @@ class CoarseSunSensor: public SysModel { | |
int CSSGroupID=-1; //!< [-] (optional) CSS group id identifier, -1 means it is not set and default is used | ||
BSKLogger bskLogger; //!< -- BSK Logging | ||
|
||
void setAMatrix(const Eigen::Matrix<double, -1, 1, 0, -1, 1>& propMatrix); | ||
Eigen::Matrix<double, -1, 1, 0, -1, 1> getAMatrix() const; | ||
|
||
private: | ||
SpicePlanetStateMsgPayload sunData; //!< [-] Unused for now, but including it for future | ||
SCStatesMsgPayload stateCurrent; //!< [-] Current SSBI-relative state | ||
|
@@ -107,11 +110,12 @@ class CoarseSunSensor: public SysModel { | |
GaussMarkov noiseModel; //! [-] Gauss Markov noise generation model | ||
GaussMarkov faultNoiseModel; //! [-] Gauss Markov noise generation model exclusively for CSS fault | ||
Saturate saturateUtility; //! [-] Saturation utility | ||
Eigen::Matrix<double, -1, 1, 0, -1, 1> propagationMatrix; // Store the propagation matrix | ||
}; | ||
|
||
//!@brief Constellation of coarse sun sensors for aggregating output information | ||
/*! This class is a thin container on top of the above coarse-sun sensor class. | ||
It is used to aggregate the output messages of the coarse sun-sensors into a | ||
/*! This class is a thin container on top of the above coarse-sun sensor class. | ||
It is used to aggregate the output messages of the coarse sun-sensors into a | ||
a single output for use by downstream models.*/ | ||
class CSSConstellation: public SysModel { | ||
public: | ||
|
@@ -120,7 +124,7 @@ class CSSConstellation: public SysModel { | |
void Reset(uint64_t CurrentClock); //!< Method for reseting the module | ||
void UpdateState(uint64_t CurrentSimNanos); //!< @brief [-] Main update method for CSS constellation | ||
void appendCSS(CoarseSunSensor *newSensor); //!< @brief [-] Method for adding sensor to list | ||
|
||
public: | ||
Message<CSSArraySensorMsgPayload> constellationOutMsg; //!< [-] CSS constellation output message | ||
std::vector<CoarseSunSensor *> sensorList; //!< [-] List of coarse sun sensors in constellation | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. update module RST file on how to set noise values. |
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
make the getAMatrix()?