stash
Merge branch 'IPHC-developer' of https://github.com/smartell/iSCAM into IPHC-developer
merge with steve updates
correct writesimulateddata untested
writesimulatedatafile
Merge branch 'IPHC-developer' of https://github.com/smartell/iSCAM into IPHC-developer