Commit Graph

434 Commits (f44a0edf1d496da51cc13be70ef82ca890bc6253)

Author SHA1 Message Date
Ryan Burns f44a0edf1d
Merge pull request #158 from rtburns-jpl/odr
Fix violations of ODR
2020-11-18 13:04:31 -08:00
Ryan Burns 74319b24d5 Add missing Inertial.py to Orbit module 2020-11-17 16:18:49 -08:00
Ryan Burns a9cc014094 Enable -fno-common by default to catch ODR violations
This should prevent ODR-violating code in the future
2020-11-17 16:18:49 -08:00
Ryan Burns f65f26e3cc Move global vars from .h to separate TU
These global variables were instantiated in the image_sio.h header
and included into multiple translation units, violating ODR.
They are now marked as 'extern' and declared in a separate TU.
2020-11-17 16:18:42 -08:00
Ryan Burns e751732c0f Privatize sardata structs
These duplicated names spanning translation units violate ODR.
They are only used within their corresponding .c files and thus
can be given static linkage.
2020-11-17 02:58:04 -08:00
Ryan Burns 2e44cabf67 Release 2.4.2
Also adds version info for post-svn releases
2020-11-16 11:37:06 -08:00
Bryan Marfito ab5a867d4b Update runResamp.py
Corrected some spelling errors.
2020-11-07 21:27:46 -08:00
Bryan Marfito ccaad6f47d Update runCrossmul.py
Corrected some spelling errors.
2020-11-07 21:27:28 -08:00
Bryan Marfito 4de4c6314e Update runCoregSd.py
Corrected some spelling errors.
2020-11-07 21:27:12 -08:00
Vincent Schut 5c806c42ce fix for AzimuthNoiseVectors with a lineCount of 1. 2020-11-07 21:26:36 -08:00
Rakib Fiha d50845c87a
Fixed line formating in readme (#198)
* Fix readme format
2020-10-26 08:16:32 -07:00
Eric Fielding c601204942
Added code to stripmapStack/topo.py to work with newer GDAL (#196)
* added option to pass segment number through unpackFrame_UAVSAR

* changed type of segment number

* changed segment type in prepareUAVSAR_coregstack

* Revert "changed type of segment number"

This reverts commit a18c6452d4b5c95ce869dab2ee1e3bcf6ff2b1d9.

* Revert "changed segment type in prepareUAVSAR_coregstack"

This reverts commit 6cf3ebadb3a6e119c6084c8e03b8cc68d7eccc3f.

* changed type of segment number in unpackFrame_UAVSAR

* Added code to stripmapStack/topo.py to explicitly create the `geom_reference/hgt.rdr.vrt` file to work with newer GDAL
2020-10-24 09:36:08 -07:00
Zhang Yunjun 55b9d2c037
topsStack: ignore coreg_secondary images with inconsistent num of bursts (#195)
* ImageLib: fix str syntax

* stackSentl: rename slc workflow merge for consistency

rename the mergeSLC step in "slc" workflow, to be consistent with the other workflows.

* topsStack: check inconsistent num of bursts in secondary images

+ extractCommonValidRegion.py: add dropSecondarysWithDifferentNumberOfBursts() to discard those acquisitions during the common region calculation

+ mergeBursts.py: skip secondarys with inconsistent num of bursts by raise exception and exit

+ s1a_isce_utils.adjustValidSampleLine_V2(): remove a redundant line

Co-authored-by: Zhang Yunjun <yunjunz@users.noreply.github.com>
2020-10-24 09:31:48 -07:00
Vincent Schut 3fb325a51e don't assume sensor.extractImage supports a removeNoise arg 2020-10-19 09:47:24 -07:00
Vincent Schut e34ddf7515 add line to example rtcApp.xml in readme. 2020-10-19 09:47:24 -07:00
Vincent Schut c84509e2d1 implement noise correction parameter for rtcApp. 2020-10-19 09:47:24 -07:00
Vincent Schut b1bbf0f10f implementation of thermal noise removal 2020-10-19 09:47:24 -07:00
Zhang Yunjun 9bfa2dd6db
topsStack: add --num-proc for step topo (#193)
* stackSentl.createParser(): align break line

+ align linebreak of help msg
+ use choices=[] for auto argument checking
+ use (default: %(default)s) to show defult value

* stackSent: bugfix for new paris if ref date is close to recent

This commit fixs the missing pair between the reference date and the new acquisitions, if the reference date is the most recent "num_conn" acquisition.

* Stack: check existing orbit with glob instead of os.path.exist(dir)

* topsStack: add --num-proc for topo step

stackSentinel: add --num-proc to pass the number of parallel processes to topo.py, so that mp.Pool() can be independent of OMP_NUM_THREADS

Co-authored-by: Zhang Yunjun <yunjunz@users.noreply.github.com>
2020-10-09 07:11:48 -07:00
Eric Fielding 6aa2d065c3
added option to pass segment number through unpackFrame_UAVSAR (#171)
* added option to pass segment number through unpackFrame_UAVSAR

* changed type of segment number

* changed segment type in prepareUAVSAR_coregstack

* Revert "changed type of segment number"

This reverts commit a18c6452d4b5c95ce869dab2ee1e3bcf6ff2b1d9.

* Revert "changed segment type in prepareUAVSAR_coregstack"

This reverts commit 6cf3ebadb3a6e119c6084c8e03b8cc68d7eccc3f.

* changed type of segment number in unpackFrame_UAVSAR
2020-10-04 16:30:18 -07:00
Ryan Burns ecf865af0b
CMake: Fix missing modules required for UAVSAR stripmap stack (#180)
* Add missing py2to3 script

* Add missing cosar extension

* Add missing rdf parser

* Add simamplitude module

Co-authored-by: Ryan Burns <rtburns-jpl@users.noreply.github.com>
2020-10-04 11:11:55 -07:00
piyushrpt 5370690b0a Pulling in PR #153 2020-10-04 11:10:24 -07:00
piyushrpt 69418047ff Fix for python3.8 multiprocessing 2020-10-04 11:10:24 -07:00
Ryan Burns ba2cb412ea
Bump autoRIFT 1.0.6 -> 1.0.7 (#191)
Co-authored-by: Ryan Burns <rtburns-jpl@users.noreply.github.com>
2020-09-14 12:52:11 -07:00
Ryan Burns 337dc9c158
Fix python extension linking (#168)
* Silence annoying FindFFTW warnings

* Fix linker errors at import-time

Python extensions are weakly linked, so linker errors can only be
caught at runtime. This commit fixes any such broken extensions,
and adds automated import testing to ctests to prevent future
regressions.

It also adds a helper function `isce2_add_staticlib` which creates a
position-independent static library suitable for usage in multiple
python extensions. This matches the SCons build scripts more closely
and allows for future extensions to be declared in a more terse and
hygienic fashion.

* Update utilLib scripts

* Update combinedLib scripts

* Update offoutliers lib scripts

* Add asa_im_decode cdll

* Update alos lib scripts

* Show ctest output upon failure

* Update DataAccessor scripts

* Remove TARGET_FILE_BASE_NAME

* Remove incomplete stdproc modules (require stanford code)

Co-authored-by: Ryan Burns <rtburns-jpl@users.noreply.github.com>
2020-09-14 10:57:10 -07:00
Zhang Yunjun f14981341d update system call of gdal2isce_xml with python interface
+ update os.system() call of gdal2isce_xml.py with the python function call, in stripmapStack/topo.py and applications/downsampleDEM.py

+ break the long lines in downsampleDEM.py for easy reading
2020-09-12 17:05:33 -07:00
Zhang Yunjun f06d22e02c topsStack/topo: use OMP_NUM_THREADS if available
for the parallel processing with multiprocessing.Pool()
2020-09-12 17:05:33 -07:00
yunjunz 6a02f79277 FilterAndCoh: use fine.cor(.full) for multilooked (full-reso) cpx cor file
topsStack/FilterAndCoherence.py:
+ add .full suffix to the complex coherence filename only if the multilook number is 1
+ for multilook number as 1, do not run looks sub-module

topsStack/Stack.filter_coherence(): add .full suffix only when azLooks * rgLooks == 1

topsStack/mergeBursts.py: add python3 at the top of script
2020-09-12 17:05:33 -07:00
Zhang Yunjun 89839bc453 extractCommonValidRegion: check stack/*.xml file existance
Otherwise, if 'stack' folder exists but is empty, the script will return ERROR as below:

```
/net/kraken/nobak/zyunjun/TonopahSenAT64/stack  already exists.
Replacing master with existing stack.
updating the valid overlap region of:
/net/kraken/nobak/zyunjun/TonopahSenAT64/stack
******************
swath:  1
Traceback (most recent call last):
  File "/home/zyunjun/tools/isce2/contrib/stack/topsStack/extractCommonValidRegion.py", line 109, in <module>
    main()
  File "/home/zyunjun/tools/isce2/contrib/stack/topsStack/extractCommonValidRegion.py", line 95, in main
    topMaster = ut.loadProduct(os.path.join(inps.master , 'IW{0}.xml'.format(swath)))
  File "/home/zyunjun/tools/isce2/contrib/stack/topsStack/s1a_isce_utils.py", line 26, in loadProduct
    obj = pm.loadProduct(xmlname)
  File "/net/kraken/home1/geomod/apps/rhel7/isce2-github/isce/components/iscesys/Component/ProductManager.py", line 25, in loadProduct
    self.load(filename)
  File "/net/kraken/home1/geomod/apps/rhel7/isce2-github/isce/components/iscesys/Component/Configurable.py", line 1407, in load
    tmpProp, tmpFact, tmpMisc = FP.parse(filename)
  File "/net/kraken/home1/geomod/apps/rhel7/isce2-github/isce/components/iscesys/Parsers/XmlParser.py", line 41, in parse
    root = ET.parse(filename)
  File "/net/kraken/home1/geomod/apps/anaconda3/lib/python3.7/xml/etree/ElementTree.py", line 1197, in parse
    tree.parse(source, parser)
  File "/net/kraken/home1/geomod/apps/anaconda3/lib/python3.7/xml/etree/ElementTree.py", line 587, in parse
    source = open(source, "rb")
FileNotFoundError: [Errno 2] No such file or directory: '/net/kraken/nobak/zyunjun/TonopahSenAT64/stack/IW1.xml'
```
2020-09-12 17:05:33 -07:00
Gerald Manipon eadacbdf7a remove stanford component extraction 2020-09-12 16:22:44 -07:00
Gerald Manipon 8f57972eb8 fix autoRIFT build on centos7 and conda python 3.8
- build autoRIFT using yum-installed opencv
- fix conda dependency resolution failure
- update SConfigISCE and SConfigISCE.cuda files for python 3.8
- fix CircleCI jobs
2020-09-12 16:22:44 -07:00
Vincent Schut 278902fd1b
make sure the orbit file glob also finds files starting with S1B (#190) 2020-09-10 12:34:17 -07:00
JYC 1557a05b7b
Update AkimaLib.cpp (#186)
add using namespace bug
2020-08-26 00:00:53 -07:00
Heresh Fattahi b13d06aa3b
Merge pull request #166 from asolarte/main
Add SAOCOM sensor
2020-07-29 15:55:37 -07:00
asolarte 9983be8fe1 Cambios sugeridos por piyushrpt. Archivos modificados:
modificado:     components/isceobj/Sensor/SAOCOM_SLC.py
	modificado:     examples/input_files/reference_SAOCOM.xml
2020-07-27 13:56:07 -03:00
asolarte 5ea7981bfd Cambio en comentario Doppler SAOCOM_SLC.py 2020-07-27 12:01:51 -03:00
asolarte 2098273816 Modificaciones en el archivo de ejemplo
modificado:     examples/input_files/reference_SAOCOM.xml
2020-07-23 21:11:41 -03:00
asolarte 02f6af6910 Cambios en la lectura del polinomio para el cálculo del doppler
modificado:     components/isceobj/Sensor/SAOCOM_SLC.py
2020-07-23 20:42:14 -03:00
Ryan Burns 120b09aa4f
Merge pull request #163 from rtburns-jpl/bake-in-autorift
Bake in autoRIFT and add CMake support
2020-07-23 11:38:31 -07:00
Ryan Burns 2b95d39d98 Add opencv to circleci builds 2020-07-21 18:15:17 -07:00
Ryan Burns b1c8a599ca Add cmake scripts for autoRIFT 2020-07-21 18:04:16 -07:00
asolarte 8c2429b3a5 Incorporación de script para ingesta de datos SAOCOM. Se modifican los siguientes archivos:
modificado:     README.md
	modificado:     components/isceobj/InsarProc/Factories.py
	modificado:     components/isceobj/IsceProc/runPreprocessor.py
	modificado:     components/isceobj/Sensor/CMakeLists.txt
	nuevo archivo:  components/isceobj/Sensor/SAOCOM_SLC.py
	modificado:     components/isceobj/Sensor/SConscript
	modificado:     components/isceobj/Sensor/__init__.py
	modificado:     components/isceobj/StripmapProc/Factories.py
	modificado:     components/isceobj/Util/estimateoffsets/EstimateOffsets.py
	modificado:     components/stdproc/stdproc/__init__.py
	nuevo archivo:  examples/input_files/reference_SAOCOM.xml
2020-07-21 21:47:00 -03:00
Ryan Burns 48b6bfbccb Bake in autoRIFT 2020-07-21 14:52:28 -07:00
piyushrpt 9b3e531ac5 Adding openmp to missing modules 2020-07-18 23:54:07 -07:00
piyushrpt 2cc8178010 Use openmp for resamp_slc 2020-07-18 23:54:07 -07:00
Ryan Burns 9d9bfa0a72
Update name of main branch in CI and docs (#161)
The name of the main branch is now "main".
Documentation and CI scripts are updated accordingly.

Co-authored-by: Ryan Burns <rtburns-jpl@users.noreply.github.com>
2020-07-17 09:10:33 -07:00
Gerald Manipon f09213eb33
various updates from ARIA-related projects (#149)
* add Dockerfile and SConfigISCE to build cuda-enabled modules

* add Dockerfile and SConfigISCE to build cuda-enabled modules

* set correct name

* update for centos7 and cuda-dev image

* restore

* disable GPUampcor

* update

* save

* sync up Dockerfile updates

* fix base image

* change docker image names

* create gpu vs. cpu specific tags

* update with nodata WBD Stitcher

* fix segmentation fault when running sciflo workflows

- remove dependencies that downgrade the `geos` conda package

* sync fix for segmentation fault to cuda builds

* ping ffi to version 1.12.2

Latest version of ffi, 1.13.0, breaks installation of fpm:
```
$ sudo gem install --no-ri --no-rdoc fpm
Fetching: cabin-0.9.0.gem (100%)
Successfully installed cabin-0.9.0
Fetching: backports-3.17.2.gem (100%)
Successfully installed backports-3.17.2
Fetching: arr-pm-0.0.10.gem (100%)
Successfully installed arr-pm-0.0.10
Fetching: clamp-1.0.1.gem (100%)
Successfully installed clamp-1.0.1
Fetching: ffi-1.13.0.gem (100%)
ERROR:  Error installing fpm:
        ffi requires Ruby version >= 2.3.
```
TODO: remove pin when ffi's backwards compatiblity is restored.

* comment out unused import

* add build circleci job to PR tests

* pin ffi in cuda build

* revert logging hackery

* fix "target_include_directories called with non-compilable target type" errors

* Keep source directory for topsStack

Co-authored-by: dustinlo <dustin.k.lo@jpl.nasa.gov>
Co-authored-by: shitong01 <stchin@ntu.edu.sg>
Co-authored-by: Ryan Burns <47790121+rtburns-jpl@users.noreply.github.com>
2020-07-16 16:08:57 -07:00
Ryan Burns 1f947b4e42
Merge pull request #156 from piyushrpt/cmake
Fixing linking order and flags for mdx
2020-07-15 22:06:10 -07:00
piyushrpt 4449e78b79 fixing linking order and flags for mdx
Not using interfaces for motif
2020-07-15 21:43:12 -07:00
Heresh Fattahi bed6895391
Merge pull request #154 from isce-framework/BLM
diversity: replaced oppressive language
2020-07-15 20:33:22 -07:00
Ryan Burns 77d2f053d6
Merge pull request #157 from rtburns-jpl/gfortran10
Add argument mismatch workaround for gfortran 10
2020-07-09 15:19:55 -07:00