File tree Expand file tree Collapse file tree 2 files changed +20
-1
lines changed
src/diffpy/utils/scattering_objects Expand file tree Collapse file tree 2 files changed +20
-1
lines changed Original file line number Diff line number Diff line change 1+ #!/usr/bin/env python
2+ ##############################################################################
3+ #
4+ # diffpy.utils by DANSE Diffraction group
5+ # Simon J. L. Billinge
6+ # (c) 2010 The Trustees of Columbia University
7+ # in the City of New York. All rights reserved.
8+ #
9+ # File coded by: Simon Billinge
10+ #
11+ # See AUTHORS.txt for a list of people who contributed.
12+ # See LICENSE_DANSE.txt for license information.
13+ #
14+ ##############################################################################
15+
16+ """Scattering objects
17+ """
18+
19+ # End of file
Original file line number Diff line number Diff line change @@ -26,7 +26,7 @@ def __add__(self, other):
2626 summed .on_tth [1 ] = self .on_tth [1 ] + other
2727 summed .on_q [1 ] = self .on_q [1 ] + other
2828 elif not isinstance (other , Diffraction_object ):
29- raise TypeError (f"I only know how to sum two Scattering_object objects" )
29+ raise TypeError (f"I only know how to sum two Diffraction_object objects" )
3030 elif self .on_tth [0 ].all () != other .on_tth [0 ].all ():
3131 raise RuntimeError (f"objects are not on the same x-grid. You may add them using the self.add method and"
3232 f"specifying how to handle the mismatch." )
You can’t perform that action at this time.
0 commit comments