Changeset 27840 for branches/simtest_nebulous_branches/Ohana/src/gastro2/src/gheader2.c

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/gastro2/src/gheader2.c (modified) (9 diffs)

branches/simtest_nebulous_branches/Ohana/src/gastro2/src/gheader2.c

@@ -6 +6 @@
   Header header;
   FILE *f, *g;
-  int i, oldsize, nbytes, status;
+  off_t i, oldsize, nbytes, status;
   char line[1024];
 
@@ -13 +13 @@
     exit(0);
   }
-  oldsize = header.size;
+  oldsize = header.datasize;
 
   /* check for insufficient number of stars */
@@ -21 +21 @@
       if (Target[0].answer.N < 6) {
         gfits_modify (&header, "NASTRO", "%d", 1, 0);
-        gfits_modify (&header, "NASTRO", "%C", 1, "number of stars used for astrometry");
+        gfits_modify_alt (&header, "NASTRO", "%C", 1, "number of stars used for astrometry");
         goto skipstuff;
       }
@@ -28 +28 @@
       if (Target[0].answer.N < 12) {
         gfits_modify (&header, "NASTRO", "%d", 1, 0);
-        gfits_modify (&header, "NASTRO", "%C", 1, "number of stars used for astrometry");
+        gfits_modify_alt (&header, "NASTRO", "%C", 1, "number of stars used for astrometry");
         goto skipstuff;
       }
@@ -35 +35 @@
       if (Target[0].answer.N < 20) {
         gfits_modify (&header, "NASTRO", "%d", 1, 0);
-        gfits_modify (&header, "NASTRO", "%C", 1, "number of stars used for astrometry");
+        gfits_modify_alt (&header, "NASTRO", "%C", 1, "number of stars used for astrometry");
         goto skipstuff;
       }
@@ -45 +45 @@
   
   gfits_modify (&header, "NASTRO", "%d", 1, Target[0].answer.N);
-  gfits_modify (&header, "NASTRO", "%C", 1, "number of stars used for astrometry");
+  gfits_modify_alt (&header, "NASTRO", "%C", 1, "number of stars used for astrometry");
 
   /*** use PutCoords to update header ***/
@@ -52 +52 @@
   dR = fabs (Target[0].answer.dR*Target[0].coords.cdelt1*3600.0);
   gfits_modify (&header, "CERROR", "%lf", 1, dR);
-  gfits_modify (&header, "CERROR", "%C", 1, "scatter in astrometry soln (arcsec)");
+  gfits_modify_alt (&header, "CERROR", "%C", 1, "scatter in astrometry soln (arcsec)");
   gfits_modify (&header, "CPRECISE", "%lf", 1, dR / sqrt(1.0*Target[0].answer.N));
-  gfits_modify (&header, "CPRECISE", "%C", 1, "precision of astrometry soln (arcsec)");
+  gfits_modify_alt (&header, "CPRECISE", "%C", 1, "precision of astrometry soln (arcsec)");
   gfits_modify (&header, "EQUINOX", "%lf", 1, 2000.0);
   /* we force equinox to be 2000.0 for all images */
 
 skipstuff:
-  if (header.size > oldsize) {
+  if (header.datasize > oldsize) {
     if (VERBOSE) fprintf (stderr, "header expanded, creating new copy\n");
     sprintf (line, "mv %s %s~", file, file);
@@ -78 +78 @@
       exit(0);
     }
-    nbytes = fwrite (header.buffer, 1, header.size, g);
-    fseek (f, oldsize, SEEK_SET);
-    for (i = 0; (nbytes = fread (header.buffer, 1, header.size, f)) > 0; i++) {
+    nbytes = fwrite (header.buffer, 1, header.datasize, g);
+    fseeko (f, oldsize, SEEK_SET);
+    for (i = 0; (nbytes = fread (header.buffer, 1, header.datasize, f)) > 0; i++) {
       if (nbytes != fwrite (header.buffer, 1, nbytes, g)) {
         fprintf (stderr, "ERROR: failure writing output data file\n");
@@ -95 +95 @@
     }
     
-    fseek (f, 0, SEEK_SET);
-    nbytes = fwrite (header.buffer, 1, header.size, f);
+    fseeko (f, 0, SEEK_SET);
+    nbytes = fwrite (header.buffer, 1, header.datasize, f);
     
     fclose (f);