Good to hear that you managed to craft your own calibration procedure which actually works 
Hope you’ll share it when you’ll finish it, coz frankly, I gotta feeling that present automatic calibration is a mess. For some reason noone from Lime is looking into it, though (it may be SoapyLMS7 issue - recently it has been discovered that it does not make use of some calibration functions, as noted here).
