Changeset 20936 for trunk/Ohana/src/opihi/cmd.astro/multifit.c

Timestamp:

Dec 7, 2008, 3:31:01 PM (18 years ago)

Author:

eugene

Message:

big update from eam_branch_20081124 with updates to Opihi math

File:

• trunk/Ohana/src/opihi/cmd.astro/multifit.c (modified) (6 diffs)

trunk/Ohana/src/opihi/cmd.astro/multifit.c

@@ -46 +46 @@
     sprintf (name, "c%d", i);
     if ((Nc[i]  = SelectVector (name, ANYVECTOR, TRUE)) == NULL) goto escape;
+    ResetVector (Nc[i], OPIHI_FLT, 1); 
     sprintf (name, "Mb%d", i);
     if ((NMb[i] = SelectVector (name, OLDVECTOR, TRUE)) == NULL) goto escape;
+    REQUIRE_VECTOR_FLT (NMb[i], FALSE); 
     sprintf (name, "mb%d", i);
     if ((Nmb[i] = SelectVector (name, OLDVECTOR, TRUE)) == NULL) goto escape;
+    REQUIRE_VECTOR_FLT (Nmb[i], FALSE); 
     sprintf (name, "wb%d", i);
     if ((Nwb[i] = SelectVector (name, OLDVECTOR, TRUE)) == NULL) goto escape;
+    REQUIRE_VECTOR_FLT (Nwb[i], FALSE); 
   }
   for (i = 0; i < Norder - 1; i++) {
     sprintf (name, "ml%d", i);
     if ((Nml[i] = SelectVector (name, OLDVECTOR, TRUE)) == NULL) goto escape;
+    REQUIRE_VECTOR_FLT (Nml[i], FALSE); 
     sprintf (name, "mh%d", i);
     if ((Nmh[i] = SelectVector (name, OLDVECTOR, TRUE)) == NULL) goto escape;
+    REQUIRE_VECTOR_FLT (Nmh[i], FALSE); 
     sprintf (name, "wo%d", i);
     if ((Nwo[i] = SelectVector (name, OLDVECTOR, TRUE)) == NULL) goto escape;
+    REQUIRE_VECTOR_FLT (Nwo[i], FALSE); 
   }
 
@@ -72 +79 @@
             v = 0;
             for (n = 0; n < Nwo[i-1][0].Nelements; n++) {
-              v += -pow (Nwo[i-1][0].elements[n], (double)(j+J));
+              v += -pow (Nwo[i-1][0].elements.Flt[n], (double)(j+J));
             }
             a[Ny][Nx] = v;
@@ -83 +90 @@
             v = 0;
             for (n = 0; n < Nwo[i][0].Nelements; n++) {
-              v += -pow (Nwo[i][0].elements[n], (double)(j+J));
+              v += -pow (Nwo[i][0].elements.Flt[n], (double)(j+J));
             }
             a[Ny][Nx] = v;
@@ -94 +101 @@
             v = 0;
             for (n = 0; n < Nwb[i][0].Nelements; n++) {
-              v += pow (Nwb[i][0].elements[n], (double)(j+J));
+              v += pow (Nwb[i][0].elements.Flt[n], (double)(j+J));
             }
             if (i > 0) {
               for (n = 0; n < Nwo[i-1][0].Nelements; n++) {
-                v += pow (Nwo[i-1][0].elements[n], (double)(j+J));
+                v += pow (Nwo[i-1][0].elements.Flt[n], (double)(j+J));
               }
             }
             if (i < Norder - 1) {
               for (n = 0; n < Nwo[i][0].Nelements; n++) {
-                v += pow (Nwo[i][0].elements[n], (double)(j+J));
+                v += pow (Nwo[i][0].elements.Flt[n], (double)(j+J));
               }
             }
@@ -123 +130 @@
       v = 0;
       for (n = 0; n < Nwb[i][0].Nelements; n++) {
-        v += NMb[i][0].elements[n]*pow (Nwb[i][0].elements[n], (double)j);
-        v -= Nmb[i][0].elements[n]*pow (Nwb[i][0].elements[n], (double)j);
+        v += NMb[i][0].elements.Flt[n]*pow (Nwb[i][0].elements.Flt[n], (double)j);
+        v -= Nmb[i][0].elements.Flt[n]*pow (Nwb[i][0].elements.Flt[n], (double)j);
       }
       if (i > 0) {
         for (n = 0; n < Nwo[i-1][0].Nelements; n++) {
-          v += Nmh[i-1][0].elements[n] * pow (Nwo[i-1][0].elements[n], (double)j);
-          v -= Nml[i-1][0].elements[n] * pow (Nwo[i-1][0].elements[n], (double)j);
+          v += Nmh[i-1][0].elements.Flt[n] * pow (Nwo[i-1][0].elements.Flt[n], (double)j);
+          v -= Nml[i-1][0].elements.Flt[n] * pow (Nwo[i-1][0].elements.Flt[n], (double)j);
         }
       }
       if (i < Norder - 1) {
         for (n = 0; n < Nwo[i][0].Nelements; n++) {
-          v += Nml[i][0].elements[n] * pow (Nwo[i][0].elements[n], (double)j);
-          v -= Nmh[i][0].elements[n] * pow (Nwo[i][0].elements[n], (double)j);
+          v += Nml[i][0].elements.Flt[n] * pow (Nwo[i][0].elements.Flt[n], (double)j);
+          v -= Nmh[i][0].elements.Flt[n] * pow (Nwo[i][0].elements.Flt[n], (double)j);
         }
       }
@@ -146 +153 @@
   for (i = 0; i < Norder; i++) {
     Nc[i][0].Nelements = nterm[i];
-    REALLOCATE (Nc[i][0].elements, float, nterm[i]);
+    REALLOCATE (Nc[i][0].elements.Flt, opihi_flt, nterm[i]);
     for (j = 0; j < nterm[i]; j++, Ny++) {
-      Nc[i][0].elements[j] = b[Ny][0];
+      Nc[i][0].elements.Flt[j] = b[Ny][0];
     }
   }