use input file from music to determine deta when there is only one eta_s slice is output in surface.dat
Merge branch 'master' of https://github.com/chunshen1987/iS

Conflicts:
	src/readindata.cpp