Merge branch 'develop'

Conflicts:
	python/SoilMoistureBatchExtractAndMosaic2S2Tile.py
	python/SoilMoisturePipeline.py

.settings/language.settings.xml

@@ -11,7 +11,7 @@
             			
             <provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
             			
-            <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-598394472140321343" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+            <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="941863880402804919" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
                 				
                 <language-scope id="org.eclipse.cdt.core.gcc"/>
                 				

python/.project

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>soilmoisturepython</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.python.pydev.PyDevBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.python.pydev.pythonNature</nature>
+	</natures>
+</projectDescription>

python/.pydevproject

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse-pydev version="1.0"?><pydev_project>
+    <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
+        <path>/${PROJECT_DIR_NAME}</path>
+    </pydev_pathproperty>
+    <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+    <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python interpreter</pydev_property>
+</pydev_project>

python/SoilMoistureBatchExtractAndMosaic2S2Tile.py

@@ -77,7 +77,6 @@ def exmos_pipeline(argsformat, mos1, mos2, ref, out):
     app0.SetParameterString("interpolator","nn")
     app0.SetParameterString("inr",ref)
     app0.Execute()
-    print("debug app0")
     
     app1 = otbApplication.Registry.CreateApplication("Superimpose")
     app1.SetParameterString("inm",mos2)
@@ -153,11 +152,9 @@ if __name__ == "__main__":
             
             
             if len(l) == 2 :
-                dejafait.append(indir[l[0]])
-                dejafait.append(indir[l[1]])
-                
                 in1 = os.path.join(indir[l[0]], "Sigma0_VV.img")
                 in2 = os.path.join(indir[l[1]], "Sigma0_VV.img")
+
                 outfile = outfilebase +"_VV.TIF"
                 
                 if os.path.exists(outfile) :        
@@ -167,10 +164,14 @@ if __name__ == "__main__":
                 
                 in1 = os.path.join(indir[l[0]], "incidenceAngleFromEllipsoid.img")
                 in2 = os.path.join(indir[l[1]], "incidenceAngleFromEllipsoid.img")
+
                 outfile = outfilebase +"_THETA.TIF"
                 
                 exmos_pipeline(args.format, in1, in2, args.inref, outfile)
                 
+                dejafait.append(indir[l[0]])
+                dejafait.append(indir[l[1]])
+                
             elif len(l) == 1 :
                 in1 = os.path.join(file, "Sigma0_VV.img")
                 outfile = outfilebase +"_VV.TIF"