ENH : StripMap chain with Cosmo

include/otbSARCorrelationGridImageFilter.txx

@@ -302,7 +302,7 @@ namespace otb
 
     //////////////////// Requested region for slave ////////////////////
     //int max_shift = 10;
-    int max_shift = 50;
+    int max_shift = 200;
     int firstL, firstC, lastL, lastC; 
     // Transform back into slave region index space with an maximum shift between master and slave
     ImageInIndexType slaveIndex;
@@ -350,7 +350,7 @@ namespace otb
     masterRequestedRegion.PadByRadius( m_PatchSizePerDim / 2 );
     slaveRequestedRegion.PadByRadius( m_PatchSizePerDim / 2 );
     
-    // Crop the fixed region at the fixed's largest possible region
+    // Crop the fixed region at the fixed's largest possible region (or buffered)
      if ( masterRequestedRegion.Crop(masterPtr->GetLargestPossibleRegion()))
       {
 	masterPtr->SetRequestedRegion( masterRequestedRegion );
@@ -511,6 +511,7 @@ namespace otb
 	m_slaveExtractPieceTab[i]->SetRegions(slaveRegion);
 	m_slaveExtractPieceTab[i]->Allocate();
       }
+
   }
 
   /**
@@ -521,7 +522,7 @@ namespace otb
   SARCorrelationGridImageFilter< TImageIn, TImageOut >
   ::AfterThreadedGenerateData()
   {
-    // Get the number of threads
+   // Get the number of threads
     unsigned int nbThreads = this->GetNumberOfThreads();
     
     for (unsigned int i = 0; i < nbThreads; i++) 
@@ -670,6 +671,25 @@ namespace otb
 		slaveCurrentRegion.SetIndex(currentSlaveIndex);
 	      }
 
+	    // Check Size
+	    if (slaveCurrentRegion.GetIndex()[0] + slaveCurrentRegion.GetSize()[0]  > slavePtr->GetLargestPossibleRegion().GetSize()[0]
+		|| slaveCurrentRegion.GetIndex()[1] + slaveCurrentRegion.GetSize()[1]  > slavePtr->GetLargestPossibleRegion().GetSize()[1])
+	      {
+		for(unsigned int i = 0; i < ImageInType::ImageDimension; i++)
+		  {
+		    if (slaveCurrentRegion.GetIndex()[i] + slaveCurrentRegion.GetSize()[i]  > slavePtr->GetLargestPossibleRegion().GetSize()[i])
+		      {
+			currentSlaveSize[i] = slavePtr->GetLargestPossibleRegion().GetSize()[i] - slaveCurrentRegion.GetIndex()[i];
+
+			if (slaveCurrentRegion.GetIndex()[i] >= slavePtr->GetLargestPossibleRegion().GetSize()[i])
+			  {
+			    currentSlaveSize[i] = 0;
+			  }
+		      }
+		  }
+		slaveCurrentRegion.SetSize(currentSlaveSize);
+	      }
+
 	    // Rescale values to adapt the deformation
 	    double rescale_range = masterCurrentRegion.GetSize()[0];
 	    double rescale_azimut = masterCurrentRegion.GetSize()[1];

python_src/diapOTB.py

@@ -35,7 +35,7 @@ from jsonschema import validate
 import os
 import sys
 import argparse
-
+import h5py
 
 import otbApplication as otb
 
@@ -158,7 +158,41 @@ if __name__ == "__main__":
     master_Image_base = os.path.basename(master_Image)
     slave_Image_base = os.path.basename(slave_Image)
 
-    
+    # Check extension (if .h5 => HDF5 file => Cosmo Sensor)
+    master_ext = master_Image.split(".")[-1:]
+    slave_ext = slave_Image.split(".")[-1:]
+
+    print ("master_ext = " + master_ext[0] + "\n")
+    print ("salve_ext = " + slave_ext[0] + "\n")
+
+    if (master_ext[0] == "h5") or (slave_ext[0] == "h5") :
+        master_H5 = h5py.File(master_Image, 'r')
+        slave_H5 = h5py.File(slave_Image, 'r')
+        
+        lDataSet_master = list(master_H5.keys())
+        lDataSet_slave = list(slave_H5.keys())
+
+        if len(lDataSet_master) != 1 or len(lDataSet_slave) != 1 :
+            print("H5 input files does not contain the expected dataset \n")
+            quit()
+
+        if lDataSet_master[0] != "S01" or lDataSet_slave[0] != "S01" :
+            print("H5 input files does not contain the expected dataset \n")
+            quit()
+
+        master_S01 = dict(master_H5['S01'])
+        slave_S01 = dict(slave_H5['S01'])
+            
+        if not 'SBI' in master_S01 or not 'SBI' in slave_S01 :
+            print("H5 input files does not contain the expected dataset \n")
+            quit()
+
+        # Change the name of master and slave image to read directly the //S01/SBI
+        master_Image = "HDF5:" + master_Image + "://S01/SBI"
+        slave_Image = "HDF5:" + slave_Image + "://S01/SBI"
+
+    print("master_Image = " + master_Image + "\n") 
+    print("slave_Image = " + slave_Image + "\n") 
 
     ####################### Pre Processing Chain ##########################
     ######## SARDoppler Application #######