Skip to content

Commit

Permalink
Merge branch 'mpd'
Browse files Browse the repository at this point in the history
  • Loading branch information
deseilligny committed Feb 16, 2024
2 parents 7d69570 + 01bd6a3 commit ab8380b
Show file tree
Hide file tree
Showing 46 changed files with 2,393 additions and 507 deletions.
2 changes: 1 addition & 1 deletion MMVII/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
## Global configuration
#######################################################
cmake_minimum_required(VERSION 3.15)
project(MMVII VERSION 1.0)
/bin/bash: q : commande introuvable

# strict C++17 required
set(CMAKE_CXX_STANDARD 17)
Expand Down
Binary file modified MMVII/Doc/Communication/Inscrits.txt.dcd
View file
Binary file not shown.
Binary file modified MMVII/Doc/Communication/reponse-mail-type.txt.dcd
View file
Binary file not shown.
36 changes: 36 additions & 0 deletions MMVII/MMVII-UseCaseDataSet/RPC/Info.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
#=== command used to generate "ground truth" data for MMV2 ... assuming MMV1 is correct ;-))
#=== Maintain this command as usefull memory, but no longer execute them as it requires images in MMV1
#=== and dont want to make complicated evolution of MMV1. BTW, the point generated by MMV1 seems "sligthly" false
#
#=== Import RPC to MicMac V1 format
# mm3d Convert2GenBundle SPOT_1A.tif RPC_1A.xml Test
# mm3d Convert2GenBundle SPOT_1B.tif RPC_1B.xml Test
#
#=== Generate virual "perfect" GCP for V1
# mm3d Genepi SPOT_1A.tif Ori-Test/ PostNamePt=_ImA NbProf=2 NbXY=2
# mm3d Genepi SPOT_1B.tif Ori-Test/ PostNamePt=_ImB NbProf=2 NbXY=2
#
#========= Convert V1 to V2
# MMVII V1ConvertGCPIm Genepi-SPOT_1A.tif-Mes2D.xml Genepi-SPOT_1A.tif-Mes3D.xml V1-SPOT
# MMVII V1ConvertGCPIm Genepi-SPOT_1B.tif-Mes2D.xml Genepi-SPOT_1B.tif-Mes3D.xml V1-SPOT


#================= CURRENT PIPELINE, use data generated with XING =============

# TO DO : Add Images 2 name pt + OK no pat 4 edit set
MMVII ImportM32 verif_1A.txt SjiXYZ Xing NumL0=13 NumLast=30 NameIm=SPOT_1A.tif
MMVII ImportM32 verif_1B.txt SjiXYZ Xing NumL0=13 NumLast=30 NameIm=SPOT_1B.tif


MMVII EditSet AllIm.xml = SPOT_1A.tif ExtPatFile=false
MMVII EditSet AllIm.xml += SPOT_1B.tif ExtPatFile=false

MMVII ImportPushbroom AllIm.xml '[SPOT_(.*).tif,RPC_$1.xml]' SPOT_Init

MMVII TestSensor SPOT_1A.tif SPOT_Init InPointsMeasure=Xing
MMVII TestSensor SPOT_1B.tif SPOT_Init InPointsMeasure=Xing





