fix bug due to pyModeS update

junzis · Jul 6, 2018 · 05329cf · 05329cf
1 parent 249bc0d
commit 05329cf
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ This is the Python library for wind field estimation based on the Meteo-Particle
 2. You may also install optional `geomag` library, to support the correction of magnetic declination in BDS60 heading.
 
 ```
-$ pip install pyModeS
+$ pip install git+https://github.com/junzis/pyModeS
 $ pip install geomag
 ```
 

diff --git a/run-realtime.py b/run-realtime.py
@@ -32,7 +32,7 @@
 TFLAG = 0
 
 STREAM = Stream(lat0=51.99, lon0=4.37)
-STREAM.mp.N_AC_PTCS = 500
+STREAM.mp.N_AC_PTCS = 250
 STREAM.mp.AGING_SIGMA = 180
 
 DATA_LOCK = threading.Lock()

diff --git a/run-recorded.py b/run-recorded.py
@@ -13,7 +13,7 @@
 stream = Stream(lat0=51.99, lon0=4.37, correction=True)
 
 # you can set up the MP model parameters
-stream.mp.N_AC_PTCS = 500
+stream.mp.N_AC_PTCS = 250
 stream.mp.AGING_SIGMA = 180
 
 # read the message dumps

diff --git a/stream.py b/stream.py
@@ -61,7 +61,7 @@ def process_raw(self, adsb_ts, adsb_msgs, ehs_ts, ehs_msgs, tnow=None):
 
         # process adsb message
         for t, msg in zip(adsb_ts, adsb_msgs):
-            icao = pms.adsb.icao(msg)
+            icao = pms.icao(msg)
             tc = pms.adsb.typecode(msg)
 
             if icao not in self.acs:
@@ -128,7 +128,7 @@ def process_raw(self, adsb_ts, adsb_msgs, ehs_ts, ehs_msgs, tnow=None):
 
         # process ehs message
         for t, msg in zip(ehs_ts, ehs_msgs):
-            icao = pms.ehs.icao(msg)
+            icao = pms.icao(msg)
 
             if icao not in self.acs:
                 continue
@@ -172,8 +172,8 @@ def process_raw(self, adsb_ts, adsb_msgs, ehs_ts, ehs_msgs, tnow=None):
                     pass
 
             if bds == 'BDS50':
-                tas = pms.ehs.tas50(msg)
-                roll = pms.ehs.roll50(msg)
+                tas = pms.commb.tas50(msg)
+                roll = pms.commb.roll50(msg)
 
                 if tas and roll:
                     self.acs[icao]['t50'] = t
@@ -183,9 +183,9 @@ def process_raw(self, adsb_ts, adsb_msgs, ehs_ts, ehs_msgs, tnow=None):
 
 
             elif bds == 'BDS60':
-                ias = pms.ehs.ias60(msg)
-                hdg = pms.ehs.hdg60(msg)
-                mach = pms.ehs.mach60(msg)
+                ias = pms.commb.ias60(msg)
+                hdg = pms.commb.hdg60(msg)
+                mach = pms.commb.mach60(msg)
 
 
                 if ias and hdg and mach: