simplified nodf calculations in analyses.R and import.R
fixed bug related to change in function matNODF