Commit 0192615d authored by Julien Osman's avatar Julien Osman
Browse files

Merge branch 'develop' into 2150-factory-sensor-transforms

parents 8a64b6c2 0049cd73
Pipeline #8125 passed with stages
in 116 minutes
......@@ -398,7 +398,7 @@ deploy:
extends: .general
only:
- develop@orfeotoolbox/otb
- /^release-[0-9]+\.[0-9]+$/@orfeotoolbox/otb
- /^release-[0-9]+\.[0-9]+$/
before_script:
# Provision efficiently the local LFS cache before checkout
- git lfs fetch origin $CI_COMMIT_SHA
......@@ -425,12 +425,13 @@ update-archive:
extends: .general
only:
- develop
- /^release-[0-9]+\.[0-9]+$/@orfeotoolbox/otb
before_script:
# Provision efficiently the local LFS cache before checkout
- git lfs fetch origin $CI_COMMIT_SHA
- git checkout -f -q $CI_COMMIT_SHA
script:
- ./Utilities/Maintenance/SuperbuildDownloadList.sh download build_archive
- ./CI/SuperbuildDownloadList.sh download build_archive
- ./CI/deploy-archive.sh build_archive
needs:
# don't push the archive if Superbuild was not successful
......
......@@ -35,16 +35,20 @@ WGET=$(which wget)
CUR_DIR="$( cd "$( dirname "$0" )" && pwd )"
SB_CMAKE_DIR_REL=$CUR_DIR/../../SuperBuild/CMake
SB_CMAKE_DIR_REL=$CUR_DIR/../SuperBuild/CMake
SB_CMAKE_DIR=$(readlink -f "${SB_CMAKE_DIR_REL}")
cd "$CUR_DIR/../../" || echo "cannot cd to CUR_DIR/../../"
GIT_BRANCH=$(git branch | sed -n -e 's/^\* \(.*\)/\1/p')
#if a branch contains release-X.Y then xdk is taken from packages/xdk/OTB-X.Y
if [[ "$GIT_BRANCH" =~ release-* ]]; then
VERSION=$(echo "${GIT_BRANCH}"| sed 's/.*release-//'| cut -d'-' -f 1)
cd "$CUR_DIR/../" || echo "cannot cd to CUR_DIR/../"
GIT_BRANCH=$(git name-rev --name-only ${GIT_HASH})
# the version is the branch name for develop and release-X.Y branches and the commit short hash for other branches
if [[ ${CI_COMMIT_REF_NAME} =~ develop|release-+[0-9]+\.[0-9] ]] ; then
VERSION=${CI_COMMIT_REF_NAME}
else
VERSION="develop"
GIT_HASH=$(git rev-parse --short HEAD)
VERSION=${GIT_HASH}
fi
CMAKE_FILES=$(find "${SB_CMAKE_DIR}" -maxdepth 1 -type f -name "External_*")
DOWNLOAD_NAMES=
......
......@@ -25,5 +25,11 @@ build_dir=$(readlink -f "$1")
scp ${build_dir}/SuperBuild-archives-*.{tar.bz2,md5} otbpush@otb5-vm2.orfeo-toolbox.org:${jobs_directory}/.
if [ "$CI_COMMIT_REF_NAME" = "develop" ] # check if the branch name is develop or not
then # we are on develop
ssh otbpush@otb5-vm2.orfeo-toolbox.org \
mv ${jobs_directory}/SuperBuild-archives-*.{tar.bz2,md5} ${jobs_directory}/superbuild_archive
\ No newline at end of file
mv ${jobs_directory}/SuperBuild-archives-*.{tar.bz2,md5} ${jobs_directory}/superbuild_archive
else # we are on a release branch
ssh otbpush@otb5-vm2.orfeo-toolbox.org \
mv ${jobs_directory}/SuperBuild-archives-*.{tar.bz2,md5} ${jobs_directory}/staging/
fi
\ No newline at end of file
......@@ -56,8 +56,8 @@ include(ExternalProject)
#mantis: 1193
if(APPLE)
# https://cmake.org/cmake/help/v3.10/variable/CMAKE_SYSTEM_FRAMEWORK_PATH.html
# By default it contains the standard directories for the current system. It
# is not intended to be modified by the project, use CMAKE_FRAMEWORK_PATH
# By default it contains the standard directories for the current system. It
# is not intended to be modified by the project, use CMAKE_FRAMEWORK_PATH
# for this.
set(CMAKE_SYSTEM_FRAMEWORK_PATH "" CACHE PATH "" FORCE)
endif()
......@@ -133,7 +133,7 @@ set(main_project_name ${_OTBModuleMacros_DEFAULT_LABEL})
#-----------------------------------------------------------------------------
# OTB version number.
set(OTB_VERSION_MAJOR "7")
set(OTB_VERSION_MINOR "2")
set(OTB_VERSION_MINOR "3")
set(OTB_VERSION_PATCH "0")
set(OTB_VERSION_STRING "${OTB_VERSION_MAJOR}.${OTB_VERSION_MINOR}.${OTB_VERSION_PATCH}")
......
......@@ -21,7 +21,7 @@ opencv_ml_rtrees:
cat_ofs: [ 0, 0, 0, 0, 0, 0, 0, 0 ]
class_labels: [ 1, 2, 3, 4 ]
missing_subst: [ 0., 0., 0., 0., 0. ]
oob_error: 4.6082949308755760e-03
oob_error: 7.0093457943925233e-03
ntrees: 1
trees:
-
......@@ -31,96 +31,54 @@ opencv_ml_rtrees:
value: 3.
norm_class_idx: 2
splits:
- { var:2, quality:7.5442163085937500e+02,
le:1.5328201293945312e+02 }
- { var:3, quality:9.0135681152343750e+02,
le:1.6233364868164062e+02 }
-
depth: 1
value: 1.
norm_class_idx: 0
splits:
- { var:1, quality:4.9118682861328125e+02,
le:2.7847836303710938e+02 }
-
depth: 2
depth: 1
value: 3.
norm_class_idx: 2
splits:
- { var:3, quality:54., le:1.7026905822753906e+02 }
-
depth: 3
value: 1.
norm_class_idx: 0
- { var:0, quality:6.0693487548828125e+02,
le:2.3812664794921875e+02 }
-
depth: 3
depth: 2
value: 3.
norm_class_idx: 2
-
depth: 2
value: 1.
norm_class_idx: 0
splits:
- { var:0, quality:5.1905541992187500e+02,
le:2.1241384887695312e+02 }
- { var:1, quality:5.1901708984375000e+02,
le:3.1056585693359375e+02 }
-
depth: 3
value: 3.
norm_class_idx: 2
splits:
- { var:2, quality:39., le:1.3915295410156250e+02 }
-
depth: 4
value: 1.
norm_class_idx: 0
-
depth: 4
depth: 3
value: 3.
norm_class_idx: 2
-
depth: 3
value: 1.
norm_class_idx: 0
splits:
- { var:0, quality:4.8239999389648438e+02,
le:2.1394296264648438e+02 }
- { var:3, quality:117., le:2.9698010253906250e+02 }
-
depth: 4
value: 1.
norm_class_idx: 0
value: 2.
norm_class_idx: 1
-
depth: 4
value: 1.
norm_class_idx: 0
-
depth: 1
value: 3.
norm_class_idx: 2
splits:
- { var:3, quality:4.5026675415039062e+02,
le:3.0965036010742188e+02 }
-
depth: 2
value: 2.
norm_class_idx: 1
splits:
- { var:2, quality:97., le:1.6953280639648438e+02 }
-
depth: 3
value: 1.
norm_class_idx: 0
- { var:3, quality:174., le:3.3038479614257812e+02 }
-
depth: 3
value: 2.
norm_class_idx: 1
-
depth: 2
value: 3.
norm_class_idx: 2
splits:
- { var:1, quality:511., le:3.5593637084960938e+02 }
-
depth: 3
value: 3.
norm_class_idx: 2
-
depth: 3
value: 4.
......
mytime : 2009-08-10T10:30:08.142149Z
First try size: 608
Second try size: 312
Third try size: 312
First try size: 496
Second try size: 256
Third try size: 256
OrthoRectification
Output Cartographic Map Projection
12
......@@ -14,3 +14,4 @@ RadarFrequency 9.6e+09
AcquisitionStartTime 2011-04-18T18:03:27.915976Z
AcquisitionStopTime 2011-04-18T18:03:29.380925Z
SAR <SARParam>
SARCalib <SARCalib>
......@@ -2,14 +2,17 @@ SensorID SAR
Mission RADARSAT-2
Instrument RADARSAT-2
ProductType SLC
Polarization HH
OrbitDirection Descending
BeamMode FQ9
AreaOrPoint Area
TileHintX 2822
TileHintY 185
DataType 11
DataType 4
NumberOfLines 12953
NumberOfColumns 2822
AverageSceneHeight 453.201
CalScale 1
PRF 0
RSF 0
RadarFrequency 0
......@@ -18,16 +21,10 @@ LineSpacing 4.8254
PixelSpacing 4.73308
ProductionDate 2008-04-05T13:35:50Z
AcquisitionStartTime 2008-04-05T12:49:00.995676Z
SAR <SARParam>
SARCalib <SARCalib>
GCP <GCPParam>
Extra.FACILITY_IDENTIFIER GATN
Polarization HH
SAR <SARParam>
Polarization VV
SAR <SARParam>
Polarization HV
SAR <SARParam>
Polarization VH
SAR <SARParam>
{"Projection": "GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AXIS["Latitude",NORTH],AXIS["Longitude",EAST],AUTHORITY["EPSG","4326"]]",
[{"GCP_Id": "1", "GCP_Info": "", "GCP_Row": "0.5", "GCP_Col": "0.5", "GCP_X": "-97.5857", "GCP_Y": "49.4039", "GCP_Z": "453.201", },
{"GCP_Id": "2", "GCP_Info": "", "GCP_Row": "0.5", "GCP_Col": "217.5", "GCP_X": "-97.5577", "GCP_Y": "49.4002", "GCP_Z": "453.201", },
......
SensorID SAR
Mission S1A
Instrument SENTINEL-1
Instrument S1A
ProductType SLC
Polarization VV
Mode S6
Swath S6
OrbitDirection ASCENDING
BeamMode SM
BeamSwath S6
AreaOrPoint Area
TileHintX 17663
TileHintY 1
DataType 11
OrbitNumber 6447
NumberOfLines 31106
NumberOfColumns 17663
AverageSceneHeight 19
CalScale 1
PRF 1663.48
RadarFrequency 5.405e+09
CenterIncidenceAngle 44.7171
LineSpacing 4.08568
PixelSpacing 3.19483
AcquisitionDate 2015-06-19T19:50:43.223221Z
ProductionDate 2015-06-20T01:51:06.838854Z
AcquisitionStartTime 2015-06-19T19:50:43.223221Z
AcquisitionStopTime 2015-06-19T19:51:01.921994Z
SAR <SARParam>
SARCalib <SARCalib>
GCP <GCPParam>
Extra.FACILITY_IDENTIFIER UPA_
Polarization VV
Swath S6
NumberOfLines 31106
NumberOfColumns 17663
AverageSceneHeight 19
CalScale 1
PRF 1663.48
RadarFrequency 5.405e+09
SAR <SARParam>
{"Projection": "GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AXIS["Latitude",NORTH],AXIS["Longitude",EAST],AUTHORITY["EPSG","4326"]]",
[{"GCP_Id": "1", "GCP_Info": "", "GCP_Row": "0", "GCP_Col": "0", "GCP_X": "-24.4551", "GCP_Y": "14.4996", "GCP_Z": "0", },
{"GCP_Id": "2", "GCP_Info": "", "GCP_Row": "0", "GCP_Col": "884", "GCP_X": "-24.4171", "GCP_Y": "14.5067", "GCP_Z": "0", },
......
SensorID SAR
Mission TSX-1
ProductType SSC____SM_S
Polarization HH
Mode SM
OrbitDirection DESCENDING
TileHintX 15328
TileHintY 1
DataType 11
OrbitNumber 4091
NumberOfLines 32710
NumberOfColumns 15328
CalScale 1.04345e-05
CalFactor 1.04345e-05
PRF 3832.52
RSF 1.09886e+08
RadarFrequency 9.65e+09
LineSpacing 1.84541
PixelSpacing 1.36411
RangeTimeFirstPixel 0.00422717
RangeTimeLastPixel 0.00436665
AcquisitionStartTime 2008-03-10T13:32:20.083162Z
AcquisitionStopTime 2008-03-10T13:32:28.617747Z
GCP <GCPParam>
Polarization HH
SAR <SARParam>
SARCalib <SARCalib>
GCP <GCPParam>
{"Projection": "GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AXIS["Latitude",NORTH],AXIS["Longitude",EAST],AUTHORITY["EPSG","4326"]]",
[{"GCP_Id": "1", "GCP_Info": "", "GCP_Row": "1", "GCP_Col": "1", "GCP_X": "-111.665", "GCP_Y": "36.2693", "GCP_Z": "0", },
{"GCP_Id": "2", "GCP_Info": "", "GCP_Row": "1", "GCP_Col": "232", "GCP_X": "-111.671", "GCP_Y": "36.2701", "GCP_Z": "0", },
......
SensorID FORMOSAT 2
Mission Formasat 2
AreaOrPoint Point
TileHintX 3000
TileHintY 500
DataType 1
......@@ -47,4 +48,4 @@ LUT1D.ARRAY = 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
{"GCP_Id": "2", "GCP_Info": "", "GCP_Row": "1.5", "GCP_Col": "3000.5", "GCP_X": "1.41679", "GCP_Y": "43.5219", "GCP_Z": "0", },
{"GCP_Id": "3", "GCP_Info": "", "GCP_Row": "3000.5", "GCP_Col": "3000.5", "GCP_X": "1.32096", "GCP_Y": "43.313", "GCP_Z": "0", },
{"GCP_Id": "4", "GCP_Info": "", "GCP_Row": "3000.5", "GCP_Col": "1.5", "GCP_X": "0.960095", "GCP_Y": "43.3803", "GCP_Z": "0", },
]}
\ No newline at end of file
]}
SensorID IKONOS-2
AreaOrPoint Area
TileHintX 3667
TileHintY 256
DataType 3
......
SensorID QB02
Mission Quickbird
ProductType P
AreaOrPoint Area
TileHintX 27552
TileHintY 19
DataType 3
......
SensorID SPOT 5
Mission SPOT 5
AreaOrPoint Point
TileHintX 6000
TileHintY 128
DataType 1
......@@ -47,4 +48,4 @@ LUT1D.ARRAY = 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
{"GCP_Id": "2", "GCP_Info": "", "GCP_Row": "1.5", "GCP_Col": "6000.5", "GCP_X": "51.8029", "GCP_Y": "35.9172", "GCP_Z": "0", },
{"GCP_Id": "3", "GCP_Info": "", "GCP_Row": "6000.5", "GCP_Col": "6000.5", "GCP_X": "51.6467", "GCP_Y": "35.3907", "GCP_Z": "0", },
{"GCP_Id": "4", "GCP_Info": "", "GCP_Row": "6000.5", "GCP_Col": "1.5", "GCP_X": "50.9995", "GCP_Y": "35.5173", "GCP_Z": "0", },
]}
\ No newline at end of file
]}
SensorID WV02
Mission WorldView-2
ProductType Multi
AreaOrPoint Area
TileHintX 1150
TileHintY 455
DataType 3
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment