Changeset 7080 for trunk/Ohana/src/relastro

Timestamp:

May 5, 2006, 5:44:26 PM (20 years ago)

Author:

eugene

Message:

big move: fits_ to gfits_; minor updates to relphot

Location:

trunk/Ohana/src/relastro/src

Files:

• GridOps.v1.c (modified) (3 diffs)
• GridOps.v2.c (modified) (5 diffs)
• Shutdown.c (modified) (1 diff)
• find_images.c (modified) (1 diff)
• load_images.c (modified) (1 diff)
• name_region.c (modified) (1 diff)
• wcatalog.c (modified) (1 diff)
• wimages.c (modified) (1 diff)
• write_coords.c (modified) (1 diff)

trunk/Ohana/src/relastro/src/GridOps.v1.c

@@ -269 +269 @@
 
   /* create empty phu */
-  fits_init_header (&header);
+  gfits_init_header (&header);
   header.extend = TRUE;
-  fits_create_header (&header);
-  fits_create_matrix (&header, &matrix);
-  fits_modify (&header, "NEXTEND", "%d", 1, Nimage + 3);
-  fits_modify (&header, "FILTER", "%s", 1, photcode[0].name);
-  fits_modify (&header, "COMMENT", "%S", 1, "Mosaic Photometry Grid Analysis");
-  fits_fwrite_header (f, &header);
-  fits_fwrite_matrix (f, &matrix);
-  fits_free_matrix (&matrix);
+  gfits_create_header (&header);
+  gfits_create_matrix (&header, &matrix);
+  gfits_modify (&header, "NEXTEND", "%d", 1, Nimage + 3);
+  gfits_modify (&header, "FILTER", "%s", 1, photcode[0].name);
+  gfits_modify (&header, "COMMENT", "%S", 1, "Mosaic Photometry Grid Analysis");
+  gfits_fwrite_header (f, &header);
+  gfits_fwrite_matrix (f, &matrix);
+  gfits_free_matrix (&matrix);
 
   /* save grid mag values */
-  fits_init_header (&theader);
+  gfits_init_header (&theader);
   theader.Naxes = 2;
   theader.Naxis[0] = gridX;
   theader.Naxis[1] = gridY;
   theader.bitpix   = -32;
-  fits_create_Theader (&theader, "IMAGE");
-  fits_modify (&theader, "FILTER", "%s", 1, photcode[0].name);
-  fits_modify (&theader, "EXTNAME", "%s", 1, "MAG_OFFSET");
-  fits_create_matrix  (&theader, &matrix);
+  gfits_create_Theader (&theader, "IMAGE");
+  gfits_modify (&theader, "FILTER", "%s", 1, photcode[0].name);
+  gfits_modify (&theader, "EXTNAME", "%s", 1, "MAG_OFFSET");
+  gfits_create_matrix  (&theader, &matrix);
   for (i = 0; i < gridX; i++) {
     for (j = 0; j < gridY; j++) {
-      fits_set_matrix_value (&matrix, i, j, (double) gridM[i + j*gridX]);
+      gfits_set_matrix_value (&matrix, i, j, (double) gridM[i + j*gridX]);
     }
   }
   write_coords (&theader, &refmosaic[0].coords);
-  fits_fwrite_header (f, &theader);
-  fits_fwrite_matrix (f, &matrix);
-  fits_free_matrix (&matrix);
+  gfits_fwrite_header (f, &theader);
+  gfits_fwrite_matrix (f, &matrix);
+  gfits_free_matrix (&matrix);
 
   /* save grid Nmeas values */
-  fits_modify (&theader, "EXTNAME", "%s", 1, "NMEAS");
-  fits_modify (&theader, "FILTER", "%s", 1, photcode[0].name);
-  fits_create_matrix  (&theader, &matrix);
+  gfits_modify (&theader, "EXTNAME", "%s", 1, "NMEAS");
+  gfits_modify (&theader, "FILTER", "%s", 1, photcode[0].name);
+  gfits_create_matrix  (&theader, &matrix);
   for (i = 0; i < gridX; i++) {
     for (j = 0; j < gridY; j++) {
-      fits_set_matrix_value (&matrix, i, j, (double) gridN[i + j*gridX]);
+      gfits_set_matrix_value (&matrix, i, j, (double) gridN[i + j*gridX]);
     }
   }
   write_coords (&theader, &refmosaic[0].coords);
