merge code now compatible with updates to spin asymmetry code