Merge branch 'develop'

descriptors/dfc_dsdaps.py

@@ -68,7 +68,20 @@ def run(rasters, treshold=1e4, areas=None, sd=None, moi=None, split=1, split_dim
     for i, cut in enumerate(dcuts):
         view[i*step:(i+1)*step+1] = np.moveaxis(cut, 0, d)
 
-    return descriptors
+    # Merge with original
+    loader = ld2dap.LoadTIFF(rasters)
+    raw_in = ld2dap.RawInput(descriptors, vout.metadata)
+    merger = ld2dap.Merger()
+    final_out = ld2dap.RawOutput()
+    
+    final_out.input = merger
+    merger.input = loader
+    merger.second.input = raw_in
+    
+    loader.run()
+    raw_in.run()
+
+    return final_out.data
 
 def version():
     return 'v0.0'