-  fits_fwrite_header (f, &theader);
-  fits_fwrite_matrix (f, &matrix);
-  fits_free_matrix (&matrix);
+  gfits_fwrite_header (f, &theader);
+  gfits_fwrite_matrix (f, &matrix);
+  gfits_free_matrix (&matrix);
 
   /* save grid sigma values */
-  fits_modify (&theader, "EXTNAME", "%s", 1, "SIGMA");
-  fits_modify (&theader, "FILTER", "%s", 1, photcode[0].name);
-  fits_create_matrix  (&theader, &matrix);
+  gfits_modify (&theader, "EXTNAME", "%s", 1, "SIGMA");
+  gfits_modify (&theader, "FILTER", "%s", 1, photcode[0].name);
+  gfits_create_matrix  (&theader, &matrix);
   for (i = 0; i < gridX; i++) {
     for (j = 0; j < gridY; j++) {
-      fits_set_matrix_value (&matrix, i, j, (double) gridS[i + j*gridX]);
+      gfits_set_matrix_value (&matrix, i, j, (double) gridS[i + j*gridX]);
     }
   }
   write_coords (&theader, &refmosaic[0].coords);
-  fits_fwrite_header (f, &theader);
-  fits_fwrite_matrix (f, &matrix);
-  fits_free_matrix (&matrix);
+  gfits_fwrite_header (f, &theader);
+  gfits_fwrite_matrix (f, &matrix);
+  gfits_free_matrix (&matrix);
 
   /* calculate value for each CCD pixel, write out CCD images */
@@ -343 +343 @@
     sprintf (ccdname, "ccd%s", p);
 
-    fits_modify (&theader, "EXTNAME", "%s", 1, ccdname);
-    fits_modify (&theader, "FILTER", "%s", 1, photcode[0].name);
-    fits_modify (&theader, "PHOTCODE", "%s", 1, pname);
-    fits_modify (&theader, "NX", "%d", 1, image[i].NX);
-    fits_modify (&theader, "NY", "%d", 1, image[i].NY);
+    gfits_modify (&theader, "EXTNAME", "%s", 1, ccdname);
+    gfits_modify (&theader, "FILTER", "%s", 1, photcode[0].name);
+    gfits_modify (&theader, "PHOTCODE", "%s", 1, pname);
+    gfits_modify (&theader, "NX", "%d", 1, image[i].NX);
+    gfits_modify (&theader, "NY", "%d", 1, image[i].NY);
     write_coords (&theader, &image[0].coords);
 
@@ -354 +354 @@
     theader.Naxis[0] = Nx;
     theader.Naxis[1] = Ny;
-    fits_modify (&theader, "NAXIS1", "%d", 1, Nx);
-    fits_modify (&theader, "NAXIS2", "%d", 1, Ny);
-    fits_create_matrix  (&theader, &matrix);
+    gfits_modify (&theader, "NAXIS1", "%d", 1, Nx);
+    gfits_modify (&theader, "NAXIS2", "%d", 1, Ny);
+    gfits_create_matrix  (&theader, &matrix);
 
     InterpolateGrid ((float *)matrix.buffer, Nx, Ny, &image[0].coords, &refmosaic[0].coords);
-    fits_fwrite_header (f, &theader);
-    fits_fwrite_matrix (f, &matrix);
-    fits_free_matrix (&matrix);
+    gfits_fwrite_header (f, &theader);
+    gfits_fwrite_matrix (f, &matrix);
+    gfits_free_matrix (&matrix);
   }
 }

trunk/Ohana/src/relastro/src/GridOps.v2.c

@@ -375 +375 @@
 
   /* create empty phu */
-  fits_init_header (&header);
+  gfits_init_header (&header);
   header.extend = TRUE;
