Skip to content

Commit 3079b8f

Browse files
committed
better python __add__ intrinsic function for spectra and radial profiles
1 parent 76707f9 commit 3079b8f

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

python/magic/radial.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -792,12 +792,12 @@ def __add__(self, new):
792792
out = copy.deepcopy(new)
793793
if self.start_time is not None:
794794
fac_old = self.stop_time-self.start_time
795-
out.start_time = self.start_time
795+
out.start_time = min(self.start_time, new.start_time)
796796
else:
797797
fac_old = 0.
798798
if new.stop_time is not None:
799799
fac_new = new.stop_time-new.start_time
800-
out.stop_time = new.stop_time
800+
out.stop_time = max(self.stop_time, new.stop_time)
801801
else:
802802
fac_new = 0.
803803
if fac_old != 0 or fac_new != 0:

python/magic/spectrum.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -956,12 +956,12 @@ def __add__(self, new):
956956
out = copy.deepcopy(new)
957957
if self.start_time is not None:
958958
fac_old = self.stop_time-self.start_time
959-
out.start_time = self.start_time
959+
out.start_time = min(self.start_time, out.start_time)
960960
else:
961961
fac_old = 0.
962962
if new.stop_time is not None:
963963
fac_new = new.stop_time-new.start_time
964-
out.stop_time = new.stop_time
964+
out.stop_time = max(self.stop_time, new.stop_time)
965965
else:
966966
fac_new = 0.
967967
if fac_old != 0 or fac_new != 0:

0 commit comments

Comments
 (0)