Fix how we update an LWAStation with the dynamic antenna flags.

lwa-project · Oct 3, 2024 · 471fc7f · 471fc7f
1 parent 2980cc0
commit 471fc7f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+3.0.3
+ * Fixed a problem with applying station dynamic metadata to a LWAStation object
+
 3.0.2
  * Enabled caching in lsl.sim.beam to reduce the number of times a model is loaded
  * Updated lsl.common.data_access to request file be gzip compressed when downloaded

diff --git a/lsl/common/sdmADP.py b/lsl/common/sdmADP.py
@@ -260,8 +260,9 @@ def update_antennas(self, antennas):
         for ant in antennas:
             updatedAntennas.append(ant)
 
-            index = self.ant_status.index(ant.id)
-            updatedAntennas[-1].status = self.ant_status[index]
+            index0 = ant.stand.id - 1
+            index1 = ant.pol
+            updatedAntennas[-1].status = self.ant_status[index0][index1]
 
         return updatedAntennas
 

diff --git a/lsl/common/sdmDP.py b/lsl/common/sdmDP.py
@@ -257,11 +257,12 @@ def update_antennas(self, antennas):
         """
 
         updatedAntennas = []
-        for ant in antennas:
+        for ant in enumerate(antennas):
             updatedAntennas.append(ant)
 
-            index = self.ant_status.index(ant.id)
-            updatedAntennas[-1].status = self.ant_status[index]
+            index0 = ant.stand.id - 1
+            index1 = ant.pol
+            updatedAntennas[-1].status = self.ant_status[index0][index1]
 
         return updatedAntennas
 

diff --git a/lsl/common/sdmNDP.py b/lsl/common/sdmNDP.py
@@ -258,8 +258,9 @@ def update_antennas(self, antennas):
         for ant in antennas:
             updatedAntennas.append(ant)
 
-            index = self.ant_status.index(ant.id)
-            updatedAntennas[-1].status = self.ant_status[index]
+            index0 = ant.stand.id - 1
+            index1 = ant.pol
+            updatedAntennas[-1].status = self.ant_status[index0][index1]
 
         return updatedAntennas