-  fits_create_header (&header);
-  fits_create_matrix (&header, &matrix);
-  fits_modify (&header, "NEXTEND", "%d", 1, Nimage + 3);
-  fits_modify (&header, "FILTER", "%s", 1, photcode[0].name);
-  fits_modify (&header, "COMMENT", "%S", 1, "Mosaic Photometry Grid Analysis");
-  fits_fwrite_header (f, &header);
-  fits_fwrite_matrix (f, &matrix);
-  fits_free_matrix (&matrix);
+  gfits_create_header (&header);
+  gfits_create_matrix (&header, &matrix);
+  gfits_modify (&header, "NEXTEND", "%d", 1, Nimage + 3);
+  gfits_modify (&header, "FILTER", "%s", 1, photcode[0].name);
+  gfits_modify (&header, "COMMENT", "%S", 1, "Mosaic Photometry Grid Analysis");
+  gfits_fwrite_header (f, &header);
+  gfits_fwrite_matrix (f, &matrix);
+  gfits_free_matrix (&matrix);
 
   /* save grid mag values */
-  fits_init_header (&theader);
+  gfits_init_header (&theader);
   theader.Naxes = 2;
   theader.Naxis[0] = gridX;
   theader.Naxis[1] = gridY;
   theader.bitpix   = -32;
-  fits_create_Theader (&theader, "IMAGE");
-  fits_modify (&theader, "FILTER", "%s", 1, photcode[0].name);
-  fits_modify (&theader, "EXTNAME", "%s", 1, "MAG_OFFSET");
-  fits_create_matrix  (&theader, &matrix);
+  gfits_create_Theader (&theader, "IMAGE");
+  gfits_modify (&theader, "FILTER", "%s", 1, photcode[0].name);
+  gfits_modify (&theader, "EXTNAME", "%s", 1, "MAG_OFFSET");
+  gfits_create_matrix  (&theader, &matrix);
   for (i = 0; i < gridX; i++) {
     for (j = 0; j < gridY; j++) {
-      fits_set_matrix_value (&matrix, i, j, (double) gridM[i + j*gridX]);
+      gfits_set_matrix_value (&matrix, i, j, (double) gridM[i + j*gridX]);
     }
   }
   write_coords (&theader, &refmosaic[0].coords);
-  fits_fwrite_header (f, &theader);
-  fits_fwrite_matrix (f, &matrix);
-  fits_free_matrix (&matrix);
+  gfits_fwrite_header (f, &theader);
+  gfits_fwrite_matrix (f, &matrix);
+  gfits_free_matrix (&matrix);
 
   /* save grid Nmeas values */
-  fits_modify (&theader, "EXTNAME", "%s", 1, "NMEAS");
-  fits_modify (&theader, "FILTER", "%s", 1, photcode[0].name);
-  fits_create_matrix  (&theader, &matrix);
+  gfits_modify (&theader, "EXTNAME", "%s", 1, "NMEAS");
+  gfits_modify (&theader, "FILTER", "%s", 1, photcode[0].name);
+  gfits_create_matrix  (&theader, &matrix);
   for (i = 0; i < gridX; i++) {
     for (j = 0; j < gridY; j++) {
-      fits_set_matrix_value (&matrix, i, j, (double) gridN[i + j*gridX]);
+      gfits_set_matrix_value (&matrix, i, j, (double) gridN[i + j*gridX]);
     }
   }
   write_coords (&theader, &refmosaic[0].coords);
-  fits_fwrite_header (f, &theader);
-  fits_fwrite_matrix (f, &matrix);
-  fits_free_matrix (&matrix);
+  gfits_fwrite_header (f, &theader);
+  gfits_fwrite_matrix (f, &matrix);
+  gfits_free_matrix (&matrix);
 
   /* save grid sigma values */