209 changes: 209 additions & 0 deletions MMVII/MMVII-UseCaseDataSet/RPC/RPC_1A.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,209 @@
<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
<Dimap_Document xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="rpc.xsd" version="2.12">
<Metadata_Identification>
<METADATA_FORMAT version="2.12">DIMAP</METADATA_FORMAT>
<METADATA_PROFILE>S7_SENSOR</METADATA_PROFILE>
<METADATA_SUBPROFILE>RPC</METADATA_SUBPROFILE>
<METADATA_LANGUAGE>en</METADATA_LANGUAGE>
</Metadata_Identification>
<Rational_Function_Model>
<Resource_Reference>
<RESOURCE_TITLE version="2.1">NITF</RESOURCE_TITLE>
<RESOURCE_ID>RPC00B</RESOURCE_ID>
</Resource_Reference>
<Global_RFM>
<Direct_Model>
<SAMP_DEN_COEFF_1>1.0</SAMP_DEN_COEFF_1>
<SAMP_DEN_COEFF_2>1.526582529712122E-7</SAMP_DEN_COEFF_2>
<SAMP_DEN_COEFF_3>1.045569455513835E-7</SAMP_DEN_COEFF_3>
<SAMP_DEN_COEFF_4>7.698204972860007E-8</SAMP_DEN_COEFF_4>
<SAMP_DEN_COEFF_5>-1.162531366744908E-6</SAMP_DEN_COEFF_5>
<SAMP_DEN_COEFF_6>-2.107703844267202E-7</SAMP_DEN_COEFF_6>
<SAMP_DEN_COEFF_7>-5.168000181112807E-7</SAMP_DEN_COEFF_7>
<SAMP_DEN_COEFF_8>-4.406033179686962E-7</SAMP_DEN_COEFF_8>
<SAMP_DEN_COEFF_9>-2.477533151898954E-7</SAMP_DEN_COEFF_9>
<SAMP_DEN_COEFF_10>5.478836724955917E-9</SAMP_DEN_COEFF_10>
<SAMP_DEN_COEFF_11>1.266898115487824E-8</SAMP_DEN_COEFF_11>
<SAMP_DEN_COEFF_12>4.922305074640827E-9</SAMP_DEN_COEFF_12>
<SAMP_DEN_COEFF_13>5.637028944549345E-9</SAMP_DEN_COEFF_13>
<SAMP_DEN_COEFF_14>-1.173473105403517E-10</SAMP_DEN_COEFF_14>
<SAMP_DEN_COEFF_15>2.520042713394515E-8</SAMP_DEN_COEFF_15>
<SAMP_DEN_COEFF_16>1.647414226971446E-10</SAMP_DEN_COEFF_16>
<SAMP_DEN_COEFF_17>-8.527427717606574E-11</SAMP_DEN_COEFF_17>
<SAMP_DEN_COEFF_18>2.771100499003457E-9</SAMP_DEN_COEFF_18>
<SAMP_DEN_COEFF_19>2.560041965559067E-9</SAMP_DEN_COEFF_19>
<SAMP_DEN_COEFF_20>-9.144024451885655E-12</SAMP_DEN_COEFF_20>
<SAMP_NUM_COEFF_1>0.004669048507408373</SAMP_NUM_COEFF_1>
<SAMP_NUM_COEFF_2>0.9959430301051296</SAMP_NUM_COEFF_2>
<SAMP_NUM_COEFF_3>-0.0003582340235453199</SAMP_NUM_COEFF_3>
<SAMP_NUM_COEFF_4>0.003028370901347183</SAMP_NUM_COEFF_4>
<SAMP_NUM_COEFF_5>-0.0008131704809591892</SAMP_NUM_COEFF_5>
<SAMP_NUM_COEFF_6>-0.0009966226126465513</SAMP_NUM_COEFF_6>
<SAMP_NUM_COEFF_7>-0.0001160216044353723</SAMP_NUM_COEFF_7>
<SAMP_NUM_COEFF_8>-0.003905039308565116</SAMP_NUM_COEFF_8>
<SAMP_NUM_COEFF_9>8.580250600369539E-6</SAMP_NUM_COEFF_9>
<SAMP_NUM_COEFF_10>-2.814139835247026E-7</SAMP_NUM_COEFF_10>
<SAMP_NUM_COEFF_11>3.31963146388311E-7</SAMP_NUM_COEFF_11>
<SAMP_NUM_COEFF_12>7.125312124991074E-5</SAMP_NUM_COEFF_12>
<SAMP_NUM_COEFF_13>2.222334494889596E-5</SAMP_NUM_COEFF_13>
<SAMP_NUM_COEFF_14>9.846563868939736E-8</SAMP_NUM_COEFF_14>
<SAMP_NUM_COEFF_15>0.0001299482534439346</SAMP_NUM_COEFF_15>
<SAMP_NUM_COEFF_16>1.485449601485917E-6</SAMP_NUM_COEFF_16>
<SAMP_NUM_COEFF_17>9.063145725078412E-9</SAMP_NUM_COEFF_17>
<SAMP_NUM_COEFF_18>4.228814672568641E-6</SAMP_NUM_COEFF_18>
<SAMP_NUM_COEFF_19>5.439990421659319E-8</SAMP_NUM_COEFF_19>
<SAMP_NUM_COEFF_20>4.134968544763947E-11</SAMP_NUM_COEFF_20>
<LINE_DEN_COEFF_1>1.0</LINE_DEN_COEFF_1>
<LINE_DEN_COEFF_2>4.763614781991862E-9</LINE_DEN_COEFF_2>
<LINE_DEN_COEFF_3>1.083417288746136E-8</LINE_DEN_COEFF_3>
<LINE_DEN_COEFF_4>1.505334248438896E-9</LINE_DEN_COEFF_4>
<LINE_DEN_COEFF_5>-3.321250354250239E-7</LINE_DEN_COEFF_5>
<LINE_DEN_COEFF_6>-2.891766315563591E-8</LINE_DEN_COEFF_6>
<LINE_DEN_COEFF_7>-1.313832279630738E-8</LINE_DEN_COEFF_7>
<LINE_DEN_COEFF_8>-2.573993238582038E-7</LINE_DEN_COEFF_8>
<LINE_DEN_COEFF_9>-1.25749951534684E-7</LINE_DEN_COEFF_9>
<LINE_DEN_COEFF_10>-9.098163543753089E-10</LINE_DEN_COEFF_10>
<LINE_DEN_COEFF_11>6.387091935848656E-10</LINE_DEN_COEFF_11>
<LINE_DEN_COEFF_12>-1.000866213908634E-8</LINE_DEN_COEFF_12>
<LINE_DEN_COEFF_13>-7.965150630766747E-10</LINE_DEN_COEFF_13>
<LINE_DEN_COEFF_14>-1.408206195053681E-11</LINE_DEN_COEFF_14>
<LINE_DEN_COEFF_15>-3.718689421046503E-9</LINE_DEN_COEFF_15>
<LINE_DEN_COEFF_16>2.093796677899626E-11</LINE_DEN_COEFF_16>
<LINE_DEN_COEFF_17>-1.130012257259198E-12</LINE_DEN_COEFF_17>
<LINE_DEN_COEFF_18>-9.40546388684768E-10</LINE_DEN_COEFF_18>
<LINE_DEN_COEFF_19>8.848600017448351E-12</LINE_DEN_COEFF_19>
<LINE_DEN_COEFF_20>1.07261785206269E-13</LINE_DEN_COEFF_20>
<LINE_NUM_COEFF_1>0.001342818961450414</LINE_NUM_COEFF_1>
<LINE_NUM_COEFF_2>0.06189725535458115</LINE_NUM_COEFF_2>
<LINE_NUM_COEFF_3>-0.9222668351105443</LINE_NUM_COEFF_3>
<LINE_NUM_COEFF_4>0.01583912327337639</LINE_NUM_COEFF_4>
<LINE_NUM_COEFF_5>-0.001652235648386213</LINE_NUM_COEFF_5>
<LINE_NUM_COEFF_6>-7.565395678572868E-5</LINE_NUM_COEFF_6>
<LINE_NUM_COEFF_7>0.0001163734147202665</LINE_NUM_COEFF_7>
<LINE_NUM_COEFF_8>-0.002221844631091209</LINE_NUM_COEFF_8>
<LINE_NUM_COEFF_9>-0.0005795702926196684</LINE_NUM_COEFF_9>
<LINE_NUM_COEFF_10>-1.706750990306932E-6</LINE_NUM_COEFF_10>
<LINE_NUM_COEFF_11>2.151285115055776E-6</LINE_NUM_COEFF_11>
<LINE_NUM_COEFF_12>2.01255178883311E-5</LINE_NUM_COEFF_12>
<LINE_NUM_COEFF_13>-1.512926457452116E-5</LINE_NUM_COEFF_13>
<LINE_NUM_COEFF_14>2.066064872031167E-8</LINE_NUM_COEFF_14>
<LINE_NUM_COEFF_15>1.359461075421164E-5</LINE_NUM_COEFF_15>
<LINE_NUM_COEFF_16>-2.462603019428134E-6</LINE_NUM_COEFF_16>
<LINE_NUM_COEFF_17>-1.192594396058137E-8</LINE_NUM_COEFF_17>
<LINE_NUM_COEFF_18>4.339609230828492E-6</LINE_NUM_COEFF_18>
<LINE_NUM_COEFF_19>6.338898561592715E-7</LINE_NUM_COEFF_19>
<LINE_NUM_COEFF_20>1.715437552916697E-10</LINE_NUM_COEFF_20>
<ERR_BIAS_X>2.53778E-9</ERR_BIAS_X>
<ERR_BIAS_Y>1.83973E-9</ERR_BIAS_Y>
</Direct_Model>
<Inverse_Model>
<SAMP_DEN_COEFF_1>1.0</SAMP_DEN_COEFF_1>
<SAMP_DEN_COEFF_2>-5.841413362311061E-8</SAMP_DEN_COEFF_2>
<SAMP_DEN_COEFF_3>3.298222024009559E-8</SAMP_DEN_COEFF_3>
<SAMP_DEN_COEFF_4>-4.413300913451823E-8</SAMP_DEN_COEFF_4>
<SAMP_DEN_COEFF_5>-4.986640973316479E-7</SAMP_DEN_COEFF_5>
<SAMP_DEN_COEFF_6>1.031625599642953E-7</SAMP_DEN_COEFF_6>
<SAMP_DEN_COEFF_7>-3.054257420553859E-7</SAMP_DEN_COEFF_7>
<SAMP_DEN_COEFF_8>1.3070755150825E-7</SAMP_DEN_COEFF_8>
<SAMP_DEN_COEFF_9>1.066081274471986E-7</SAMP_DEN_COEFF_9>
<SAMP_DEN_COEFF_10>-6.038659395152837E-9</SAMP_DEN_COEFF_10>
<SAMP_DEN_COEFF_11>-7.532883778004212E-9</SAMP_DEN_COEFF_11>
<SAMP_DEN_COEFF_12>5.861751269998994E-10</SAMP_DEN_COEFF_12>
<SAMP_DEN_COEFF_13>2.57873492654805E-9</SAMP_DEN_COEFF_13>
<SAMP_DEN_COEFF_14>-1.34975328008113E-10</SAMP_DEN_COEFF_14>
<SAMP_DEN_COEFF_15>-9.994197622282548E-9</SAMP_DEN_COEFF_15>
<SAMP_DEN_COEFF_16>2.62761097037703E-10</SAMP_DEN_COEFF_16>
<SAMP_DEN_COEFF_17>6.542023906139686E-11</SAMP_DEN_COEFF_17>
<SAMP_DEN_COEFF_18>9.517621477084112E-10</SAMP_DEN_COEFF_18>
<SAMP_DEN_COEFF_19>6.12786554418156E-10</SAMP_DEN_COEFF_19>
<SAMP_DEN_COEFF_20>-1.207314507370253E-11</SAMP_DEN_COEFF_20>
<SAMP_NUM_COEFF_1>-0.004687217817409571</SAMP_NUM_COEFF_1>
<SAMP_NUM_COEFF_2>1.004061225890897</SAMP_NUM_COEFF_2>
<SAMP_NUM_COEFF_3>-0.0003858283527203082</SAMP_NUM_COEFF_3>
<SAMP_NUM_COEFF_4>-0.003039116534438675</SAMP_NUM_COEFF_4>
<SAMP_NUM_COEFF_5>-0.0008897012932077178</SAMP_NUM_COEFF_5>
<SAMP_NUM_COEFF_6>0.001002198006016013</SAMP_NUM_COEFF_6>
<SAMP_NUM_COEFF_7>-0.0001234849948600005</SAMP_NUM_COEFF_7>
<SAMP_NUM_COEFF_8>0.004006948124683567</SAMP_NUM_COEFF_8>
<SAMP_NUM_COEFF_9>-1.02077023816751E-5</SAMP_NUM_COEFF_9>
<SAMP_NUM_COEFF_10>-7.874021840330328E-7</SAMP_NUM_COEFF_10>
<SAMP_NUM_COEFF_11>-2.031370011284104E-6</SAMP_NUM_COEFF_11>
<SAMP_NUM_COEFF_12>-5.184415926094213E-5</SAMP_NUM_COEFF_12>
<SAMP_NUM_COEFF_13>-2.681816854425182E-5</SAMP_NUM_COEFF_13>
<SAMP_NUM_COEFF_14>9.006526954106408E-7</SAMP_NUM_COEFF_14>
<SAMP_NUM_COEFF_15>0.0001377422578261284</SAMP_NUM_COEFF_15>
<SAMP_NUM_COEFF_16>1.900358820412411E-6</SAMP_NUM_COEFF_16>
<SAMP_NUM_COEFF_17>-1.244644037675722E-7</SAMP_NUM_COEFF_17>
<SAMP_NUM_COEFF_18>5.600132777786417E-6</SAMP_NUM_COEFF_18>
<SAMP_NUM_COEFF_19>-6.02529698296038E-8</SAMP_NUM_COEFF_19>
<SAMP_NUM_COEFF_20>-6.661832625713998E-10</SAMP_NUM_COEFF_20>
<LINE_DEN_COEFF_1>1.0</LINE_DEN_COEFF_1>
<LINE_DEN_COEFF_2>6.85490120130971E-10</LINE_DEN_COEFF_2>
<LINE_DEN_COEFF_3>2.223811398272378E-10</LINE_DEN_COEFF_3>
<LINE_DEN_COEFF_4>-1.670460729797768E-10</LINE_DEN_COEFF_4>
<LINE_DEN_COEFF_5>-3.710643708251753E-8</LINE_DEN_COEFF_5>
<LINE_DEN_COEFF_6>-1.297280589498145E-9</LINE_DEN_COEFF_6>
<LINE_DEN_COEFF_7>4.009879323607028E-9</LINE_DEN_COEFF_7>
<LINE_DEN_COEFF_8>2.46183074908416E-8</LINE_DEN_COEFF_8>
<LINE_DEN_COEFF_9>1.735833961985743E-8</LINE_DEN_COEFF_9>
<LINE_DEN_COEFF_10>1.61592025017747E-11</LINE_DEN_COEFF_10>
<LINE_DEN_COEFF_11>-2.3009292799818E-10</LINE_DEN_COEFF_11>
<LINE_DEN_COEFF_12>-1.031571757749547E-9</LINE_DEN_COEFF_12>
<LINE_DEN_COEFF_13>1.283191623580978E-10</LINE_DEN_COEFF_13>
<LINE_DEN_COEFF_14>-4.928804363377107E-13</LINE_DEN_COEFF_14>
<LINE_DEN_COEFF_15>9.56228821181441E-10</LINE_DEN_COEFF_15>
<LINE_DEN_COEFF_16>2.736822543652501E-10</LINE_DEN_COEFF_16>
<LINE_DEN_COEFF_17>9.943963966835211E-13</LINE_DEN_COEFF_17>
<LINE_DEN_COEFF_18>-1.113332104580839E-12</LINE_DEN_COEFF_18>
<LINE_DEN_COEFF_19>-1.429865065109013E-11</LINE_DEN_COEFF_19>
<LINE_DEN_COEFF_20>1.025856674130395E-14</LINE_DEN_COEFF_20>
<LINE_NUM_COEFF_1>0.001141197458209581</LINE_NUM_COEFF_1>
<LINE_NUM_COEFF_2>0.06740791868926609</LINE_NUM_COEFF_2>
<LINE_NUM_COEFF_3>-1.084318341005327</LINE_NUM_COEFF_3>
<LINE_NUM_COEFF_4>0.01697073892717599</LINE_NUM_COEFF_4>
<LINE_NUM_COEFF_5>0.001983793921084306</LINE_NUM_COEFF_5>
<LINE_NUM_COEFF_6>-2.346849868888248E-5</LINE_NUM_COEFF_6>
<LINE_NUM_COEFF_7>-0.0001278692053487724</LINE_NUM_COEFF_7>
<LINE_NUM_COEFF_8>-0.002283438283027471</LINE_NUM_COEFF_8>
<LINE_NUM_COEFF_9>-0.000739941537923696</LINE_NUM_COEFF_9>
<LINE_NUM_COEFF_10>3.778353767195045E-7</LINE_NUM_COEFF_10>
<LINE_NUM_COEFF_11>1.072725524387352E-6</LINE_NUM_COEFF_11>
<LINE_NUM_COEFF_12>3.955322274387168E-6</LINE_NUM_COEFF_12>
<LINE_NUM_COEFF_13>-1.975110855742961E-5</LINE_NUM_COEFF_13>
<LINE_NUM_COEFF_14>-8.491103387218939E-9</LINE_NUM_COEFF_14>
<LINE_NUM_COEFF_15>1.222233712494531E-6</LINE_NUM_COEFF_15>
<LINE_NUM_COEFF_16>2.650619203889642E-6</LINE_NUM_COEFF_16>
<LINE_NUM_COEFF_17>-1.330964705642838E-8</LINE_NUM_COEFF_17>
<LINE_NUM_COEFF_18>-2.888485383080135E-7</LINE_NUM_COEFF_18>
<LINE_NUM_COEFF_19>1.842879850857447E-7</LINE_NUM_COEFF_19>
<LINE_NUM_COEFF_20>9.79552693621834E-11</LINE_NUM_COEFF_20>
<ERR_BIAS_ROW>-9.899999999999999E-5</ERR_BIAS_ROW>
<ERR_BIAS_COL>0.000206</ERR_BIAS_COL>
</Inverse_Model>
<RFM_Validity>
<Direct_Model_Validity_Domain>
<FIRST_ROW>1</FIRST_ROW>
<FIRST_COL>1</FIRST_COL>
<LAST_ROW>15189</LAST_ROW>
<LAST_COL>26917</LAST_COL>
</Direct_Model_Validity_Domain>
<Inverse_Model_Validity_Domain>
<FIRST_LON>16.5182826718</FIRST_LON>
<FIRST_LAT>20.5850181053</FIRST_LAT>
<LAST_LON>16.9456148557</LAST_LON>
<LAST_LAT>20.8408155942</LAST_LAT>
</Inverse_Model_Validity_Domain>
<LONG_SCALE>0.21427249</LONG_SCALE>
<LONG_OFF>16.73198337</LONG_OFF>
<LAT_SCALE>0.1299568</LAT_SCALE>
<LAT_OFF>20.71361798</LAT_OFF>
<HEIGHT_SCALE>634.0</HEIGHT_SCALE>
<HEIGHT_OFF>1556.411</HEIGHT_OFF>
<SAMP_SCALE>13458.5</SAMP_SCALE>
<SAMP_OFF>13458.5</SAMP_OFF>
<LINE_SCALE>7594.5</LINE_SCALE>
<LINE_OFF>7594.5</LINE_OFF>
</RFM_Validity>
</Global_RFM>
</Rational_Function_Model>
</Dimap_Document>
Loading

0 comments on commit ab8380b

Please sign in to comment.