In the past we acquired and saved the waveform using an old HP oscilloscope. The saved waveform was then analzyed using a program written in HP BASIC on a HP computer. What we are trying to do now is do away with the HP computer, so that we can analyze the data on a Windows based PC.
So far we've got a system that works, we can control the oscilloscope using LabVIEW and then save the FFT results in excel, where equations then calculate the required values. For THF, we are interested in frequencies between 50 - 5000Hz, in mulitlples of 50, which we are able to do now. For TIF, we would be interested in frequency components between 60 - 5000Hz. We have no signal conditioning in our setup. Just a potential transformer that steps down the voltage to safe enough levels for the oscilloscope.