-  fits_modify (&theader, "EXTNAME", "%s", 1, "SIGMA");
-  fits_modify (&theader, "FILTER", "%s", 1, photcode[0].name);
-  fits_create_matrix  (&theader, &matrix);
+  gfits_modify (&theader, "EXTNAME", "%s", 1, "SIGMA");
+  gfits_modify (&theader, "FILTER", "%s", 1, photcode[0].name);
+  gfits_create_matrix  (&theader, &matrix);
   for (i = 0; i < gridX; i++) {
     for (j = 0; j < gridY; j++) {
-      fits_set_matrix_value (&matrix, i, j, (double) gridS[i + j*gridX]);
+      gfits_set_matrix_value (&matrix, i, j, (double) gridS[i + j*gridX]);
     }
   }
   write_coords (&theader, &refmosaic[0].coords);
-  fits_fwrite_header (f, &theader);
-  fits_fwrite_matrix (f, &matrix);
-  fits_free_matrix (&matrix);
+  gfits_fwrite_header (f, &theader);
+  gfits_fwrite_matrix (f, &matrix);
+  gfits_free_matrix (&matrix);
 
 # ifdef GRID_V1
@@ -451 +451 @@
     sprintf (ccdname, "ccd%s", p);
 
-    fits_modify (&theader, "EXTNAME", "%s", 1, ccdname);
-    fits_modify (&theader, "FILTER", "%s", 1, photcode[0].name);
-    fits_modify (&theader, "PHOTCODE", "%s", 1, pname);
-    fits_modify (&theader, "NX", "%d", 1, image[i].NX);
-    fits_modify (&theader, "NY", "%d", 1, image[i].NY);
+    gfits_modify (&theader, "EXTNAME", "%s", 1, ccdname);
+    gfits_modify (&theader, "FILTER", "%s", 1, photcode[0].name);
+    gfits_modify (&theader, "PHOTCODE", "%s", 1, pname);
+    gfits_modify (&theader, "NX", "%d", 1, image[i].NX);
+    gfits_modify (&theader, "NY", "%d", 1, image[i].NY);
     write_coords (&theader, &image[0].coords);
 
@@ -462 +462 @@
     theader.Naxis[0] = Nx;
     theader.Naxis[1] = Ny;
-    fits_modify (&theader, "NAXIS1", "%d", 1, Nx);
-    fits_modify (&theader, "NAXIS2", "%d", 1, Ny);
-    fits_create_matrix  (&theader, &matrix);
+    gfits_modify (&theader, "NAXIS1", "%d", 1, Nx);
+    gfits_modify (&theader, "NAXIS2", "%d", 1, Ny);
+    gfits_create_matrix  (&theader, &matrix);
 
     InterpolateGrid ((float *)matrix.buffer, Nx, Ny, &image[0].coords, &refmosaic[0].coords);
-    fits_fwrite_header (f, &theader);
-    fits_fwrite_matrix (f, &matrix);
-    fits_free_matrix (&matrix);
+    gfits_fwrite_header (f, &theader);
+    gfits_fwrite_matrix (f, &matrix);
+    gfits_free_matrix (&matrix);
   }
 # endif
@@ -479 +479 @@
     int ix, iy, x, y, X, Y, bin;
 
-    fits_modify (&theader, "EXTNAME", "%s", 1, camera.ccdname[i]);
-    fits_modify (&theader, "FILTER", "%s", 1, photcode[0].name);
-    fits_modify (&theader, "NX", "%d", 1, camera.Nx);
-    fits_modify (&theader, "NY", "%d", 1, camera.Ny);
+    gfits_modify (&theader, "EXTNAME", "%s", 1, camera.ccdname[i]);
+    gfits_modify (&theader, "FILTER", "%s", 1, photcode[0].name);
+    gfits_modify (&theader, "NX", "%d", 1, camera.Nx);
+    gfits_modify (&theader, "NY", "%d", 1, camera.Ny);
       
     theader.Naxis[0] = RELPHOT_GRID_X;
     theader.Naxis[1] = RELPHOT_GRID_Y;
