Skip to content

Move to SXGeo 0.3.1 #45

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.

Sign up for GitHub

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

Open
aburie-cs wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Move to SXGeo 0.3.1 #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1aa98ba
Upgrade to SXGEO 0.3.0 (meaning Orekit 13)
aburie-cs Nov 21, 2025
acff0d7
Cleaning orginal file
aburie-cs Dec 11, 2025
d433fb7
Start rework script to generate references
Dec 17, 2025
0c90a19
Update to SXGEO 0.3.1
Dec 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>esa.sen2vm</groupId>
<artifactId>sen2vm-core</artifactId>
<version>1.0.0</version>
<version>2.0.0</version>

<name>sen2vm-core</name>
<!-- FIXME change it to the project's website -->
Expand All @@ -19,9 +19,9 @@
<jaxb.plugin.version>2.5.0</jaxb.plugin.version>
<!-- cots version -->
<gdal.version>3.6.2</gdal.version>
<sxgeo.version>0.2.1</sxgeo.version>
<sxgeo.orekit-tools.version>1.2</sxgeo.orekit-tools.version>
<sxgeo.hipparchus.version>2.3</sxgeo.hipparchus.version>
<sxgeo.version>0.3.1</sxgeo.version>
<!-- <sxgeo.orekit-tools.version>1.2</sxgeo.orekit-tools.version> -->
<!-- <sxgeo.hipparchus.version>4.0.1</sxgeo.hipparchus.version> -->
<maven.repository.target>sen2vm/sen2vm-core</maven.repository.target>
</properties>

Expand Down Expand Up @@ -80,16 +80,16 @@
<artifactId>sxgeo</artifactId>
<version>${sxgeo.version}</version>
</dependency>
<dependency>
<!-- <dependency>
<groupId>org.hipparchus</groupId>
<artifactId>hipparchus-core</artifactId>
<version>${sxgeo.hipparchus.version}</version>
</dependency>
<dependency>
</dependency> -->
<!-- <dependency>
<groupId>org.orekit</groupId>
<artifactId>orekit-tools</artifactId>
<version>${sxgeo.orekit-tools.version}</version>
</dependency>
</dependency> -->
</dependencies>

<distributionManagement>
Expand Down
8 changes: 6 additions & 2 deletions src/main/java/esa/sen2vm/input/datastrip/DataStripManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ public void initOrekitRessources(String orekitDataPath, String iersFilePath,
else
{
File iersFile = new File(iersFilePath);
FramesFactory.addDefaultEOP2000HistoryLoaders(null, null, null, null, iersFile.getName());
FramesFactory.addDefaultEOP2000HistoryLoaders(null, null, null, null, iersFile.getName(), null);

DataContext.getDefault().getDataProvidersManager().addProvider(new DirectoryCrawler(iersFile.getParentFile()));

Expand Down Expand Up @@ -570,7 +570,11 @@ protected void computeSatellitePVList(Boolean activateAvailableRefining) throws
PVCoordinates pvEME2000 = transform.transformPVCoordinates(pvITRF);

// Convert PV from ITRF to EME2000
TimeStampedPVCoordinates pair = new TimeStampedPVCoordinates(ephemerisDate, pvEME2000.getPosition(), pvEME2000.getVelocity(), Vector3D.ZERO);
TimeStampedPVCoordinates pair = new TimeStampedPVCoordinates(
ephemerisDate,
pvEME2000.getPosition(),
pvEME2000.getVelocity(),
Vector3D.ZERO);

if (dateSet.contains(ephemerisDate))
{
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/esa/sen2vm/utils/IERSutils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import org.orekit.data.DataContext;
import org.orekit.frames.EOPEntry;
import org.orekit.frames.EOPHistoryLoader;
import org.orekit.frames.EopHistoryLoader;
import org.orekit.frames.FramesFactory;
import org.orekit.frames.ITRFVersion;
import org.orekit.time.AbsoluteDate;
Expand Down Expand Up @@ -43,6 +43,7 @@ public static List<EOPEntry> buildEOPList(ITRFVersion itrfType,
list.add(new EOPEntry((int) mjd_inc, dt, Sen2VMConstants.lod,
org.orekit.utils.Constants.ARC_SECONDS_TO_RADIANS * x,
org.orekit.utils.Constants.ARC_SECONDS_TO_RADIANS * y,
Double.NaN, Double.NaN,
Sen2VMConstants.ddPsi, Sen2VMConstants.ddEps,
Sen2VMConstants.dx, Sen2VMConstants.dy, itrfType,
AbsoluteDate.createMJDDate((int) mjd_inc, 0.0, utc)));
Expand All @@ -52,7 +53,7 @@ public static List<EOPEntry> buildEOPList(ITRFVersion itrfType,

public static void setLoaders(IERSConventions conventions, List<EOPEntry> eop)
{
FramesFactory.addEOPHistoryLoader(conventions, new EOPHistoryLoader()
FramesFactory.addEOPHistoryLoader(conventions, new EopHistoryLoader()
{
public void fillHistory(IERSConventions.NutationCorrectionConverter converter,
SortedSet<EOPEntry> history)
Expand Down
39 changes: 39 additions & 0 deletions src/test/reference_generation/Test_generation_ref.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
ssh 172.26.45.33

docker run -it --rm --name asgard-legacy --user root --network host -v ~/.gitconfig:/root/.gitconfig2 -v ~/.m2:/root/.m2 -v /home/aburie/Sen2VM/:/home/aburie/Sen2VM -v $root_dir:$root_dir -v /DATA:/DATA -v /DATA-MPC2:/DATA-MPC2 -v /DATA-NETAPP-MPC:/DATA-NETAPP-MPC registry.eopf.copernicus.eu/geolib/asgard-build-environment bash


export EOPF_PYPI_TOKEN= #TOKEN with access to GEOLIB and especially ASGARD-Legacy and asgard-legacy-drivers
export PIP_EXTRA_INDEX_URL="https://eopf:${EOPF_PYPI_TOKEN}@gitlab.eopf.copernicus.eu/api/v4/projects/14/packages/pypi/simple \
https://eopf:${EOPF_PYPI_TOKEN}@gitlab.eopf.copernicus.eu/api/v4/projects/67/packages/pypi/simple \
https://eopf:${EOPF_PYPI_TOKEN}@gitlab.eopf.copernicus.eu/api/v4/projects/92/packages/pypi/simple \
https://eopf:${EOPF_PYPI_TOKEN}@gitlab.eopf.copernicus.eu/api/v4/projects/171/packages/pypi/simple"

pip install asgard_legacy==1.2.1
pip install asgard_legacy_drivers==0.1.1


pip install termcolor
pip install fiona
pip install rasterio

# UNTIL ASGARD-LEGACY IS CORRECTED
apt-get update
apt-get install nano
nano /usr/local/lib/python3.11/site-packages/asgard_legacy/sensors/sentinel2/msi.py
# TODO ======> remove line 552:
# assert np.issubdtype(pixels.dtype, np.integer)


cd /home/aburie/Sen2VM/sen2vm-core/src/test/reference_generation/

python3.11 test_legacy_sen2vm.py # TODO: Add conf file in input after verifying that hard coded path give consistent results








docker exec -it 85375cc0ac57 bash
Loading
Loading