Calculation of new variables needed for Non-id HBT added. (Z. Chajecki)