-    fits_modify (&theader, "NAXIS1", "%d", 1, RELPHOT_GRID_X);
-    fits_modify (&theader, "NAXIS2", "%d", 1, RELPHOT_GRID_Y);
-    fits_create_matrix  (&theader, &matrix);
+    gfits_modify (&theader, "NAXIS1", "%d", 1, RELPHOT_GRID_X);
+    gfits_modify (&theader, "NAXIS2", "%d", 1, RELPHOT_GRID_Y);
+    gfits_create_matrix  (&theader, &matrix);
 
     for (Y = 0; Y < RELPHOT_GRID_Y; Y++) {
@@ -504 +504 @@
               
         bin = ix + iy*gridX;
-        fits_set_matrix_value (&matrix, X, Y, (double) gridM[bin]);
+        gfits_set_matrix_value (&matrix, X, Y, (double) gridM[bin]);
       }
     }
-    fits_fwrite_header (f, &theader);
-    fits_fwrite_matrix (f, &matrix);
-    fits_free_matrix (&matrix);
+    gfits_fwrite_header (f, &theader);
+    gfits_fwrite_matrix (f, &matrix);
+    gfits_free_matrix (&matrix);
   }
 # endif

trunk/Ohana/src/relastro/src/Shutdown.c

@@ -22 +22 @@
 
   SetProtect (TRUE);
-  fits_db_close (db);
+  gfits_db_close (db);
   fprintf (stderr, "ERROR: addstar halted\n");
   exit (1);

trunk/Ohana/src/relastro/src/find_images.c

@@ -27 +27 @@
   strcpy (tcoords.ctype, "RA---TAN");
 
-  timage = fits_table_get_Image (&db[0].ftable, &Ntimage, &db[0].swapped);
+  timage = gfits_table_get_Image (&db[0].ftable, &Ntimage, &db[0].swapped);
 
   nimage = 0;

trunk/Ohana/src/relastro/src/load_images.c

@@ -26 +26 @@
   getfullregion (image, Nimage, fullregion);
 
-  fits_vtable_from_ftable (&db[0].ftable, &db[0].vtable, Line, Nimage);
+  gfits_vtable_from_ftable (&db[0].ftable, &db[0].vtable, Line, Nimage);
 
   initImages (image, Nimage);

trunk/Ohana/src/relastro/src/name_region.c

@@ -9 +9 @@
 
   sprintf (region[0].filename, "%s/%s", CATDIR, name);
-  if (!fits_read_header (region[0].filename, &header)) {
+  if (!gfits_read_header (region[0].filename, &header)) {
     if (VERBOSE) fprintf (stderr, "catalog file not yet available: %s\n", region[0].filename);
     exit (0);
   }
-  fits_scan (&header, "RA0", "%lf", 1, &region[0].RA[0]);
-  fits_scan (&header, "RA1", "%lf", 1, &region[0].RA[1]);
-  fits_scan (&header, "DEC0", "%lf", 1, &region[0].DEC[0]);
-  fits_scan (&header, "DEC1", "%lf", 1, &region[0].DEC[1]);
-  fits_free_header (&header);
+  gfits_scan (&header, "RA0", "%lf", 1, &region[0].RA[0]);
+  gfits_scan (&header, "RA1", "%lf", 1, &region[0].RA[1]);
+  gfits_scan (&header, "DEC0", "%lf", 1, &region[0].DEC[0]);
+  gfits_scan (&header, "DEC1", "%lf", 1, &region[0].DEC[1]);
+  gfits_free_header (&header);
 
   *Nregions = 1;

trunk/Ohana/src/relastro/src/wcatalog.c

@@ -26 +26 @@
     catalog[0].Nsecfilt = 0;
   }
-  fits_free_header (&catalog[0].header);
+  gfits_free_header (&catalog[0].header);
 }

trunk/Ohana/src/relastro/src/wimages.c

@@ -12 +12 @@
   /* adjust header */
   Nimages = 0;
-  fits_scan (&db[0].header, "NIMAGES", "%d", 1, &Nimages);
+  gfits_scan (&db[0].header, "NIMAGES", "%d", 1, &Nimages);
   Nimages ++;
