Skip to content

Commit cba08e1

Browse files
committed
Simplify DiffractingVector.__getitem__
1 parent fce8e2b commit cba08e1

File tree

1 file changed

+3
-21
lines changed

1 file changed

+3
-21
lines changed

diffsims/crystallography/_diffracting_vector.py

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -124,27 +124,9 @@ def __init__(self, phase, xyz=None, hkl=None, hkil=None, intensity=None):
124124
def __getitem__(self, key):
125125
new_data = self.data[key]
126126
dv_new = self.__class__(self.phase, xyz=new_data)
127-
128-
if np.isnan(self.structure_factor).all():
129-
dv_new._structure_factor = np.full(dv_new.shape, np.nan, dtype="complex128")
130-
131-
else:
132-
dv_new._structure_factor = self.structure_factor[key]
133-
if np.isnan(self.theta).all():
134-
dv_new._theta = np.full(dv_new.shape, np.nan)
135-
else:
136-
dv_new._theta = self.theta[key]
137-
if np.isnan(self.intensity).all():
138-
dv_new._intensity = np.full(dv_new.shape, np.nan)
139-
else:
140-
slic = self.intensity[key]
141-
if not hasattr(slic, "__len__"):
142-
slic = np.array(
143-
[
144-
slic,
145-
]
146-
)
147-
dv_new._intensity = slic
127+
dv_new._structure_factor = self._structure_factor[key]
128+
dv_new._theta = self._theta[key]
129+
dv_new._intensity = self._intensity[key]
148130

149131
return dv_new
150132

0 commit comments

Comments
 (0)