in DELEG7 corrected zmlt of XI * XI and setting of REMND[K - 1][1], but still getting...
authorilb@NIH.GOV <ilb@NIH.GOV@ba61647d-9d00-f842-95cd-605cb4296b96>
Thu, 15 Feb 2018 22:09:24 +0000 (22:09 +0000)
committerilb@NIH.GOV <ilb@NIH.GOV@ba61647d-9d00-f842-95cd-605cb4296b96>
Thu, 15 Feb 2018 22:09:24 +0000 (22:09 +0000)
git-svn-id: https://citdcbmipav.cit.nih.gov/repos-pub/mipav/trunk@15379 ba61647d-9d00-f842-95cd-605cb4296b96

mipav/src/gov/nih/mipav/model/algorithms/SymmsIntegralMapping.java

index 69d3343..23d60ba 100644 (file)
@@ -6419,7 +6419,7 @@ public class SymmsIntegralMapping extends AlgorithmBase {
                        for (J = 1; J <= NZZ; J++) {\r
                                XI[0] = (ZZ[J - 1][0] - MEAN) / RR;\r
                                XI[1] = ZZ[J - 1][1] / RR;\r
-                               zmlt(XI[0], XI[0], XI[1], XI[1], cr, ci);\r
+                               zmlt(XI[0], XI[1], XI[0], XI[1], cr, ci);\r
                                r = zabs(cr[0] - 1.0, ci[0]);\r
                                mag = Math.sqrt(r);\r
                                theta = Math.atan2(ci[0], cr[0] - 1.0);\r
@@ -6447,7 +6447,7 @@ public class SymmsIntegralMapping extends AlgorithmBase {
                                        K = K + 1;\r
                                        zmlt(CONGG[I][J - 1][0], CONGG[I][J - 1][1], FFG[0], FFG[1], cr, ci);\r
                                        REMND[K - 1][0] = cr[0] + CONHH[I][J - 1][0] * FFH;\r
-                                       REMND[K - 1][1] = cr[0] + CONHH[I][J - 1][1] * FFH;\r
+                                       REMND[K - 1][1] = ci[0] + CONHH[I][J - 1][1] * FFH;\r
                                } // for (I=0; I <= MAXDG; I++)\r
                        } // for (J=1; J <= NZZ; J++)\r
 \r