Made some additions to sitar_avg_cpd, to help inch my way towards

adding cospectra to that.  Temporary changes (probably) that unless I
ask you to test something, you can ignore for now.  Don't rely on
these additions to stay in the long run, as I think about how I want
to do this.