Changeset 37807 for trunk/Ohana/src/mosastro/src/field.c

Timestamp:

Jan 11, 2015, 2:14:39 PM (12 years ago)

Author:

eugene

Message:

merge changes from eam branch ipp-20140904

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/mosastro/src/field.c (modified) (6 diffs)

trunk/Ohana/src/mosastro/src/field.c

@@ -12 +12 @@
 
   /* bore site center guess */
-  strcpy (field.project.ctype, "DEC--TAN");
+  InitCoords (&field.project, "DEC--TAN");
 
   # if (PSASTRO_MODE)
@@ -23 +23 @@
   # endif
 
-  field.project.crpix1 = 0;
-  field.project.crpix2 = 0;
-  
   /* measure average plate scale - would be better using parabolic min... */
   field.project.cdelt1 = 0;
@@ -47 +44 @@
            3600*field.project.cdelt1, 3600*field.project.cdelt2);
 
-  /** allow guess at field rotation?? **/
-  field.project.pc1_1  = 1;
-  field.project.pc2_2  = 1;
-  field.project.pc1_2  = 0;
-  field.project.pc2_1  = 0;
-  field.project.Npolyterms = 1;
-
   /* bore site center guess */
-  strcpy (field.distort.ctype, "DEC--PLY");
-  field.distort.crval1 = 0.0;
-  field.distort.crval2 = 0.0;
-  field.distort.crpix1 = 0.0;
-  field.distort.crpix2 = 0.0;
-  field.distort.cdelt1 = 1.0;
-  field.distort.cdelt2 = 1.0;
-  
-  /** allow guess at field rotation?? **/
-  field.distort.pc1_1  = 1;
-  field.distort.pc2_2  = 1;
-  field.distort.pc1_2  = 0;
-  field.distort.pc2_1  = 0;
-
-  /* allow 2nd and 3rd order? */
-  /* how do we handle renormalization? (fixed at 1000 pixels??) */
-  field.distort.Npolyterms = 1;
-  for (i = 0; i < 7; i++) {
-    field.distort.polyterms[i][0] = 0;
-    field.distort.polyterms[i][1] = 0;
-  }
+  InitCoords (&field.distort, "DEC--PLY");
   return (TRUE);
 }
@@ -138 +108 @@
 int load_field (char *filename) {
 
-  int i;
   Coords coords;
   Header header;
@@ -156 +125 @@
 
   /* bore site center guess */
-  strcpy (field.project.ctype, "DEC--TAN");
+  InitCoords (&field.project, "DEC--TAN");
   field.project.crval1 = 0.5*(field.Rmin + field.Rmax);
   field.project.crval2 = 0.5*(field.Dmin + field.Dmax);
-  field.project.crpix1 = 0;
-  field.project.crpix2 = 0;
   
   /* measure average plate scale - would be better using parabolic min... */
@@ -174 +141 @@
 
   /* bore site center guess */
-  strcpy (field.distort.ctype, "DEC--PLY");
-  field.distort.crval1 = 0.0;
-  field.distort.crval2 = 0.0;
-  field.distort.crpix1 = 0.0;
-  field.distort.crpix2 = 0.0;
-  field.distort.cdelt1 = 1.0;
-  field.distort.cdelt2 = 1.0;
-  
-  /** allow guess at field rotation?? **/
-  field.distort.pc1_1  = 1;
-  field.distort.pc2_2  = 1;
-  field.distort.pc1_2  = 0;
-  field.distort.pc2_1  = 0;
+  InitCoords (&field.distort, "DEC--PLY");
 
-  /* allow 2nd and 3rd order? */
-  /* how do we handle renormalization? (fixed at 1000 pixels??) */
-  field.distort.Npolyterms = coords.Npolyterms;
-  for (i = 0; i < 7; i++) {
-    field.distort.polyterms[i][0] = coords.polyterms[i][0];
-    field.distort.polyterms[i][1] = coords.polyterms[i][1];
-  }
   return (TRUE);
 }