Skip to content
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

added a dataset in the datatree for antennaPattern #15

Merged
merged 7 commits into from
Jan 9, 2024

Conversation

vincelhx
Copy link
Contributor

No description provided.

@agrouaze agrouaze self-requested a review December 1, 2023 09:08
@agrouaze agrouaze added the enhancement New feature or request label Dec 1, 2023
@agrouaze
Copy link
Member

agrouaze commented Dec 1, 2023

@vincelhx Thanks for the PR.
Can you:

  1. check that the AntennaPattern is well read for odl and new S-1 products IW, WV and EW ?
  2. check that the doc build correctly: make html
  3. add in this thread the screenshot of the new xr.Dataset added in the datatree ?

@agrouaze agrouaze marked this pull request as draft December 1, 2023 09:18
@vincelhx
Copy link
Contributor Author

vincelhx commented Dec 2, 2023

I did a test on these files :

L1_paths=["/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1b/L1/EW/S1B_EW_GRDM_1S/2015/350/S1B_EW_GRDM_1SDV_20151216T105444_20151216T105548_009066_00003F_7898.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1b/L1/EW/S1B_EW_GRDM_1S/2016/189/S1B_EW_GRDM_1SDH_20160707T191217_20160707T191322_001063_000CDF_9809.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1b/L1/EW/S1B_EW_GRDM_1S/2017/355/S1B_EW_GRDM_1SDV_20171221T073113_20171221T073217_008814_00FB17_78B0.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1b/L1/EW/S1B_EW_GRDM_1S/2018/350/S1B_EW_GRDM_1SDH_20181216T103359_20181216T103504_014066_01A1DC_1D93.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1b/L1/EW/S1B_EW_GRDM_1S/2019/065/S1B_EW_GRDM_1SDV_20190306T135326_20190306T135430_015234_01C808_DE3D.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1b/L1/EW/S1B_EW_GRDM_1S/2020/094/S1B_EW_GRDM_1SDH_20200403T045013_20200403T045113_020975_027C92_249F.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1b/L1/EW/S1B_EW_GRDM_1S/2021/348/S1B_EW_GRDM_1SDH_20211214T164910_20211214T165014_030024_0395BA_7CF5.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1b/L1/EW/S1B_EW_GRDH_1S/2016/151/S1B_EW_GRDH_1SDV_20160530T081009_20160530T081110_000502_0000FB_7268.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1b/L1/IW/S1B_IW_GRDH_1S/2015/350/S1B_IW_GRDH_1SDH_20151216T082314_20151216T082343_009065_000034_18D6.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1b/L1/IW/S1B_IW_GRDH_1S/2016/150/S1B_IW_GRDH_1SDV_20160529T055304_20160529T055333_000486_0000E5_C3D2.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1b/L1/IW/S1B_IW_GRDH_1S/2017/003/S1B_IW_GRDH_1SDV_20170103T024451_20170103T024520_003678_0064FF_EA96.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1b/L1/IW/S1B_IW_GRDH_1S/2018/365/S1B_IW_GRDH_1SDH_20181231T000313_20181231T000342_014278_01A8F6_5010.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1b/L1/IW/S1B_IW_GRDH_1S/2019/002/S1B_IW_GRDH_1SDH_20190102T091305_20190102T091330_014313_01AA17_B52F.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1b/L1/IW/S1B_IW_GRDH_1S/2020/001/S1B_IW_GRDH_1SDH_20200101T102311_20200101T102339_019622_02515E_DD50.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2014/365/S1A_IW_GRDH_1SDV_20141231T150741_20141231T150810_003965_004C59_FA9B.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2015/002/S1A_IW_GRDH_1SDV_20150102T145226_20150102T145255_003994_004CF0_F05B.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2016/001/S1A_IW_GRDH_1SDH_20160101T095732_20160101T095757_009299_00D6EC_2E2B.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2017/002/S1A_IW_GRDH_1SDV_20170102T042206_20170102T042231_014648_017D23_9693.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2018/003/S1A_IW_GRDH_1SDV_20180103T053923_20180103T053948_019986_0220AF_16AB.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2019/002/S1A_IW_GRDH_1SDH_20190102T100625_20190102T100650_025297_02CC6C_6CDD.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2020/001/S1A_IW_GRDH_1SDV_20200101T023616_20200101T023645_030601_038171_8C80.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2021/001/S1A_IW_GRDH_1SDH_20210101T102321_20210101T102346_035943_0435C4_D007.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2022/001/S1A_IW_GRDH_1SDV_20220101T000938_20220101T001003_041260_04E758_218F.SAFE",  
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2014/101/S1A_IW_GRDH_1SDH_20140411T074310_20140411T074335_000108_000057_D63D.SAFE",         
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2015/001/S1A_IW_GRDH_1SDV_20150101T045517_20150101T045542_003973_004C86_7D33.SAFE",         
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2016/001/S1A_IW_GRDH_1SDH_20160101T095732_20160101T095757_009299_00D6EC_2E2B.SAFE",         
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2017/001/S1A_IW_GRDH_1SDV_20170101T002609_20170101T002638_014631_017CA0_484B.SAFE",         
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2018/001/S1A_IW_GRDH_1SDV_20180101T003357_20180101T003422_019954_021FA9_A6E0.SAFE",         
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2019/001/S1A_IW_GRDH_1SDV_20190101T030816_20190101T030841_025278_02CBB7_F88B.SAFE",         
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2020/001/S1A_IW_GRDH_1SDV_20200101T023616_20200101T023645_030601_038171_8C80.SAFE",         
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2021/001/S1A_IW_GRDH_1SDH_20210101T102321_20210101T102346_035943_0435C4_D007.SAFE",         
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2022/001/S1A_IW_GRDH_1SDV_20220101T000938_20220101T001003_041260_04E758_218F.SAFE",         
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2023/306/S1A_IW_GRDH_1SDV_20231102T002153_20231102T002222_051031_06273D_BBB2.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/EW/S1A_EW_GRDH_1S/2014/199/S1A_EW_GRDH_1SDV_20140718T162129_20140718T162233_001544_0017B9_6E8A.SAFE"]

L1_paths +=["/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/EW/S1A_EW_GRDH_1S/2014/199/S1A_EW_GRDH_1SDV_20140718T162129_20140718T162233_001544_0017B9_6E8A.SAFE",
            "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/EW/S1A_EW_GRDH_1S/2015/002/S1A_EW_GRDH_1SDH_20150102T071006_20150102T071024_003989_004CDB_AD4F.SAFE",
            "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/EW/S1A_EW_GRDH_1S/2015/365/S1A_EW_GRDH_1SDH_20151231T055529_20151231T055633_009282_00D66A_6EDE.SAFE"]

It's working excepted for very old files:

/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2014/365/S1A_IW_GRDH_1SDV_20141231T150741_20141231T150810_003965_004C59_FA9B.SAFE could not broadcast input array from shape (323,) into shape (646,)
/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2015/002/S1A_IW_GRDH_1SDV_20150102T145226_20150102T145255_003994_004CF0_F05B.SAFE could not broadcast input array from shape (321,) into shape (642,)
/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2014/101/S1A_IW_GRDH_1SDH_20140411T074310_20140411T074335_000108_000057_D63D.SAFE could not broadcast input array from shape (317,) into shape (634,)
/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2015/001/S1A_IW_GRDH_1SDV_20150101T045517_20150101T045542_003973_004C86_7D33.SAFE could not broadcast input array from shape (289,) into shape (578,)
/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/EW/S1A_EW_GRDH_1S/2014/199/S1A_EW_GRDH_1SDV_20140718T162129_20140718T162233_001544_0017B9_6E8A.SAFE could not broadcast input array from shape (143,) into shape (286,)
/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/EW/S1A_EW_GRDH_1S/2014/199/S1A_EW_GRDH_1SDV_20140718T162129_20140718T162233_001544_0017B9_6E8A.SAFE could not broadcast input array from shape (143,) into shape (286,)
/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/EW/S1A_EW_GRDH_1S/2015/002/S1A_EW_GRDH_1SDH_20150102T071006_20150102T071024_003989_004CDB_AD4F.SAFE could not broadcast input array from shape (130,) into shape (260,)

in these files : antennaPattern.antennaPatternList.antennaPattern.roll do not exists ! So I can't recalibrate these files. What's the best to do ?

@vincelhx
Copy link
Contributor Author

vincelhx commented Dec 2, 2023

I can't m̀ake html since Pandoc is not installed. (i'm pushing from datarmor so i guess i can't install)

Notebook error:
PandocMissing in examples/simple_tutorial.ipynb:
Pandoc wasn't found.
Please check that pandoc is installed:
https://pandoc.org/installing.html
Makefile:20: recipe for target 'html' failed
make: *** [html] Error 2

@vincelhx
Copy link
Contributor Author

vincelhx commented Dec 2, 2023

Here is the screenshot of the new xr.Dataset named antenna_pattern :
image

@vincelhx
Copy link
Contributor Author

vincelhx commented Dec 5, 2023

swathMerging information added in the datatree. Seems to be in annotation even for old files.

image

@vincelhx
Copy link
Contributor Author

vincelhx commented Dec 6, 2023

make hml is working now : no problem with pandoc

@vincelhx
Copy link
Contributor Author

vincelhx commented Dec 6, 2023

I added a condition to add swath_merging Dataset in the datatree only for grd products. else, it's an empty Dataset.

@vincelhx
Copy link
Contributor Author

vincelhx commented Dec 6, 2023

a condition must be add in àntenna_pattern:
roll information (the one needed for recalibration) is not present in old files.

@vincelhx vincelhx marked this pull request as ready for review December 15, 2023 08:54
@vincelhx
Copy link
Contributor Author

need to comment swath_merging

@vincelhx
Copy link
Contributor Author

rename dims_name

@agrouaze
Copy link
Member

I did a test on these files :

L1_paths=["/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1b/L1/EW/S1B_EW_GRDM_1S/2015/350/S1B_EW_GRDM_1SDV_20151216T105444_20151216T105548_009066_00003F_7898.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1b/L1/EW/S1B_EW_GRDM_1S/2016/189/S1B_EW_GRDM_1SDH_20160707T191217_20160707T191322_001063_000CDF_9809.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1b/L1/EW/S1B_EW_GRDM_1S/2017/355/S1B_EW_GRDM_1SDV_20171221T073113_20171221T073217_008814_00FB17_78B0.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1b/L1/EW/S1B_EW_GRDM_1S/2018/350/S1B_EW_GRDM_1SDH_20181216T103359_20181216T103504_014066_01A1DC_1D93.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1b/L1/EW/S1B_EW_GRDM_1S/2019/065/S1B_EW_GRDM_1SDV_20190306T135326_20190306T135430_015234_01C808_DE3D.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1b/L1/EW/S1B_EW_GRDM_1S/2020/094/S1B_EW_GRDM_1SDH_20200403T045013_20200403T045113_020975_027C92_249F.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1b/L1/EW/S1B_EW_GRDM_1S/2021/348/S1B_EW_GRDM_1SDH_20211214T164910_20211214T165014_030024_0395BA_7CF5.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1b/L1/EW/S1B_EW_GRDH_1S/2016/151/S1B_EW_GRDH_1SDV_20160530T081009_20160530T081110_000502_0000FB_7268.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1b/L1/IW/S1B_IW_GRDH_1S/2015/350/S1B_IW_GRDH_1SDH_20151216T082314_20151216T082343_009065_000034_18D6.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1b/L1/IW/S1B_IW_GRDH_1S/2016/150/S1B_IW_GRDH_1SDV_20160529T055304_20160529T055333_000486_0000E5_C3D2.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1b/L1/IW/S1B_IW_GRDH_1S/2017/003/S1B_IW_GRDH_1SDV_20170103T024451_20170103T024520_003678_0064FF_EA96.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1b/L1/IW/S1B_IW_GRDH_1S/2018/365/S1B_IW_GRDH_1SDH_20181231T000313_20181231T000342_014278_01A8F6_5010.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1b/L1/IW/S1B_IW_GRDH_1S/2019/002/S1B_IW_GRDH_1SDH_20190102T091305_20190102T091330_014313_01AA17_B52F.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1b/L1/IW/S1B_IW_GRDH_1S/2020/001/S1B_IW_GRDH_1SDH_20200101T102311_20200101T102339_019622_02515E_DD50.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2014/365/S1A_IW_GRDH_1SDV_20141231T150741_20141231T150810_003965_004C59_FA9B.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2015/002/S1A_IW_GRDH_1SDV_20150102T145226_20150102T145255_003994_004CF0_F05B.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2016/001/S1A_IW_GRDH_1SDH_20160101T095732_20160101T095757_009299_00D6EC_2E2B.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2017/002/S1A_IW_GRDH_1SDV_20170102T042206_20170102T042231_014648_017D23_9693.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2018/003/S1A_IW_GRDH_1SDV_20180103T053923_20180103T053948_019986_0220AF_16AB.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2019/002/S1A_IW_GRDH_1SDH_20190102T100625_20190102T100650_025297_02CC6C_6CDD.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2020/001/S1A_IW_GRDH_1SDV_20200101T023616_20200101T023645_030601_038171_8C80.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2021/001/S1A_IW_GRDH_1SDH_20210101T102321_20210101T102346_035943_0435C4_D007.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2022/001/S1A_IW_GRDH_1SDV_20220101T000938_20220101T001003_041260_04E758_218F.SAFE",  
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2014/101/S1A_IW_GRDH_1SDH_20140411T074310_20140411T074335_000108_000057_D63D.SAFE",         
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2015/001/S1A_IW_GRDH_1SDV_20150101T045517_20150101T045542_003973_004C86_7D33.SAFE",         
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2016/001/S1A_IW_GRDH_1SDH_20160101T095732_20160101T095757_009299_00D6EC_2E2B.SAFE",         
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2017/001/S1A_IW_GRDH_1SDV_20170101T002609_20170101T002638_014631_017CA0_484B.SAFE",         
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2018/001/S1A_IW_GRDH_1SDV_20180101T003357_20180101T003422_019954_021FA9_A6E0.SAFE",         
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2019/001/S1A_IW_GRDH_1SDV_20190101T030816_20190101T030841_025278_02CBB7_F88B.SAFE",         
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2020/001/S1A_IW_GRDH_1SDV_20200101T023616_20200101T023645_030601_038171_8C80.SAFE",         
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2021/001/S1A_IW_GRDH_1SDH_20210101T102321_20210101T102346_035943_0435C4_D007.SAFE",         
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2022/001/S1A_IW_GRDH_1SDV_20220101T000938_20220101T001003_041260_04E758_218F.SAFE",         
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2023/306/S1A_IW_GRDH_1SDV_20231102T002153_20231102T002222_051031_06273D_BBB2.SAFE",
          "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/EW/S1A_EW_GRDH_1S/2014/199/S1A_EW_GRDH_1SDV_20140718T162129_20140718T162233_001544_0017B9_6E8A.SAFE"]

L1_paths +=["/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/EW/S1A_EW_GRDH_1S/2014/199/S1A_EW_GRDH_1SDV_20140718T162129_20140718T162233_001544_0017B9_6E8A.SAFE",
            "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/EW/S1A_EW_GRDH_1S/2015/002/S1A_EW_GRDH_1SDH_20150102T071006_20150102T071024_003989_004CDB_AD4F.SAFE",
            "/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/EW/S1A_EW_GRDH_1S/2015/365/S1A_EW_GRDH_1SDH_20151231T055529_20151231T055633_009282_00D66A_6EDE.SAFE"]

It's working excepted for very old files:

/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2014/365/S1A_IW_GRDH_1SDV_20141231T150741_20141231T150810_003965_004C59_FA9B.SAFE could not broadcast input array from shape (323,) into shape (646,)
/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2015/002/S1A_IW_GRDH_1SDV_20150102T145226_20150102T145255_003994_004CF0_F05B.SAFE could not broadcast input array from shape (321,) into shape (642,)
/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2014/101/S1A_IW_GRDH_1SDH_20140411T074310_20140411T074335_000108_000057_D63D.SAFE could not broadcast input array from shape (317,) into shape (634,)
/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2015/001/S1A_IW_GRDH_1SDV_20150101T045517_20150101T045542_003973_004C86_7D33.SAFE could not broadcast input array from shape (289,) into shape (578,)
/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/EW/S1A_EW_GRDH_1S/2014/199/S1A_EW_GRDH_1SDV_20140718T162129_20140718T162233_001544_0017B9_6E8A.SAFE could not broadcast input array from shape (143,) into shape (286,)
/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/EW/S1A_EW_GRDH_1S/2014/199/S1A_EW_GRDH_1SDV_20140718T162129_20140718T162233_001544_0017B9_6E8A.SAFE could not broadcast input array from shape (143,) into shape (286,)
/home/datawork-cersat-public/cache/project/mpc-sentinel1/data/esa/sentinel-1a/L1/EW/S1A_EW_GRDH_1S/2015/002/S1A_EW_GRDH_1SDH_20150102T071006_20150102T071024_003989_004CDB_AD4F.SAFE could not broadcast input array from shape (130,) into shape (260,)

in these files : antennaPattern.antennaPatternList.antennaPattern.roll do not exists ! So I can't recalibrate these files. What's the best to do ?

We said:

  1. Error raised in the calibration method
  2. return an empty roll in order to avoid error when one just want to to read old SAFE

@vincelhx
Copy link
Contributor Author

Need to indicates new reading time

@vincelhx
Copy link
Contributor Author

vincelhx commented Dec 18, 2023

  • comment swath_merging
  • change dimensions names
  • return an empty roll for old files
  • time diffrence for the reader for the same file

@vincelhx
Copy link
Contributor Author

vincelhx commented Dec 18, 2023

Times after commit :
Mean time for S1A_IW_GRDH_1SDV_20141231T150741_20141231T150810_003965_004C59_FA9B : 0.572 secondes
Mean time for S1B_EW_GRDM_1SDV_20190306T135326_20190306T135430_015234_01C808_DE3D : 1.159 secondes

@vincelhx
Copy link
Contributor Author

vincelhx commented Dec 18, 2023

Times before commit :
Mean time for S1A_IW_GRDH_1SDV_20141231T150741_20141231T150810_003965_004C59_FA9B : 0.448 secondes
Mean time for S1B_EW_GRDM_1SDV_20190306T135326_20190306T135430_015234_01C808_DE3D : 0.961 secondes

@agrouaze
Copy link
Member

So +17% at open. What do you mean by "before/after commit" ? Is it branch origin/main versus vincelhx/main ?

Times before commit : Mean time for S1A_IW_GRDH_1SDV_20141231T150741_20141231T150810_003965_004C59_FA9B : 0.448 secondes Mean time for S1B_EW_GRDM_1SDV_20190306T135326_20190306T135430_015234_01C808_DE3D : 0.961 secondes

@vincelhx
Copy link
Contributor Author

yes. branch origin/main versus vincelhx/main

safe_s1/sentinel1_xml_mappings.py Show resolved Hide resolved
safe_s1/sentinel1_xml_mappings.py Outdated Show resolved Hide resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants