Changeset 37438

Timestamp:

Sep 26, 2014, 10:34:52 AM (12 years ago)

Author:

eugene

Message:

adding map fitting to relasro

Location:

branches/eam_branches/ipp-20140904/Ohana/src

Files:

• libdvo/src/astrom_maps.c (modified) (1 diff)
• relastro/src/FitChip.c (modified) (4 diffs)
• relastro/src/fitpoly.c (modified) (1 diff)

branches/eam_branches/ipp-20140904/Ohana/src/libdvo/src/astrom_maps.c

@@ -24 +24 @@
 }
 
+int 

branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/FitChip.c

@@ -49 +49 @@
     // use that count to set order_use below
 
+    // 20140925 : the same logic below is used to constrain the dimensions of the image map
+
     // figures to assess the fitting process:
     // x vs dx, x vs dy, y vs dx, y vs dy : 
@@ -65 +67 @@
       return FALSE;
     }
-    image[0].coords.Npolyterms = order_use;
+
+    // when fitting the map, first fit a linear model (below? change Npolyterms to -1)
+    if (MAP) {
+      image[0].coords.Npolyterms = 1;
+    } else {
+      image[0].coords.Npolyterms = order_use;
+    }
 
     if (fit) fit_free (fit);
@@ -92 +100 @@
 
     for (i = 0; i < Nmatch; i++) {
+      // we have not yet fitted the map, so image[0].coords.Npolyterms needs to 
+      // be 1 here...
       XY_to_LM (&raw[i].L, &raw[i].M, raw[i].X, raw[i].Y, &image[0].coords);
     }
 
+    // where do we apply the fit all the way b
+
+    if (MAP) {
+      if (image[0].coords.offsetMap == NULL) {
+        AstromOffsetMap *map = AstromOffsetTableNewMap(table, order);
+        image[0].coords.offsetMap = map;
+      }
+      fit_map (image[0].coords.offsetMap, raw, ref);
+      image[0].coords.Npolyterm = -1;
+    }
   }
 
@@ -254 +274 @@
 */
 
+int fit_map (AstromOffsetMap *map) {
+
+  // we are actually fitting the residual after the linear fit has been taken off
+  
+  // fit the linear terms as above
+  // calculate dX (raw.X - ref.X) and dY 
+  
+  AstromOffsetMapFit (map, x, y, dX, Npts, TRUE);
+  AstromOffsetMapFit (map, x, y, dY, Npts, FALSE);
+
+  return TRUE;
+}

branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/fitpoly.c

@@ -277 +277 @@
 /* this should only apply to the polynomial, not the projection terms */
 /* compare with psastro supporting code */
+// this code will work for linear (Npolyterm == 0 or 1) and linear + map fits
 int fit_apply_coords (CoordFit *fit, Coords *coords, int keepRef) {