Merge branch 'master' into 'bunch_pattern'
# Conflicts: # __init__.py
Showing
- DSSC1module.py 1 addition, 1 deletionDSSC1module.py
- FastCCD.py 641 additions, 0 deletionsFastCCD.py
- Load.py 6 additions, 2 deletionsLoad.py
- XAS.py 4 additions, 3 deletionsXAS.py
- __init__.py 1 addition, 0 deletions__init__.py
- azimuthal_integrator.py 6 additions, 3 deletionsazimuthal_integrator.py
- knife_edge.py 35 additions, 15 deletionsknife_edge.py
- xgm.py 47 additions, 1 deletionxgm.py
Loading
Please register or sign in to comment