added some constants
in the process of changing the functions for inclusion in particleclass
resolving conflict