GenCarrier2.m and get_pshc.m updated by Olivier Macherey and Gaston Hilkuysen so that variable names match with the publication.