Merge pull request #1001 from ToFuProject/Issue1000_VosBroadBand

Issue1000 vos broad band
ToFuProject · Dec 17, 2024 · 226e913 · 226e913
2 parents ef3c432 + 9eac489
commit 226e913
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/tofu/data/_class8_los_angles.py b/tofu/data/_class8_los_angles.py
@@ -332,8 +332,13 @@ def _vos_from_los(
 
         phi = np.arctan2(ptsy, ptsx)
         phimin, phimax = np.nanmin(phi), np.nanmax(phi)
+
+        # across pi?
         if phimax - phimin > np.pi:
-            phimin, phimax = phimax, phimin + 2.*np.pi
+            phimin = np.min(phi[phi > 0])
+            phimax = np.max(phi[phi < 0])
+            phimax = phimax + 2*np.pi
+
         dphi[(0,) + ind] = phimin
         dphi[(1,) + ind] = phimax
 

diff --git a/tofu/data/_class8_vos_utilities.py b/tofu/data/_class8_vos_utilities.py
@@ -374,7 +374,7 @@ def _get_dphi_from_R_phor(
     dphi = np.full((2, R.size), np.nan)
     for ir, rr in enumerate(R):
 
-        nphi = np.ceil(rr*(phimax - phimin) / (0.05*res)).astype(int)
+        nphi = np.ceil(rr*np.abs(phimax - phimin) / (0.05*res)).astype(int) + 1
         phi = np.linspace(phimin, phimax, nphi)
 
         ind = path.contains_points(