diff --git a/TM/eventops.py b/TM/eventops.py index 61e5d1b03c8236ade2db51a2b581bb091039a69c..61363322f4516bfd058fe5de665c2086b5a0bad8 100644 --- a/TM/eventops.py +++ b/TM/eventops.py @@ -501,17 +501,16 @@ def assocMagnitude(foundEvents, catalog, catalogType='SED', position=-1, onlyMis [x.insert(position, float('NaN')) for x in foundEvents] numCols += 1 - prevInd = 0 # To speed up operations on a long list + eventInd = 0 # To speed up operations on a long list # Associate each catalog event with a corresponding detection for catalogEvent in catalog: # Get the event index + amplitude of an event that is within the time tolerance - eventSel = [(x, y[1]) for (x, y) in enumerate(foundEvents[prevInd:]) + eventSel = [(x, y[1]) for (x, y) in enumerate(foundEvents[eventInd:]) if abs(y[0] - catalogEvent[1]) <= timeTol] if eventSel and onlyMissing is False: # Associate to the one with highest amplitude - eventInd = max(eventSel, key=itemgetter(1))[0] - foundEvents[eventInd+prevInd][position] = catalogEvent[2] - prevInd = eventInd + eventInd += max(eventSel, key=itemgetter(1))[0] + foundEvents[eventInd][position] = catalogEvent[2] elif not eventSel: # If it's not in the list, take it in! # Create an "empty" event ('-2': disregard time, Amp, and CC) diff --git a/version b/version index d917d3e26adc9854b4569871e20111c38de2606f..0ea3a944b399d25f7e1b8fe684d754eb8da9fe7f 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.1.2 +0.2.0