Shape factor calc fixed for tube. Calca sheets added.