Merge code from MLL_data
Merge bagOfns.py from cfelsgi
Merged Ptychography.py from cfelsgi
Update python_scripts from MLL_data branch
Merge python_scripts/Ptychography.py from ERA_both
Merged changes to python_scripts from MLL_data
Add a gpu Pmod routine
add a timer to unitTest_2d.py
Add 2d gpu Ptychography (ERA_sample) with no wrapping
Add support for ERA_sample 1d sample
Broken attempt to impliment 2xgpu
Add support for masking the diffraction data
Fixed masking
Add ERA_probe support for gpu.
Add shift and complex constant invariant error metric (fidelity)
Add ERA_both support for gpu
Add Thib sample probe and both for gpu
Copy Ptyhography.py from master
copy unit tests over to solve conflict