FIX Bundle-RPC differet height DATUM

micmacIGN · May 22, 2017 · fc45d0b · fc45d0b
1 parent cc82c1b
commit fc45d0b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/uti_phgrm/Apero/cCameraRPC.cpp b/src/uti_phgrm/Apero/cCameraRPC.cpp
@@ -1980,10 +1980,19 @@ if(0)
     aGridCorSys  = aToCorSys->Chang(aGridOrg);
     aGridCorSysTest  = aToCorSys->Chang(aGridOrgTest);
 
+	//update the "Z" aGridImg/aGridImgTest in case of different height DATUM (dirty)
+	for(aK=0; aK<int(aGridImg.size()); aK++)
+		aGridImg.at(aK).z = aGridCorSys.at(aK).z;
+	for(aK=0; aK<int(aGridImgTest.size()); aK++)
+		aGridImgTest.at(aK).z = aGridCorSysTest.at(aK).z;
+
+
     if( ISMETER==true ) 
     if(aGridCorSys.size() < 1500)
         std::cout << aGridCorSys << "\n";
-
+
+
+
     CalculRPC( aGridCorSys, aGridImg,
                aGridCorSysTest, aGridImgTest,
                aDirSNum, aDirLNum, aDirSDen, aDirLDen,
@@ -2015,10 +2024,14 @@ void cRPC::CalculRPC( const vector<Pt3dr> &aGridGround,
                       bool PRECISIONTEST)
 {
 
+    /* Learn direct RPC */
+
     /* Update offset/scale */
     NewImOffScal(aGridImg);
     NewGrOffScal(aGridGround);
 
+    /* Learn direct RPC */
+
     /* Normalise */
     vector<Pt3dr> aGridImgN = NormImAll(aGridImg,0);
 

diff --git a/src/uti_phgrm/MICMAC/FusionCarteProf.cpp b/src/uti_phgrm/MICMAC/FusionCarteProf.cpp
@@ -1259,7 +1259,7 @@ template <class Type> void cFusionCarteProf<Type>::DoOneBloc(int aKB,const Box2d
            {
                 for (aQ0.x = 0 ; aQ0.x < mSzCur.x; aQ0.x++)
                 {
-                     int aNb = aTImNb.get(aQ0);
+                     int aNb = aTImNb.get(aQ0);//the no. of depths/Z for the current cell
                      cTplCelNapPrgDyn<cElPilePrgD> * aTabP = aNap.Data()[aQ0.y][aQ0.x];
                      aTabP[-1].ArgAux()= aPDef;
                      aTabP[-1].SetOwnCost(ToICost(aDefPds));