From 2f969f3a2ee88431a591a33e73fa216a0e221173 Mon Sep 17 00:00:00 2001
From: Brian Hawkins <1729052+bhawkins@users.noreply.github.com>
Date: Thu, 4 Dec 2025 18:16:40 -0800
Subject: [PATCH 1/3] Use consistent X and Y indexing.

---
 cxx/isce3/cuda/matchtemplate/pycuampcor/cuDeramp.cu | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cxx/isce3/cuda/matchtemplate/pycuampcor/cuDeramp.cu b/cxx/isce3/cuda/matchtemplate/pycuampcor/cuDeramp.cu
index cd46e7893..25be2e59f 100644
--- a/cxx/isce3/cuda/matchtemplate/pycuampcor/cuDeramp.cu
+++ b/cxx/isce3/cuda/matchtemplate/pycuampcor/cuDeramp.cu
@@ -105,8 +105,8 @@ __global__ void cuDerampMethod1_kernel(float2 *images, const int imageNX, int co
      
     for (int i = tid; i < imageSize; i += nthreads)
     { 
-        pixelIdxX = i%imageNY;
-        pixelIdxY = i/imageNY;
+        pixelIdxX = i / imageNY;
+        pixelIdxY = i % imageNY;
         float phase = pixelIdxX*phaseX + pixelIdxY*phaseY;
         float2 phase_factor = make_float2(cosf(phase), sinf(phase));
         image[i] *= phase_factor;

From 329d546b3aeb3a75bbb23161735096dfef876fe7 Mon Sep 17 00:00:00 2001
From: Brian Hawkins <1729052+bhawkins@users.noreply.github.com>
Date: Thu, 4 Dec 2025 19:53:23 -0800
Subject: [PATCH 2/3] Ditto in CPU version.

---
 cxx/isce3/matchtemplate/pycuampcor/cuDeramp.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cxx/isce3/matchtemplate/pycuampcor/cuDeramp.cpp b/cxx/isce3/matchtemplate/pycuampcor/cuDeramp.cpp
index a1d015395..fa8b2482a 100644
--- a/cxx/isce3/matchtemplate/pycuampcor/cuDeramp.cpp
+++ b/cxx/isce3/matchtemplate/pycuampcor/cuDeramp.cpp
@@ -52,8 +52,8 @@ static void cuDerampMethod1_kernel(float2 *images, const int imageNX, int const
         float phaseY = atan2f(phaseDiffY.y, phaseDiffY.x);
 
         for (int i = 0; i < imageSize; i++) {
-            const int pixelIdxX = i%imageNY;
-            const int pixelIdxY = i/imageNY;
+            const int pixelIdxX = i / imageNY;
+            const int pixelIdxY = i % imageNY;
             float phase = pixelIdxX*phaseX + pixelIdxY*phaseY;
             float2 phase_factor = make_float2(cosf(phase), sinf(phase));
             image[i] *= phase_factor;

From c9f53701f85b11fa02be22ea12415e3f1e9ade1a Mon Sep 17 00:00:00 2001
From: Brian Hawkins <1729052+bhawkins@users.noreply.github.com>
Date: Fri, 5 Dec 2025 13:32:05 -0800
Subject: [PATCH 3/3] update golden data

---
 .../ovs128-rho0.8/golden/correlation_peak     | Bin 624 -> 624 bytes
 .../ovs128-rho0.8/golden/dense_offsets        | Bin 1248 -> 1248 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/tests/data/ampcor/accuracy-testdata/ovs128-rho0.8/golden/correlation_peak b/tests/data/ampcor/accuracy-testdata/ovs128-rho0.8/golden/correlation_peak
index f71dbd19c66aa4d5119b3d522220f88f11594853..2d13833a8d0b5a7c09a3958e194580c245fc9d4c 100644
GIT binary patch
literal 624
zcmWN_dn^=i0KoBHnvlpNne~UQx{0PTS>yY&T9KNXn)imxA8n0Z^GCBX{Si%Vnbl@7
zkA}F+*m+(O?%WYa?zlVe$Mv{8dT=34eg6DhFzaaOwiQkeqd0g^;}>YezeCT=u4Ymb
z6x6Lxv0gTUo8K03vs+8RF+E9UGj_W-X^-9`BvLC;d&N!UY#+iy_JzpNX6h^IQJq&&
z?k*?7p^1ynErd<JM;&FMs7y;usD}8xMp8;te2cfRTH!3bTL&plTxVm*N+>%G9PjI)
zQ>Wp3@G#e=28c*g5>TS0A<0Cgmy1|=YAbwFS4gy$<E8#VUbT+Qs1{1fCn$*6WU;HC
z(1Jh65=QV%ouR?rMR-^qvQMpKEU1msIX%?tm&y3>3zNjiql973MGa#~86YdiMf9CC
z@Nr|5z_Df$-_BwkU?N@8L2_d)eTVl8YuhE<GrNgR(NLN-M^N|@r=)rux7mrK`IWfG
z%##>AOMQGV)j>vTrp9^J+)sAl0&*tNp0OACh9){w%ej}UAVcpWLf(|HsL`?zr{HRf
zn(SLsI2Rjn%dO+U+#u6#bKI5vzdbsnrR|7A3xquw=Z24gOPR~8MfDQvx=KjC9?y6E
z*vm(GAzLDApcV586PuSO@J&&2driShk59<+mSJ`tn<qNb?<?{6+>4~Hhob1MqBh)w
z=c^W?6>WIN4Y7D<kR4|Ygf2UY!NOu<`g?htro#ODD>kwYc1qP;mo@U&u?GJmoxE0U
V5;^>ns`6>74r;J=9V1!V#Xo!IF`obc

literal 624
zcmV~$dn^=i0KoAhkJ@5p9_zK43Yn=!rs(@ClUCEB(IiHh*h(vH(Xged^+(fMjb-N5
zwMjbCYV)S!+~f{-PCI9GoX0UbHP50xA5WV_($ZC=l*~}jxW-aMHO*FY3{ST*9q<j0
z^L8R`z{KKRI}w$tBY*))i#IX-o#w}~wUA|XFy`VSo+c<MOf*yavyo@}Ti7_JCO&_e
zrt1nW$!F=X?ZGy6jjos>l5&PPq|&hxufP(q$u3_{aUkdq8w;~saCQ;DUs?;VX*GpK
zdIGwdk(B9qJfbB0q(n&l){w@!3#WVQ`1?AFO1YUxnX8bSTS@-pAY4n#d|;f~hidM$
z$XTpbl9M~e>qkyvrMCv@b0xC&Vcd+J9KSe^By*V?SFA*8`2_t(jI`g^kY4X5{2!Vq
z@X!$#-Av>!HId!pbWK^<o%ELae|to>OAA#VO}yHx#VuRU;G0oOcN&nyuM=utMwsn5
zYRWN24R9-B5Q(aX@Yoqb@|HN9IEH=UI<g&;1fSKS-M4^r*hctWQ<0VOo|J<+!Xk&r
zJKc&Rr;bTa8Sg^6F_jq!wrI%h>!RV5fz=Exb#p34l8gklYDkuU<;58jUos4=q)iZ1
ztEWh(r?+?#Lu@|{6$1pGlT+fYVfONO9ymA&$1Nk(NeW_Y+t@zUhjXTsk5_xBowZO?
zxy5I1E!#|e$eySO%{NftzKZqHX6jY#_~iFe<TXc|or;9pQ&c->@U*GoW>hEb(ev2*
SOt2iQBUm=diMCPt8R0*0vn`JR

diff --git a/tests/data/ampcor/accuracy-testdata/ovs128-rho0.8/golden/dense_offsets b/tests/data/ampcor/accuracy-testdata/ovs128-rho0.8/golden/dense_offsets
index 93a7ba97f558029e629b40257a948919f178383d..9b1a3d0ad363943e0cadcd30fa2c1f10dde6ce40 100644
GIT binary patch
literal 1248
zcmY+Bfo;P;3<EWa2XTOm;!%E-jL-p6z@uc8-qBK$3J|ELNd7yiT6?8Sd{)(O)yaGp
zId7o5`kLi!%f0ifb(6Q;+xsV1E_%4^^xygp=6E>gzSe{zTU_oy>vRu)dIsgqj*eY;
zXx}qB_hyeS8qU!?KWO&&_3D}2;H~Nb@7wjN)pNjkF3!&SQk>%h-8oNXCTD8X=YAii
z^PBU|lQ}*)%Guv$yyAnFS9|E$5i%#YcO}BRO9p$-(cn4Q-@7Mkw4&KR==6BM`jp7d
z{mYqlUbJ%>nA+s1?DtD+et0~3Eip5=^neF=r#<_QybJW3QzE<ZsjcP;ogUx5p4a~w
z9o*KMO+9_kYEsSVEjZEKLG_jy<4LZX&hXA~=uZ5TRh{Sg&8cbMyv2O)RG<6C_l@r8
zc=wO){VusFv#4Y`^jkN1bY?8tz3Bd5p-C<n-R;^&s~+B-yU)>09-3&ina$a|;uEQb
QXYj3+(CZF7Y5l?a1IDTD`v3p{

literal 1248
zcmYk3(T#&Z3`G5TWl#u6ltL+#kP=b|ciIxJq`Wt*BP?0AXU1bTsWQ&1YLK;&zf~`)
z^SR1aEnp>2s6CjYe_(Gg^$WYEI(K&P_SHvxpfl_bwCW7`Ay3K~YV~yvMsFNw^$zA9
zxLCZ=$`#f4YMAYp=GL2UP3}CfuxNX~nzLTyoaK|=r}wrs--0aPGO=UUc+Wk3)F<HM
z)iX7m^GZ_X4d3y-vEA>N7k`l@&#WdpV)Ww9!Km%4)`(smsaFC{{seQ+|IJx#%_?r}
z?ue1c<Ce4g%@<rSaP`4yfBtS?IdMJI+9&DrzPYnBzrmZtLiJXe=+djBA7Jrh6i<S?
zds@NNh_|=;^y1ge>s5LZ;d%yhR}Xpn_e1BLTUJt?m^rRH^NtOSS#N9ZQTFN8SSq{j
zmkIAqJQ`#4Hyh5^{r+W}x0sE-pF8e@>utI>sQoSRM<SM+Q^S<KH{So#Lnu0%zB%iT
f#=Cmh$IFUe-?BeRBNc7lCIG(Um8zFI_s#kMJEieH