Hang on, sorry, I think I see.  A lot of the stuff here has been moved to `NumpyHelper.h` so that it can be used by the shapelet stuff, correct?