From 6f8b5262afc99402d8215b2b15d9a1feaf0243d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABlle=20USSEGLIO?= <gaelle.usseglio@cnes.fr> Date: Mon, 14 Jan 2019 10:21:45 +0000 Subject: [PATCH] ENH : Clean into SARDeramp filter --- include/otbSARDerampImageFilter.txx | 4 ---- python_src/diapOTB_S1IW.py | 9 --------- 2 files changed, 13 deletions(-) diff --git a/include/otbSARDerampImageFilter.txx b/include/otbSARDerampImageFilter.txx index 818f1f9..959caef 100644 --- a/include/otbSARDerampImageFilter.txx +++ b/include/otbSARDerampImageFilter.txx @@ -255,8 +255,6 @@ namespace otb } } - //polySelected = 4; - // Assign m_FM_C0, m_FM_C1, m_FM_C2, m_FM_Tau0 m_FM_C0 = FMRateRecords[polySelected].coef0FMRate; m_FM_C1 = FMRateRecords[polySelected].coef1FMRate; @@ -328,8 +326,6 @@ namespace otb } } - //polySelected = 4; - // Assign m_FM_C0, m_FM_C1, m_FM_C2, m_FM_Tau0 m_DCF_C0 = DCFRecords[polySelected].coef0DCF; m_DCF_C1 = DCFRecords[polySelected].coef1DCF; diff --git a/python_src/diapOTB_S1IW.py b/python_src/diapOTB_S1IW.py index 40cfc4b..c77ffca 100644 --- a/python_src/diapOTB_S1IW.py +++ b/python_src/diapOTB_S1IW.py @@ -427,14 +427,10 @@ if __name__ == "__main__": burstS = os.path.splitext(slave_Image_base)[0] + "_burst" + str(burstId) + ".tif" burstDerampM = os.path.splitext(master_Image_base)[0] + "_burst" + str(burstId) + "_deramp" + ".tif" - #burstDerampM = os.path.join("/work/ADM/hpc/ussegliog/Diapason/DiapOTB/Test_Data_Diapason/IW_firstTest_SACLAY/Diapason/burst" + str(burstId), "14780_SLC_DERAMP.tiff") burstDerampS = os.path.splitext(slave_Image_base)[0] + "_burst" + str(burstId) + "_deramp" + ".tif" - #burstDerampS = os.path.join("/work/ADM/hpc/ussegliog/Diapason/DiapOTB/Test_Data_Diapason/IW_firstTest_SACLAY/Diapason/burst" + str(burstId), "14955_SLC_DERAMP.tiff") master_Image_ML = os.path.splitext(master_Image_base)[0] + "_burst" + str(burstId) + "_ml" + str(ml_azimut) + str(ml_range) + ".tif" - #master_Image_ML = os.path.join("/work/ADM/hpc/ussegliog/Diapason/DiapOTB/Test_Data_Diapason/IW_firstTest_SACLAY/Diapason/burst" + str(burstId), "14780_ml15.tiff") slave_Image_ML = os.path.splitext(slave_Image_base)[0] + "_burst" + str(burstId) + "_ml" + str(ml_azimut) + str(ml_range) + ".tif" - #slave_Image_ML = os.path.join("/work/ADM/hpc/ussegliog/Diapason/DiapOTB/Test_Data_Diapason/IW_firstTest_SACLAY/Diapason/burst" + str(burstId), "14955_ml15.tiff") demProj_Master = "demProj" + "_burst" + str(burstId) +"_Master.tif" @@ -506,13 +502,8 @@ if __name__ == "__main__": appInterferogram.SetParameterString("insarmaster", os.path.join(burst_dir, burstM)) appInterferogram.SetParameterString("incoregistratedslave", os.path.join(burst_dir, burstCoReRerampS)) appInterferogram.SetParameterString("insarslave", os.path.join(burst_dir, burstS)) - #appInterferogram.SetParameterString("insarmaster", os.path.join(burst_dir, burstDerampM)) - #appInterferogram.SetParameterString("incoregistratedslave", os.path.join(burst_dir, slave_Image_CoRe)) - #appInterferogram.SetParameterString("insarslave", os.path.join(burst_dir, burstDerampS)) appInterferogram.SetParameterString("ingrid", os.path.join(burst_dir, fine_grid)) appInterferogram.SetParameterString("incartmeanmaster", os.path.join(burst_dir, master_cartesian_mean)) - #appInterferogram.SetParameterInt("mlran", ml_range) - #appInterferogram.SetParameterInt("mlazi", ml_azimut) appInterferogram.SetParameterInt("mlran", 1) appInterferogram.SetParameterInt("mlazi", 1) appInterferogram.SetParameterInt("marginran", 1) -- GitLab