"README.md" did not exist on "d3a6aebe8c3ce861949ddf21c369f238bb91f6ba"
Merge branch 'DevelopmentRG' into 'DSSC_methods_AS'
# Conflicts: # src/toolbox_scs/detectors/dssc.py
Showing
- VERSION 1 addition, 1 deletionVERSION
- src/toolbox_scs/detectors/__init__.py 6 additions, 6 deletionssrc/toolbox_scs/detectors/__init__.py
- src/toolbox_scs/detectors/azimuthal_integrator.py 11 additions, 7 deletionssrc/toolbox_scs/detectors/azimuthal_integrator.py
- src/toolbox_scs/detectors/dssc.py 74 additions, 45 deletionssrc/toolbox_scs/detectors/dssc.py
- src/toolbox_scs/detectors/dssc_data.py 8 additions, 0 deletionssrc/toolbox_scs/detectors/dssc_data.py
- src/toolbox_scs/detectors/dssc_misc.py 22 additions, 74 deletionssrc/toolbox_scs/detectors/dssc_misc.py
- src/toolbox_scs/detectors/dssc_processing.py 136 additions, 53 deletionssrc/toolbox_scs/detectors/dssc_processing.py
- src/toolbox_scs/detectors/xgm.py 9 additions, 14 deletionssrc/toolbox_scs/detectors/xgm.py
- src/toolbox_scs/routines/__init__.py 0 additions, 0 deletionssrc/toolbox_scs/routines/__init__.py
- src/toolbox_scs/test/test_detectors_common.py 0 additions, 121 deletionssrc/toolbox_scs/test/test_detectors_common.py
- src/toolbox_scs/test/test_dssc_cls.py 46 additions, 60 deletionssrc/toolbox_scs/test/test_dssc_cls.py
- src/toolbox_scs/test/test_dssc_methods.py 0 additions, 370 deletionssrc/toolbox_scs/test/test_dssc_methods.py
- src/toolbox_scs/util/__init__.py 0 additions, 0 deletionssrc/toolbox_scs/util/__init__.py
Loading
Please register or sign in to comment