Update doublet deconvolution

+ Propagate changes to sigma
+ Fix serious bug in the deconvolution - now we get no negative ghosts!