- * This constructor is private as users are expected to use the builder - * API with the various {@code withXxx()} methods to set up the instance - * in a readable manner without using a huge amount of parameters. - *
- * @param target the target to attach the detector to - * @param instrument the instrument that will observe the target resolution - * of the access times - * @param maxCheck maximal checking interval (s) - * @param threshold convergence threshold (s) - * @param maxIter maximum number of iterations in the event time search - * @param handler event handler to call at event occurrences - */ - private FOVDetector(final TopocentricFrame target, final Instrument instrument, - final double maxCheck, final double threshold, final int maxIter, - final EventHandler handler) { - super(maxCheck, threshold, maxIter, handler); - - this.instrument = instrument; - this.target = target; - } - - /** - * Get the position/velocity provider of the target . - * - * @return the position/velocity provider of the target - */ - public TopocentricFrame getPVTarget() { - return target; - } - - /** - * The implementation of this g() function relies on the implementation of - * the FieldOfViewDetector but first computes line of sight. If there is no - * line of sight between the satellite and the target, the more expensive - * computation of the FieldOfViewDetector g function is not executed. This - * g() function is positive when the target enters the field of view and - * negative if the target is outside the field of view - * - * @param s - * @return - * @throws OrekitException - */ - @Override - public double g(SpacecraftState s) throws OrekitException { - //only compute the more expensive FieldOfViewDetector g function if - //the target and satellite meet the minimum elevation threshold - return instrument.getFOV().g_FOV(s, target); - } - - @Override - protected FOVDetector create(final double newMaxCheck, final double newThreshold, - final int newMaxIter, final EventHandler newHandler) { - return new FOVDetector(target, instrument, newMaxCheck, newThreshold, newMaxIter, newHandler); - } -} diff --git a/orekit/src/main/java/seakers/orekit/event/detector/FilteredFOVBuilder.java b/orekit/src/main/java/seakers/orekit/event/detector/FilteredFOVBuilder.java new file mode 100644 index 0000000..92e86ed --- /dev/null +++ b/orekit/src/main/java/seakers/orekit/event/detector/FilteredFOVBuilder.java @@ -0,0 +1,19 @@ +package seakers.orekit.event.detector; + +import org.orekit.geometry.fov.FieldOfView; +import org.orekit.propagation.events.EventEnablingPredicateFilter; +import org.orekit.propagation.events.FieldOfViewDetector; +import seakers.orekit.object.CoveragePoint; + +public class FilteredFOVBuilder { + public static EventEnablingPredicateFilter- * The g function value is the angular offset between the target and the {@link FieldOfView#offsetFromBoundary(Vector3D) - * Field Of View boundary}. It is positive if the target is visible within - * the Field Of View and negative if it is outside of the Field Of View, - * including the margin. - *
- *- * As per the previous definition, when the target enters the Field Of View, - * a decreasing event is generated, and when the target leaves the Field Of - * View, an increasing event is generated. - *
- * @param s current state of the spacecraft - * @param target the target to view - * @return - * @throws org.orekit.errors.OrekitException - */ - @Override - protected double g(SpacecraftState s, TopocentricFrame target) throws OrekitException { - // get line of sight in spacecraft frame - final Vector3D targetPosInert - = target.getPVCoordinates(s.getDate(), s.getFrame()).getPosition(); - final Vector3D lineOfSightSC = s.toTransform().transformPosition(targetPosInert); - - return -fov.offsetFromBoundary(lineOfSightSC); - - } - - @Override - public double offsetFromBoundary(Vector3D lineOfSight) { - return fov.offsetFromBoundary(lineOfSight); - } - - @Override - public RealVector g_FOV(RealMatrix lineOfSight) { - double[] out = new double[lineOfSight.getColumnDimension()]; - for(int i=0; i- * The truncation of Field Of View at limb can induce strange results - * for complex Fields Of View. If for example a Field Of View is a - * ring with a hole and part of the ring goes past horizon, then instead - * of having a single loop with a C-shaped boundary, the method will - * still return two loops truncated at the limb, one clockwise and one - * counterclockwise, hence "closing" the C-shape twice. This behavior - * is considered acceptable. - *
- *- * If the carrier is a spacecraft, then the {@code fovToBody} transform - * can be computed from a {@link org.orekit.propagation.SpacecraftState} - * as follows: - *
- *- * Transform inertToBody = state.getFrame().getTransformTo(body.getBodyFrame(), state.getDate()); - * Transform fovToBody = new Transform(state.getDate(), - * state.toTransform().getInverse(), - * inertToBody); - *- *
- * If the carrier is a ground station, located using a topocentric frame - * and managing its pointing direction using a transform between the - * dish frame and the topocentric frame, then the {@code fovToBody} transform - * can be computed as follows: - *
- *- * Transform topoToBody = topocentricFrame.getTransformTo(body.getBodyFrame(), date); - * Transform topoToDish = ... - * Transform fovToBody = new Transform(date, - * topoToDish.getInverse(), - * topoToBody); - *- *
- * Only the raw zone is used, the angular margin is ignored here. - *
- * @param fovToBody transform between the frame in which the Field Of View - * is defined and body frame. - * @param body body surface the Field Of View will be projected on - * @param angularStep step used for boundary loops sampling (radians) - * @return list footprint boundary loops (there may be several independent - * loops if the Field Of View shape is complex) - */ - public List- * The offset is roughly an angle with respect to the closest boundary - * point, corrected by the margin and using some approximation far from the - * Field Of View. It is positive if the target is outside of the Field Of - * view, negative inside, and zero if the point is exactly on the boundary - * (always taking the margin into account). - *
- *- * As Field Of View can have complex shapes that may require long - * computation, when the target point can be proven to be outside of the - * Field Of View, a faster but approximate computation is done, that - * underestimate the offset. This approximation is only performed about 0.01 - * radians outside of the zone and is designed to still return a positive - * value if the full accurate computation would return a positive value. - * When target point is close to the zone (and furthermore when it is inside - * the zone), the full accurate computation is performed. This setup allows - * this offset to be used as a reliable way to detect Field Of View boundary - * crossings, which correspond to sign changes of the offset. - *
- * - * @param lineOfSight line of sight from the center of the Field Of View - * support unit sphere to the target in Field Of View canonical frame - * @return an angular offset negative if the target is visible within the - * Field Of View and positive if it is outside of the Field Of View, - * including the margin (note that this cannot take into account interposing - * bodies) - */ - public double offsetFromBoundary(Vector3D lineOfSight); - - /** - * This g() function is positive when the given target enters the field of - * view and negative if the target is outside the field of view - * - * @param lineOfSight line of sight normalized-vectors from the center of the Field Of - * View support unit sphere to the targets in Field Of View canonical frame. - * The matrix shall be a 3xN matrix where the rows are the x,y,z coordinates - * and N is the number of targets - * @return a vector containing the gvalues. Positive if the target is - * visible within the Field Of View and negative if it is outside of the - * Field Of View, including the margin - */ - public RealVector g_FOV(RealMatrix lineOfSight); -} diff --git a/orekit/src/main/java/seakers/orekit/object/fieldofview/NadirRectangularFOV.java b/orekit/src/main/java/seakers/orekit/object/fieldofview/NadirRectangularFOV.java deleted file mode 100644 index c51482f..0000000 --- a/orekit/src/main/java/seakers/orekit/object/fieldofview/NadirRectangularFOV.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ -package seakers.orekit.object.fieldofview; - -import org.hipparchus.geometry.euclidean.threed.Rotation; -import org.hipparchus.geometry.euclidean.threed.Vector3D; -import org.orekit.bodies.BodyShape; -import org.orekit.errors.OrekitException; -import org.orekit.frames.TopocentricFrame; -import org.orekit.propagation.SpacecraftState; - -/** - * This class models a rectangular field of view. The field of view is defined - * with a center axis, two axes to define the aperture directions, and two half - * aperture angles. - * - * @author nozomihitomi - */ -public class NadirRectangularFOV extends RectangularFieldOfView { - private static final long serialVersionUID = 1559069965493414756L; - - private final BodyShape shape; - - /** - * Build a Field Of View with dihedral shape (i.e. rectangular shape). - * @param acrossTrackHalfAperture FOV half aperture angle in the across-track direction, - * must be less than π/2, i.e. full dihedra must be smaller then - * an hemisphere - * @param alongTrackHalfAperture FOV half aperture angle in the along-track direction, - * must be less than π/2, i.e. full dihedra must be smaller then - * an hemisphere - * @param margin angular margin to apply to the zone (if positive, - * the Field Of View will consider points slightly outside of the - * zone are still visible) - * @param shape the shape of the body to define the nadir direction - * @throws OrekitException - */ - public NadirRectangularFOV( - double acrossTrackHalfAperture, double alongTrackHalfAperture, - double margin, BodyShape shape) throws OrekitException { - this(Vector3D.PLUS_I, acrossTrackHalfAperture, Vector3D.PLUS_J, alongTrackHalfAperture, margin, shape); - } - - /** - * Build a Field Of View with dihedral shape (i.e. rectangular shape). - * @param axis1 FOV dihedral axis 1, in spacecraft frame - * @param halfAperture1 FOV dihedral half aperture angle 1, - * must be less than π/2, i.e. full dihedra must be smaller then - * an hemisphere - * @param axis2 FOV dihedral axis 2, in spacecraft frame - * @param halfAperture2 FOV dihedral half aperture angle 2, - * must be less than π/2, i.e. full dihedra must be smaller then - * an hemisphere - * @param margin angular margin to apply to the zone (if positive, - * the Field Of View will consider points slightly outside of the - * zone are still visible) - * @param shape the shape of the body to define the nadir direction - * @throws OrekitException - */ - public NadirRectangularFOV( - Vector3D axis1, double halfAperture1, - Vector3D axis2, double halfAperture2, - double margin, BodyShape shape) throws OrekitException { - super(Vector3D.PLUS_K, axis1, halfAperture1, axis2, halfAperture2, margin); - this.shape = shape; - } - - - @Override - protected double g(SpacecraftState s, TopocentricFrame target) throws OrekitException { - // get line of sight in spacecraft frame - final Vector3D targetPosInert - = target.getPVCoordinates(s.getDate(), s.getFrame()).getPosition(); - Vector3D spacecraftPosInert = s.getPVCoordinates(s.getFrame()).getPosition(); - Vector3D losInert = spacecraftPosInert.subtract(targetPosInert); - Rotation rot = alignWithNadirAndNormal(getCenter(), getAxis2(), s, s.getOrbit(), shape, s.getFrame()); - Vector3D lineOfSightSC = rot.applyTo(losInert); - //TODO find out why need to take the negative - return -getFov().offsetFromBoundary(lineOfSightSC.negate()); - } - - @Override - public String toString() { - return "NadirRectangularFieldOfView{ HalfAngle1=" + getHalfAperture1() + ", HalfAngle2=" + getHalfAperture2() + "}"; - } - - - -} diff --git a/orekit/src/main/java/seakers/orekit/object/fieldofview/NadirSimpleConicalFOV.java b/orekit/src/main/java/seakers/orekit/object/fieldofview/NadirSimpleConicalFOV.java deleted file mode 100644 index 8992bea..0000000 --- a/orekit/src/main/java/seakers/orekit/object/fieldofview/NadirSimpleConicalFOV.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ -package seakers.orekit.object.fieldofview; - -import org.hipparchus.geometry.euclidean.threed.Vector3D; -import org.orekit.bodies.BodyShape; -import org.orekit.errors.OrekitException; -import org.orekit.frames.TopocentricFrame; -import org.orekit.propagation.SpacecraftState; - -/** - * This field of view models a simple cone that is always pointed nadir - * regardless of the spacecraft attitude. It is defined with a center axis in - * the spacecraft frame of reference, and the half aperture angle. This can be - * used in place of nadir-pointing + SimpleConicalFOV to save on compute time on - * computing the attitude at every time step (this class computes the attitude - * only when computing the g() event function) - * - * @author nozomihitomi - */ -public class NadirSimpleConicalFOV extends SimpleConicalFieldOfView { - - private static final long serialVersionUID = -5871573780685218252L; - - private final BodyShape shape; - - /** - * Constructor to create a simple conical field of view - * - * @param halfAngle FOV half aperture angle [rad], must be less than π/2. - * @param shape the shape of the body to define the nadir direction - */ - public NadirSimpleConicalFOV(double halfAngle, BodyShape shape) { - super(Vector3D.PLUS_K, halfAngle); - this.shape = shape; - } - - /** - * {@inheritDoc} - *- * The g function value is for circular field of views and is the difference - * between FOV half aperture and the absolute value of the angle between - * target direction and field of view center. It is positive inside the FOV - * and negative outside. - *
- * - * @param s the current spacecraft state - * @param target - * @return - * @throws org.orekit.errors.OrekitException - */ - protected double g(SpacecraftState s, TopocentricFrame target) throws OrekitException { - - // Compute target position/velocity at date in spacecraft frame */ - final Vector3D targetPosInert = new Vector3D(1, target.getPVCoordinates(s.getDate(), s.getFrame()).getPosition(), - -1, s.getPVCoordinates().getPosition()); - Vector3D spacecraftToNadirPosition = getSpacecraftToNadirPosition(s, s.getOrbit(), shape, s.getFrame()); - // Target is in the field of view if the absolute value that angle is smaller than FOV half aperture. - // g function value is the difference between FOV half aperture and the absolute value of the angle between - // target direction and field of view center. It is positive inside the FOV and negative outside. - return getHalfAngle() - Vector3D.angle(targetPosInert, spacecraftToNadirPosition); - } - - - @Override - public String toString() { - return "NadirSimpleConicalFieldOfView{" + "halfAngle=" + getHalfAngle() + '}'; - } - -} diff --git a/orekit/src/main/java/seakers/orekit/object/fieldofview/OffNadirRectangularFOV.java b/orekit/src/main/java/seakers/orekit/object/fieldofview/OffNadirRectangularFOV.java deleted file mode 100644 index 8b78493..0000000 --- a/orekit/src/main/java/seakers/orekit/object/fieldofview/OffNadirRectangularFOV.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ -package seakers.orekit.object.fieldofview; - -import org.hipparchus.geometry.Vector; -import org.hipparchus.geometry.euclidean.threed.Rotation; -import org.hipparchus.geometry.euclidean.threed.Vector3D; -import org.orekit.bodies.BodyShape; -import org.orekit.errors.OrekitException; -import org.orekit.frames.TopocentricFrame; -import org.orekit.propagation.SpacecraftState; - -/** - * This class models a rectangular field of view. The field of view is defined - * with a center axis, two axes to define the aperture directions, and two half - * aperture angles. - * - * @author paugarciabuzzi - */ -public class OffNadirRectangularFOV extends RectangularFieldOfView { - private static final long serialVersionUID = 1559069965493414756L; - - private double lookAngle; - - private final BodyShape shape; - - /** - * Build a Field Of View with dihedral shape (i.e. rectangular shape). - * @param lookAngle or off nadir angle [rad] that defines the direction of the FOV center, in spacecraft frame. - * Assumption: center axis is in the the plane perpendicular to the velocity vector (1,0,0). - * @param acrossTrackHalfAperture FOV half aperture angle in the across-track direction, - * must be less than π/2, i.e. full dihedra must be smaller then - * an hemisphere - * @param alongTrackHalfAperture FOV half aperture angle in the along-track direction, - * must be less than π/2, i.e. full dihedra must be smaller then - * an hemisphere - * @param margin angular margin to apply to the zone (if positive, - * the Field Of View will consider points slightly outside of the - * zone are still visible) - * @param shape the shape of the body to define the nadir direction - * @throws OrekitException - */ - public OffNadirRectangularFOV(double lookAngle, double acrossTrackHalfAperture, double alongTrackHalfAperture, - double margin, BodyShape shape) throws OrekitException { - this(new Vector3D(0,Math.sin(lookAngle),Math.cos(lookAngle)), - Vector3D.PLUS_I, acrossTrackHalfAperture, - new Vector3D(0, Math.cos(lookAngle),-Math.sin(lookAngle)), alongTrackHalfAperture, - margin, shape); - this.lookAngle=lookAngle; - } - - /** - * Build a Field Of View with dihedral shape (i.e. rectangular shape). - * @param axis0 that defines the direction of the FOV center, in spacecraft frame - * @param axis1 FOV dihedral axis 1, in spacecraft frame - * @param halfAperture1 FOV dihedral half aperture angle 1, - * must be less than π/2, i.e. full dihedra must be smaller then - * an hemisphere - * @param axis2 FOV dihedral axis 2, in spacecraft frame - * @param halfAperture2 FOV dihedral half aperture angle 2, - * must be less than π/2, i.e. full dihedra must be smaller then - * an hemisphere - * @param margin angular margin to apply to the zone (if positive, - * the Field Of View will consider points slightly outside of the - * zone are still visible) - * @param shape the shape of the body to define the nadir direction - * @throws OrekitException - */ - public OffNadirRectangularFOV(Vector3D axis0, - Vector3D axis1, double halfAperture1, - Vector3D axis2, double halfAperture2, - double margin, BodyShape shape) throws OrekitException { - super(axis0,axis1, halfAperture1, axis2, halfAperture2, margin); - this.shape = shape; - } - - - @Override - protected double g(SpacecraftState s, TopocentricFrame target) throws OrekitException { - // get line of sight in spacecraft frame - final Vector3D targetPosInert - = target.getPVCoordinates(s.getDate(), s.getFrame()).getPosition(); - Vector3D spacecraftPosInert = s.getPVCoordinates(s.getFrame()).getPosition(); - Vector3D losInert = spacecraftPosInert.subtract(targetPosInert); - Rotation rot = alignWithNadirAndNormal(Vector3D.PLUS_K, Vector3D.PLUS_J, s, s.getOrbit(), shape, s.getFrame()); - Vector3D lineOfSightSC = rot.applyTo(losInert); - //TODO find out why need to take the negative - return -getFov().offsetFromBoundary(lineOfSightSC.negate()); - } - - public double getLookAngle() { - return lookAngle; - } - - @Override - public String toString() { - return "OffNadirFieldOfView{ LookAngle="+getLookAngle() + ", HalfAngle1=" + getHalfAperture1() + ", HalfAngle2=" + getHalfAperture2() + "}"; - } - - - -} diff --git a/orekit/src/main/java/seakers/orekit/object/fieldofview/RectangularFieldOfView.java b/orekit/src/main/java/seakers/orekit/object/fieldofview/RectangularFieldOfView.java deleted file mode 100644 index 7569c97..0000000 --- a/orekit/src/main/java/seakers/orekit/object/fieldofview/RectangularFieldOfView.java +++ /dev/null @@ -1,146 +0,0 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ -package seakers.orekit.object.fieldofview; - -import java.util.Objects; -import org.hipparchus.geometry.euclidean.threed.Vector3D; -import org.orekit.errors.OrekitException; -import org.orekit.propagation.events.FieldOfView; - -/** - * This class models a rectangular field of view. The field of view is defined - * with a center axis, two axes to define the aperture directions, and two half - * aperture angles. - * - * @author nozomihitomi - */ -public class RectangularFieldOfView extends CustomFieldOfView { - private static final long serialVersionUID = 1559069965493414756L; - - private final Vector3D center; - - private final Vector3D axis1; - - private final Vector3D axis2; - - private final double halfAperture1; - - private final double halfAperture2; - - - /** - * Build a Field Of View with dihedral shape (i.e. rectangular shape). - * @param center Direction of the FOV center, in spacecraft frame - * @param axis1 FOV dihedral axis 1, in spacecraft frame - * @param halfAperture1 FOV dihedral half aperture angle 1, - * must be less than π/2, i.e. full dihedra must be smaller then - * an hemisphere - * @param axis2 FOV dihedral axis 2, in spacecraft frame - * @param halfAperture2 FOV dihedral half aperture angle 2, - * must be less than π/2, i.e. full dihedra must be smaller then - * an hemisphere - * @param margin angular margin to apply to the zone (if positive, - * the Field Of View will consider points slightly outside of the - * zone are still visible) - * @throws OrekitException - */ - public RectangularFieldOfView(Vector3D center, - Vector3D axis1, double halfAperture1, - Vector3D axis2, double halfAperture2, - double margin) throws OrekitException { - super(new FieldOfView(center, axis1, halfAperture1, axis2, halfAperture2, margin)); - this.center = center; - this.axis1 = axis1; - this.axis2 = axis2; - this.halfAperture1 = halfAperture1; - this.halfAperture2 = halfAperture2; - } - - /** - * Gets the vector defining the center of the field of view - * @return - */ - public Vector3D getCenter() { - return center; - } - - /** - * Gets the first direction defining the rectangular shape - * @return - */ - public Vector3D getAxis1() { - return axis1; - } - - /** - * Gets the second direction defining the rectangular shape - * @return - */ - public Vector3D getAxis2() { - return axis2; - } - - /** - * Gets the first half angle corresponding to the first direction or axis1 - * @return - */ - public double getHalfAperture1() { - return halfAperture1; - } - - /** - * Gets the first half angle corresponding to the first direction or axis1 - * @return - */ - public double getHalfAperture2() { - return halfAperture2; - } - - @Override - public String toString() { - return "RectangularFieldOfView{ HalfAngle1=" + halfAperture1 + ", HalfAngle2=" + halfAperture2 + "}"; - } - - @Override - public int hashCode() { - int hash = 3; - hash = 41 * hash + Objects.hashCode(this.center); - hash = 41 * hash + Objects.hashCode(this.axis1); - hash = 41 * hash + Objects.hashCode(this.axis2); - hash = 41 * hash + (int) (Double.doubleToLongBits(this.halfAperture1) ^ (Double.doubleToLongBits(this.halfAperture1) >>> 32)); - hash = 41 * hash + (int) (Double.doubleToLongBits(this.halfAperture2) ^ (Double.doubleToLongBits(this.halfAperture2) >>> 32)); - return hash; - } - - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final RectangularFieldOfView other = (RectangularFieldOfView) obj; - if (!Objects.equals(this.center, other.center)) { - return false; - } - if (!Objects.equals(this.axis1, other.axis1)) { - return false; - } - if (!Objects.equals(this.axis2, other.axis2)) { - return false; - } - if (Double.doubleToLongBits(this.halfAperture1) != Double.doubleToLongBits(other.halfAperture1)) { - return false; - } - if (Double.doubleToLongBits(this.halfAperture2) != Double.doubleToLongBits(other.halfAperture2)) { - return false; - } - return true; - } - - -} diff --git a/orekit/src/main/java/seakers/orekit/object/fieldofview/SimpleConicalFieldOfView.java b/orekit/src/main/java/seakers/orekit/object/fieldofview/SimpleConicalFieldOfView.java deleted file mode 100644 index b8bfb56..0000000 --- a/orekit/src/main/java/seakers/orekit/object/fieldofview/SimpleConicalFieldOfView.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ -package seakers.orekit.object.fieldofview; - -import java.util.Objects; -import org.hipparchus.geometry.euclidean.threed.Vector3D; -import org.hipparchus.linear.ArrayRealVector; -import org.hipparchus.linear.RealMatrix; -import org.hipparchus.linear.RealVector; -import org.hipparchus.util.FastMath; -import org.orekit.errors.OrekitException; -import org.orekit.frames.TopocentricFrame; -import org.orekit.propagation.SpacecraftState; - -/** - * This field of view models a simple cone. It is defined with a center axis in - * the spacecraft frame of reference, and the half aperture angle. - * - * @author nozomihitomi - */ -public class SimpleConicalFieldOfView extends AbstractFieldOfViewDefinition{ - private static final long serialVersionUID = -5871573780685218252L; - - private final Vector3D centerAxis; - - private final double halfAngle; - - - /** - * The threshold value for cos(halfAngle) - */ - private final double cosAngle; - - - /** - * Constructor to create a simple conical field of view - * - * @param centerAxis Direction of the FOV center, in spacecraft frame - * @param halfAngle FOV half aperture angle, must be less than π/2. - */ - public SimpleConicalFieldOfView(Vector3D centerAxis, double halfAngle) { - super(0.0); - this.centerAxis = centerAxis.normalize(); - this.halfAngle = halfAngle; - this.cosAngle = FastMath.cos(halfAngle); - } - - public Vector3D getCenterAxis() { - return centerAxis; - } - - public double getHalfAngle() { - return halfAngle; - } - - /** - * {@inheritDoc} - *- * The g function value is for circular field of views and is the difference - * between FOV half aperture and the absolute value of the angle between - * target direction and field of view center. It is positive inside the FOV - * and negative outside. - *
- * @param s the current spacecraft state - * @param target - * @return - * @throws org.orekit.errors.OrekitException - */ - protected double g(SpacecraftState s, TopocentricFrame target) throws OrekitException { - - // Compute target position/velocity at date in spacecraft frame */ - final Vector3D targetPosInert = new Vector3D(1, target.getPVCoordinates(s.getDate(), s.getFrame()).getPosition(), - -1, s.getPVCoordinates().getPosition()); - final Vector3D targetPosSat = s.getAttitude().getRotation().applyTo(targetPosInert); - - // Target is in the field of view if the absolute value that angle is smaller than FOV half aperture. - // g function value is the difference between FOV half aperture and the absolute value of the angle between - // target direction and field of view center. It is positive inside the FOV and negative outside. - return halfAngle - Vector3D.angle(targetPosSat, centerAxis); - } - - @Override - public String toString() { - return "SimpleConicalFieldOfView{" + "halfAngle=" + halfAngle + '}'; - } - - @Override - public int hashCode() { - int hash = 5; - hash = 31 * hash + Objects.hashCode(this.centerAxis); - hash = 31 * hash + (int) (Double.doubleToLongBits(this.halfAngle) ^ (Double.doubleToLongBits(this.halfAngle) >>> 32)); - return hash; - } - - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final SimpleConicalFieldOfView other = (SimpleConicalFieldOfView) obj; - if (!Objects.equals(this.centerAxis, other.centerAxis)) { - return false; - } - if (Double.doubleToLongBits(this.halfAngle) != Double.doubleToLongBits(other.halfAngle)) { - return false; - } - return true; - } - - @Override - public double offsetFromBoundary(Vector3D lineOfSight) { - return Vector3D.angle(centerAxis, lineOfSight) - halfAngle; - } - - @Override - public RealVector g_FOV(RealMatrix lineOfSight) { - //Assuming plusK is the nadir direction - return lineOfSight.preMultiply( - new ArrayRealVector(centerAxis.toArray())) - .mapSubtractToSelf(cosAngle); - } - -} diff --git a/orekit/src/main/java/seakers/orekit/propagation/PropagatorFactory.java b/orekit/src/main/java/seakers/orekit/propagation/PropagatorFactory.java index 23279dc..cff3367 100644 --- a/orekit/src/main/java/seakers/orekit/propagation/PropagatorFactory.java +++ b/orekit/src/main/java/seakers/orekit/propagation/PropagatorFactory.java @@ -9,8 +9,11 @@ import org.hipparchus.ode.ODEIntegrator; import org.hipparchus.ode.nonstiff.AdaptiveStepsizeIntegrator; import org.hipparchus.ode.nonstiff.DormandPrince853Integrator; +import org.orekit.attitudes.AttitudeProvider; import org.orekit.bodies.CelestialBodyFactory; import org.orekit.bodies.OneAxisEllipsoid; +import org.orekit.data.DataContext; +import org.orekit.data.DataProvidersManager; import org.orekit.errors.OrekitException; import org.orekit.forces.drag.DragForce; import org.orekit.forces.drag.DragSensitive; @@ -39,6 +42,7 @@ import org.orekit.propagation.analytical.KeplerianPropagator; import org.orekit.propagation.analytical.tle.SGP4; import org.orekit.propagation.analytical.tle.TLE; +import org.orekit.propagation.analytical.tle.TLEPropagator; import org.orekit.propagation.numerical.NumericalPropagator; import org.orekit.utils.Constants; import org.orekit.utils.IERSConventions; @@ -89,20 +93,24 @@ public PropagatorFactory(PropagatorType propType, Properties properties) { } public Propagator createPropagator(Orbit orbit, double mass) throws OrekitException { + return createPropagator(orbit, Propagator.DEFAULT_LAW, mass); + } + + public Propagator createPropagator(Orbit orbit, AttitudeProvider att, double mass) throws OrekitException { switch (propType) { case KEPLERIAN: - return createKeplerianPropagator(orbit, mass); + return createKeplerianPropagator(orbit, att, mass); case J2: - return createJ2Propagator(orbit, mass); + return createJ2Propagator(orbit, att, mass); case NUMERICAL: //MASS PROPAGATION //set integrator steps and tolerances final double dP = 0.001; - final double minStep = 0.00000001; + final double minStep = 0.00001; final double maxStep = 1000; final double initStep = 60; - final double[][] tolerance = NumericalPropagator.tolerances(dP, orbit, OrbitType.EQUINOCTIAL); + final double[][] tolerance = NumericalPropagator.tolerances(dP, orbit, orbit.getType()); double[] absTolerance = tolerance[0]; double[] relTolerance = tolerance[1]; @@ -110,7 +118,20 @@ public Propagator createPropagator(Orbit orbit, double mass) throws OrekitExcept //DormandPrince853 is an implementation of some Runge Kutta method AdaptiveStepsizeIntegrator integrator = new DormandPrince853Integrator(minStep, maxStep, absTolerance, relTolerance); integrator.setInitialStepSize(initStep); - return createNumericalPropagator(orbit,integrator, properties); + return createNumericalPropagator(orbit, att, integrator, properties); + default: + throw new UnsupportedOperationException(String.format("Propagator of type %s is not supported by factory or by this constructor.", propType)); + } + } + + public Propagator createPropagator(TLE tle, double mass) throws OrekitException { + return createPropagator(tle, Propagator.DEFAULT_LAW, mass); + } + + public Propagator createPropagator(TLE tle, AttitudeProvider att, double mass) throws OrekitException { + switch (propType) { + case TLE: + return createTLEPropagator(tle, att, mass); default: throw new UnsupportedOperationException(String.format("Propagator of type %s is not supported by factory or by this constructor.", propType)); } @@ -125,7 +146,11 @@ public Propagator createPropagator(Orbit orbit, double mass) throws OrekitExcept * @throws OrekitException */ private Propagator createKeplerianPropagator(Orbit orbit, double mass) throws OrekitException { - return new KeplerianPropagator(orbit, Propagator.DEFAULT_LAW, orbit.getMu(), mass); + return createKeplerianPropagator(orbit, Propagator.DEFAULT_LAW, mass); + } + + private Propagator createKeplerianPropagator(Orbit orbit, AttitudeProvider att, double mass) throws OrekitException { + return new KeplerianPropagator(orbit, att, orbit.getMu(), mass); } /** @@ -137,11 +162,13 @@ private Propagator createKeplerianPropagator(Orbit orbit, double mass) throws Or * @throws OrekitException */ private Propagator createJ2Propagator(Orbit orbit, double mass) throws OrekitException { - - return new EcksteinHechlerPropagator(orbit, mass, Constants.WGS84_EARTH_EQUATORIAL_RADIUS, + return createJ2Propagator(orbit, Propagator.DEFAULT_LAW, mass); + } + private Propagator createJ2Propagator(Orbit orbit, AttitudeProvider att, double mass) throws OrekitException { + return new EcksteinHechlerPropagator(orbit, att, mass, Constants.WGS84_EARTH_EQUATORIAL_RADIUS, Constants.WGS84_EARTH_MU, Constants.WGS84_EARTH_C20, 0, 0, 0, 0); } - + /** * Creates a TLE propagator * @@ -151,7 +178,11 @@ private Propagator createJ2Propagator(Orbit orbit, double mass) throws OrekitExc * @throws OrekitException */ private Propagator createTLEPropagator(TLE tle, double mass) throws OrekitException { - return new SGP4(tle, Propagator.DEFAULT_LAW, mass); + return createTLEPropagator(tle, Propagator.DEFAULT_LAW, mass); + } + + private Propagator createTLEPropagator(TLE tle, AttitudeProvider att, double mass) throws OrekitException { + return TLEPropagator.selectExtrapolator(tle, att, mass); } /** @@ -163,9 +194,12 @@ private Propagator createTLEPropagator(TLE tle, double mass) throws OrekitExcept * @throws OrekitException */ private Propagator createNumericalPropagator(Orbit orbit, ODEIntegrator integrator, Properties properties) throws OrekitException { + return createNumericalPropagator(orbit, Propagator.DEFAULT_LAW, integrator, properties); + } + private Propagator createNumericalPropagator(Orbit orbit, AttitudeProvider att, ODEIntegrator integrator, Properties properties) throws OrekitException { double mass = Double.parseDouble(properties.getProperty("orekit.propagator.mass", "10")); SpacecraftState s = new SpacecraftState(orbit, mass); - NumericalPropagator prop = new NumericalPropagator(integrator); + NumericalPropagator prop = new NumericalPropagator(integrator, att); prop.setInitialState(s); prop.setOrbitType(orbit.getType()); prop.setPositionAngleType(PositionAngle.MEAN); @@ -186,11 +220,12 @@ private Propagator createNumericalPropagator(Orbit orbit, ODEIntegrator integrat double dragArea = Double.parseDouble(properties.getProperty("orekit.propagator.dragarea", "10")); double dragCoeff = Double.parseDouble(properties.getProperty("orekit.propagator.dragcoeff", "2.2")); - String supportedNames = "(?:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\\p{Digit}\\p{Digit}\\p{Digit}\\p{Digit}F10\\.(?:txt|TXT)"; - MarshallSolarActivityFutureEstimation.StrengthLevel strengthlevel = MarshallSolarActivityFutureEstimation.StrengthLevel.AVERAGE; - DTM2000InputParameters parameters = new MarshallSolarActivityFutureEstimation(supportedNames, strengthlevel); - - Atmosphere atmosphere = new DTM2000(parameters, CelestialBodyFactory.getSun(), earth); + MarshallSolarActivityFutureEstimation msafe = + new MarshallSolarActivityFutureEstimation(MarshallSolarActivityFutureEstimation.DEFAULT_SUPPORTED_NAMES, + MarshallSolarActivityFutureEstimation.StrengthLevel.AVERAGE); + final DataProvidersManager manager = DataContext.getDefault().getDataProvidersManager(); + manager.feed(msafe.getSupportedNames(), msafe); + Atmosphere atmosphere = new DTM2000(msafe, CelestialBodyFactory.getSun(), earth); DragSensitive spacecraft = new IsotropicDrag(dragArea, dragCoeff); prop.addForceModel(new DragForce(atmosphere, spacecraft)); } diff --git a/orekit/src/main/java/seakers/orekit/test_LTAN2RAAN.java b/orekit/src/main/java/seakers/orekit/test_LTAN2RAAN.java index 8a2d4d0..5ac1c6e 100644 --- a/orekit/src/main/java/seakers/orekit/test_LTAN2RAAN.java +++ b/orekit/src/main/java/seakers/orekit/test_LTAN2RAAN.java @@ -5,66 +5,15 @@ */ package seakers.orekit; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; import java.util.Locale; -import java.util.Properties; import java.util.logging.ConsoleHandler; import java.util.logging.Level; import java.util.logging.Logger; -import org.hipparchus.geometry.euclidean.threed.Vector3D; -import seakers.orekit.analysis.Analysis; -import seakers.orekit.analysis.ephemeris.OrbitalElementsAnalysis; -import seakers.orekit.constellations.Walker; -import seakers.orekit.coverage.access.TimeIntervalArray; -import seakers.orekit.object.CoverageDefinition; -import seakers.orekit.object.CoveragePoint; -import seakers.orekit.object.Instrument; -import seakers.orekit.object.Satellite; -import seakers.orekit.object.fieldofview.NadirSimpleConicalFOV; -import seakers.orekit.object.linkbudget.LinkBudget; -import seakers.orekit.propagation.PropagatorFactory; -import seakers.orekit.propagation.PropagatorType; -import seakers.orekit.scenario.Scenario; -import seakers.orekit.scenario.ScenarioIO; + import seakers.orekit.util.Orbits; import seakers.orekit.util.OrekitConfig; -import org.hipparchus.stat.descriptive.DescriptiveStatistics; import org.hipparchus.util.FastMath; -import org.orekit.bodies.BodyShape; -import org.orekit.bodies.GeodeticPoint; -import org.orekit.bodies.OneAxisEllipsoid; import org.orekit.errors.OrekitException; -import org.orekit.frames.Frame; -import org.orekit.frames.FramesFactory; -import org.orekit.orbits.KeplerianOrbit; -import org.orekit.orbits.Orbit; -import org.orekit.orbits.PositionAngle; -import org.orekit.propagation.Propagator; -import org.orekit.propagation.SpacecraftState; -import org.orekit.time.AbsoluteDate; -import org.orekit.time.TimeScale; -import org.orekit.time.TimeScalesFactory; -import org.orekit.utils.Constants; -import org.orekit.utils.IERSConventions; -import org.orekit.utils.TimeStampedPVCoordinates; -import seakers.orekit.analysis.ephemeris.HohmannTransferAnalysis; -import seakers.orekit.analysis.vectors.VectorAnalisysEclipseSunlightDiffDrag; -import seakers.orekit.coverage.analysis.AnalysisMetric; -import seakers.orekit.coverage.analysis.GroundEventAnalyzer; -import seakers.orekit.event.EventAnalysis; -import seakers.orekit.event.EventAnalysisEnum; -import seakers.orekit.event.EventAnalysisFactory; -import seakers.orekit.event.FieldOfViewEventAnalysis; -import seakers.orekit.event.GroundBodyAngleEventAnalysis; -import seakers.orekit.object.Constellation; -import static seakers.orekit.object.CoverageDefinition.GridStyle.EQUAL_AREA; -import static seakers.orekit.object.CoverageDefinition.GridStyle.UNIFORM; -import seakers.orekit.object.OrbitWizard; -import seakers.orekit.object.fieldofview.NadirRectangularFOV; /** *