Merge branch 'mpd'

MMVII/MMVII-RessourceDir/SysCo/NONE.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="ISO8859-1" standalone="yes" ?>
+<Root>
+   <Type>"MMVII_Serialization"</Type>
+   <Version>"0.0.0"</Version>
+   <Data>
+      <SysCoGeo>
+         <Type>"Local"</Type>
+         <Attributes>
+            <Pair>
+               <K>"Name"</K>
+               <V>"NONE"</V>
+            </Pair>
+         </Attributes>
+      </SysCoGeo>
+   </Data>
+</Root>

MMVII/MMVII-UseCaseDataSet/Aerien-Sat/Cmd-Glob.sh

@@ -0,0 +1,6 @@
+set -e
+source Cmd1-Sat.sh  
+source Cmd2-Aerien.sh  
+source Cmd3-Mixt.sh
+
+

MMVII/MMVII-UseCaseDataSet/Aerien-Sat/Cmd1-Sat.sh

@@ -0,0 +1,49 @@
+set -e
+#MMVII  ImportInitExtSens  IMG_PNEO3_202309051055014_PAN_SEN_PWOI_000129104_1_1_F_1_P_R1C1.tif [IMG_PNEO3_202309051055014_PAN_SEN_PWOI_000129104_1_1_F_1_P_R1C1.tif,../PNEO/000129104_1_1_STD_A/IMG_01_PNEO3_MS-FS/RPC_PNEO3_202309051055014_MS-FS_SEN_PWOI_000129104_1_1_F_1.XML] WGS84 ExtPatFile=0
+
+
+#MMVII  ImportInitExtSens  IMG_PNEO3_202309051055194_PAN_SEN_PWOI_000129105_1_1_F_1_P_R1C1.tif [IMG_PNEO3_202309051055194_PAN_SEN_PWOI_000129105_1_1_F_1_P_R1C1.tif,../PNEO/000129105_1_1_STD_A/IMG_01_PNEO3_MS-FS/RPC_PNEO3_202309051055194_MS-FS_SEN_PWOI_000129105_1_1_F_1.XML] WGS84 ExtPatFile=0
+
+#MMVII  ImportInitExtSens  IMG_PNEO4_202309081102245_PAN_SEN_PWOI_000129106_1_1_F_1_P_R1C1.tif [IMG_PNEO4_202309081102245_PAN_SEN_PWOI_000129106_1_1_F_1_P_R1C1.tif,../PNEO/000129106_1_1_STD_A/IMG_01_PNEO4_MS-FS/RPC_PNEO4_202309081102245_MS-FS_SEN_PWOI_000129106_1_1_F_1.XML] WGS84 ExtPatFile=0
+
+#MMVII  ImportInitExtSens  IMG_PNEO4_202309081102495_PAN_SEN_PWOI_000129107_1_1_F_1_P_R1C1.tif [IMG_PNEO4_202309081102495_PAN_SEN_PWOI_000129107_1_1_F_1_P_R1C1.tif,../PNEO/000129107_1_1_STD_A/IMG_01_PNEO4_MS-FS/RPC_PNEO4_202309081102495_MS-FS_SEN_PWOI_000129107_1_1_F_1.XML] WGS84 ExtPatFile=0
+
+#RPC_PNEO3_202309051055014_PAN_SEN_PWOI_000129104_1_1_F_1.XML
+#IMG_PNEO3_202309051055014_PAN_SEN_PWOI_000129104_1_1_F_1_P_R1C1.tif
+
+
+#   Create  Sets 
+MMVII EditSet ImPNEO.xml += IMG_PNEO3_202309051055014_PAN_SEN_PWOI_000129104_1_1_F_1_P_R1C1.tif ExtPatFile=0
+MMVII EditSet ImPNEO.xml += IMG_PNEO3_202309051055194_PAN_SEN_PWOI_000129105_1_1_F_1_P_R1C1.tif ExtPatFile=0
+MMVII EditSet ImPNEO.xml += IMG_PNEO4_202309081102245_PAN_SEN_PWOI_000129106_1_1_F_1_P_R1C1.tif ExtPatFile=0
+MMVII EditSet ImPNEO.xml += IMG_PNEO4_202309081102495_PAN_SEN_PWOI_000129107_1_1_F_1_P_R1C1.tif ExtPatFile=0
+
+
+
+#  Import Sat data
+MMVII ImportInitExtSens  ImPNEO.xml  ['IMG(.*)_P_R1C1.tif','ExternalData/RPC$1.XML'] SatWGS84
+MMVII ImportORGI ExternalData/ORGI_LNR/ 
+
+#  Check import + initial residual
+MMVII TestSensor ImPNEO.xml SatWGS84 InPointsMeasure=ORGI
+MMVII ReportGCP  ImPNEO.xml ORGI SatWGS84
+
+#     RTL SENS
+MMVII SysCoCreateRTL ImPNEO.xml RTL InOri=SatWGS84 z0=0
+MMVII GCPChSysCo RTL ORGI RTLSat SysIn=WGS84Degrees
+MMVII OriChSysCo  ImPNEO.xml RTL   SatWGS84 RTLFix
+
+
+# ==========================================
+
+MMVII OriParametrizeSensor ImPNEO.xml RTLFix RTLD0 0
+MMVII OriParametrizeSensor ImPNEO.xml RTLFix RTLD1 1
+MMVII OriParametrizeSensor ImPNEO.xml RTLFix RTLD2 2
+
+MMVII OriBundleAdj ImPNEO.xml RTLD2  TestAdjSat GCPDir=RTLSat   GCPW=[1,1] TiePWeight=[1,1] TPDir=ORGI
+MMVII ReportGCP  ImPNEO.xml RTLSat TestAdjSat
+
+
+
+
+

