Updated plot routines

Included the code for getData() in each plot file - allows each to be
independent.