-  fits_modify (&db[0].header, "NIMAGES", "%d", 1, Nimages);
+  gfits_modify (&db[0].header, "NIMAGES", "%d", 1, Nimages);
 
-  fits_table_to_vtable (&db[0].ftable, &db[0].vtable, 0, 0);
+  gfits_table_to_vtable (&db[0].ftable, &db[0].vtable, 0, 0);
   for (i = 0; i < Nimage; i++) {
-    fits_vadd_rows (&db[0].vtable, (char *) image, 1, sizeof(Image));
+    gfits_vadd_rows (&db[0].vtable, (char *) image, 1, sizeof(Image));
   }
 

trunk/Ohana/src/relastro/src/write_coords.c

@@ -5 +5 @@
 void write_coords (Header *header, Coords *coords) {
 
-  fits_modify (header, "CTYPE1",   "%s",  1, "RA---TAN");
-  fits_modify (header, "CTYPE2",   "%s",  1, "DEC--TAN");
+  gfits_modify (header, "CTYPE1",   "%s",  1, "RA---TAN");
+  gfits_modify (header, "CTYPE2",   "%s",  1, "DEC--TAN");
 
-  fits_modify (header, "CRVAL1",   "%lf", 1, coords[0].crval1);
-  fits_modify (header, "CRVAL2",   "%lf", 1, coords[0].crval2);  
+  gfits_modify (header, "CRVAL1",   "%lf", 1, coords[0].crval1);
+  gfits_modify (header, "CRVAL2",   "%lf", 1, coords[0].crval2);  
 
-  fits_modify (header, "CRPIX1",   "%lf", 1, coords[0].crpix1);
-  fits_modify (header, "CRPIX2",   "%lf", 1, coords[0].crpix2);
+  gfits_modify (header, "CRPIX1",   "%lf", 1, coords[0].crpix1);
+  gfits_modify (header, "CRPIX2",   "%lf", 1, coords[0].crpix2);
 
 # if (CD_COORDS)  
-  fits_modify (header, "CD1_1",    "%le", 1, coords[0].pc1_1 * coords[0].cdelt1);
-  fits_modify (header, "CD2_1",    "%le", 1, coords[0].pc2_1 * coords[0].cdelt1);
-  fits_modify (header, "CD1_2",    "%le", 1, coords[0].pc1_2 * coords[0].cdelt2);
-  fits_modify (header, "CD2_2",    "%le", 1, coords[0].pc2_2 * coords[0].cdelt2);
+  gfits_modify (header, "CD1_1",    "%le", 1, coords[0].pc1_1 * coords[0].cdelt1);
+  gfits_modify (header, "CD2_1",    "%le", 1, coords[0].pc2_1 * coords[0].cdelt1);
+  gfits_modify (header, "CD1_2",    "%le", 1, coords[0].pc1_2 * coords[0].cdelt2);
+  gfits_modify (header, "CD2_2",    "%le", 1, coords[0].pc2_2 * coords[0].cdelt2);
 # else
-  fits_modify (header, "CDELT1",   "%le", 1, coords[0].cdelt1); 
-  fits_modify (header, "CDELT2",   "%le", 1, coords[0].cdelt2);
-  fits_modify (header, "PC001001", "%le", 1, coords[0].pc1_1);
-  fits_modify (header, "PC001002", "%le", 1, coords[0].pc1_2);
-  fits_modify (header, "PC002001", "%le", 1, coords[0].pc2_1);
-  fits_modify (header, "PC002002", "%le", 1, coords[0].pc2_2);
+  gfits_modify (header, "CDELT1",   "%le", 1, coords[0].cdelt1); 
+  gfits_modify (header, "CDELT2",   "%le", 1, coords[0].cdelt2);
+  gfits_modify (header, "PC001001", "%le", 1, coords[0].pc1_1);
+  gfits_modify (header, "PC001002", "%le", 1, coords[0].pc1_2);
+  gfits_modify (header, "PC002001", "%le", 1, coords[0].pc2_1);
+  gfits_modify (header, "PC002002", "%le", 1, coords[0].pc2_2);
 # endif
 }