MMVII/MMVII-UseCaseDataSet/Aerien-Sat/Cmd2-Aerien.sh

@@ -0,0 +1,56 @@
+set -e
+# ====================================================================
+#  Done in project with full data to select 20 images
+# ====================================================================
+#
+# To create list of files in initial folder :
+#    MMVII EditSet ImAerien.xml =  21FD244720x0001.*tif
+#
+# To filter the set of tie points :
+#
+#   MMVII ImportTiePMul all_liaisons.mes NIXY Vexcell NumL0=1 'PatIm=[.*,$0.tif]' NumByConseq=1 ImFilter=ImAerien.xml
+#    
+#
+
+
+# indicate the meta data image that are not in xif file (here no file, no xif ;-)
+#  Data comes from files s07_UC_Eagle_M3_120.xml, s08_UC_Eagle_M3_120.xml
+#  Dont know the association Camera/Image, but as they are identic 
+MMVII  EditCalcMTDI  Std PPPix ImTest=21FD244720x00015_00614.tif Modif=[21FD2447.*,[13230,8502],0] Save=1
+MMVII  EditCalcMTDI  Std FocalPix ImTest=21FD244720x00015_00614.tif Modif=[21FD2447.*,30975,0] Save=1
+MMVII  EditCalcMTDI  Std ModelCam ImTest=21FD244720x00015_00614.tif Modif=[21FD2447.*,"UltraCam Eagle Mark 3",0] Save=1
+    #  NOTE : this focal in mm will not be used in photogrammety, as focal in pixel has priority, but it is required in identofier creation
+MMVII  EditCalcMTDI  Std Focalmm ImTest=21FD244720x00015_00614.tif Modif=[21FD2447.*,123.9,0] Save=1
+#  Dont use the "cylindric systematism"MMVII  
+#  MMVII  EditCalcMTDI  Std AdditionalName  ImTest=Vol5_21FD8020x00001_01397.tif  Modif=["(Vol[0-9]+).*","\$1",0] Save=1
+
+
+# Import Calibration & Orientations
+MMVII OriCreateCalib ImAerien.xml  CalibInit Degree=[3,1,1]
+MMVII  ImportOri  ExternalData/21FD2447_alt.OPK   NXYZWPK  CalibInit  InitL93Up   NumL0=5 ChgN=[".*","\$0.tif"]   "AngU=degree" "KIsUp=true" FilterImIn=ImAerien.xml SysCo=Lambert93
+
+# Import Tie Poins
+MMVII ImportTiePMul ExternalData/Filtered_all_liaisons.mes NIXY Vexcell NumL0=0 'PatIm=[.*,$0.tif]' NumByConseq=1
+# Quick test on bundle adj to see if orient are likely to be correctly imported
+MMVII   OriBundleAdj ImAerien.xml InitL93Up Test TPDir=Vexcell TiePWeight=[1,1]  PatFzCenters=.*
+
+
+# Import GCP
+MMVII ImportGCP  ExternalData/Filtered_Terrain.APP 'NIXYZ'  AerRTL  ChSys=[Lambert93,RTL]
+MMVII ImportMesImGCP  ExternalData/Filtered_Terrain.MES NIXY AerRTL  'PatIm=[.*,$0.tif]' 
+MMVII OriChSysCo ImAerien.xml RTL  InitL93Up RTLD0
+
+
+MMVII   OriBundleAdj ImAerien.xml RTLD0 Test TPDir=Vexcell TiePWeight=[1,1]  PatFzCenters=.* PPFzCal='[Kbp].*' GCPDir=AerRTL GCPW=[0,0.1]
+
+
+
+#  Put everting in local tangent system
+MMVII OriChSysCo ImAerien.xml RTL  InitL93Up RTLD0
+MMVII OriChSysCo ImAerien.xml RTL  InitL93Up RTLD1
+MMVII OriChSysCo ImAerien.xml RTL  InitL93Up RTLD2
+
+
+
+
+

MMVII/MMVII-UseCaseDataSet/Aerien-Sat/Cmd3-Mixt.sh

@@ -0,0 +1,15 @@
+set -e 
+
+MMVII EditSet AllIm.xml +=  ImAerien.xml
+MMVII EditSet AllIm.xml +=  ImPNEO.xml 
+
+MMVII TiePConvert AllIm.xml MMV1 Mixt  UpSByIm=ScaleImage.xml
+
+
+#  To TEST
+#  MMVII OriBundleAdj  AllIm.xml RTLD0  Test  TPDir=Mixt TiePWeight=[1,1]
+
+MMVII OriBundleAdj  AllIm.xml RTLD0  Test   AddGCPW=[[RTLSat,1,1],[AerRTL,0.1,0.1]]   AddTieP=[[Mixt,1,1],[ORGI,1,1],[Vexcell,1,1]] RefOri=[RTLD0,0.5] PPFzCal='[pbK].*'
+
+MMVII OriBundleAdj  AllIm.xml RTLD0  Test   AddGCPW=[[RTLSat,1,1],[AerRTL,0.1,0.1]]   AddTieP=[[Mixt,1,1],[ORGI,1,1],[Vexcell,1,1]] RefOri=[RTLD0,0.5] PPFzCal='.*'
+