Skip to content

Issue #503 - use median instad of mean for line level comp #504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
happycube merged 1 commit into from
Jun 21, 2020
Merged

Issue #503 - use median instad of mean for line level comp #504

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions lddecode/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ def __init__(self, inputfreq = 40, system = 'NTSC', blocklen = 32*1024, decode_d

self.computefilters()

# The 0.5mhz filter is rolled back, so there are a few unusable bytes at the end
# The 0.5mhz filter is rolled back, so there are a few unusable samples at the end
self.blockcut_end = self.Filters['F05_offset']

def computefilters(self):
Expand Down Expand Up @@ -992,8 +992,8 @@ def doread(self, blocknums, MTF, dodemod = True):
self.lock.release()
return None

# ??? - I think I put it in to make sure it isn't erased for whatever reason, but might not be needed
rawdatac = rawdata.copy()
#rawdatac[16384:16388] = -32500

self.blocks[b] = {}
self.blocks[b]['rawinput'] = rawdatac
Expand Down Expand Up @@ -1023,12 +1023,11 @@ def doread(self, blocknums, MTF, dodemod = True):

self.lock.release()

#print(hc, len(need_blocks), len(self.q_in_metadata))

return need_blocks

def dequeue(self):
while True: # not self.q_out.empty():
# This is the thread's main loop - run until killed.
while True:
rv = self.q_out.get()
if rv is None:
return
Expand Down Expand Up @@ -1080,7 +1079,7 @@ def read(self, begin, length, MTF=0, dodemod=True):
return rv

while need_blocks is not None and len(need_blocks):
time.sleep(.005)
time.sleep(.005) # A crude busy loop
need_blocks = self.doread(toread, MTF)

if need_blocks is None:
Expand Down Expand Up @@ -2655,8 +2654,8 @@ def detectLevels(self, field):
thislinelen = field.linelocs[l + field.lineoffset] - field.linelocs[l + field.lineoffset - 1]
adj = field.rf.linelen / thislinelen

hlevels.append(np.mean(field.data['video']['demod_05'][lsa]) / adj)
hlevels.append(np.mean(field.data['video']['demod_05'][lsb]) / adj)
hlevels.append(np.median(field.data['video']['demod_05'][lsa]) / adj)
hlevels.append(np.median(field.data['video']['demod_05'][lsb]) / adj)

# Now group them by level (either sync or ire 0) and return the means of those
sync_hzs = []
Expand Down