Changeset 7080 for trunk/Ohana/src/imregister/detrend/output.c

Timestamp:

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

Author:

eugene

Message:

big move: fits_ to gfits_; minor updates to relphot

File:

• trunk/Ohana/src/imregister/detrend/output.c (modified) (4 diffs)

trunk/Ohana/src/imregister/detrend/output.c

@@ -43 +43 @@
 
   /* create primary header */
-  fits_init_header (&header);    
+  gfits_init_header (&header);    
   header.extend = TRUE;
-  fits_create_header (&header);
-  fits_create_matrix (&header, &matrix);
-  fits_print (&header, "NEXTEND", "%d", 1, 1);
+  gfits_create_header (&header);
+  gfits_create_matrix (&header, &matrix);
+  gfits_print (&header, "NEXTEND", "%d", 1, 1);
 
   ftable.header = &theader;
-  fits_table_set_DetReg (&ftable, subset, Nmatch);
-
-  fits_fwrite_header  (f, &header);
-  fits_fwrite_matrix  (f, &matrix);
-  fits_fwrite_Theader (f, &theader);
-  fits_fwrite_table   (f, &ftable);
+  gfits_table_set_DetReg (&ftable, subset, Nmatch);
+
+  gfits_fwrite_header  (f, &header);
+  gfits_fwrite_matrix  (f, &matrix);
+  gfits_fwrite_Theader (f, &theader);
+  gfits_fwrite_table   (f, &ftable);
   fclose (f);
   exit (0);
@@ -73 +73 @@
 
   /* create primary header */
-  fits_init_header (&header);    
+  gfits_init_header (&header);    
   header.extend = TRUE;
-  fits_create_header (&header);
-  fits_create_matrix (&header, &matrix);
-  fits_print (&header, "NEXTEND", "%d", 1, 1);
+  gfits_create_header (&header);
+  gfits_create_matrix (&header, &matrix);
+  gfits_print (&header, "NEXTEND", "%d", 1, 1);
   
   /* create table header */
-  fits_create_table_header (&theader, "TABLE", "MASTER_DETREND");
+  gfits_create_table_header (&theader, "TABLE", "MASTER_DETREND");
       
   /* add current date/time to header */
   str_to_time ("now", &tsecond);
   datestr = sec_to_date (tsecond);
-  fits_modify (&header,  "DATE", "%s", 1, datestr);
-  fits_modify (&theader, "DATE", "%s", 1, datestr);
+  gfits_modify (&header,  "DATE", "%s", 1, datestr);
+  gfits_modify (&theader, "DATE", "%s", 1, datestr);
   free (datestr);
 
   /* define table layout */
-  fits_define_table_column (&theader, "A32",  "KEY",        "unique identifier",         "");
-  fits_define_table_column (&theader, "A20",  "START_TIME", "start time of measurement", "yyyy/mm/dd,hh:mm:ss");
-  fits_define_table_column (&theader, "A20",  "STOP_TIME",  "stop time of measurement",  "yyyy/mm/dd,hh:mm:ss");
-  fits_define_table_column (&theader, "A20",  "REG_TIME",   "time of registration",      "yyyy/mm/dd,hh:mm:ss");
-  fits_define_table_column (&theader, "F7.1", "EXPTIME",    "exposure time",             "seconds"); 
-  fits_define_table_column (&theader, "A10",  "IMAGETYP",   "detrend type",              "");
-  fits_define_table_column (&theader, "A10",  "FILTER",     "filter name",               "");
-  fits_define_table_column (&theader, "A7",   "CCDINFO",    "ccd information",                  "");
-  fits_define_table_column (&theader, "A7",   "MODE",       "data format mode",                  "");
-  fits_define_table_column (&theader, "I3",   "VERSION",    "image version number",      "");
-  fits_define_table_column (&theader, "I3",   "ORDER",      "selection order",           "");
-  fits_define_table_column (&theader, "A64",  "LABEL",      "data label",                "");
-  fits_define_table_column (&theader, "A256", "PATH",       "filename in db",            "");
+  gfits_define_table_column (&theader, "A32",  "KEY",        "unique identifier",         "");
+  gfits_define_table_column (&theader, "A20",  "START_TIME", "start time of measurement", "yyyy/mm/dd,hh:mm:ss");
+  gfits_define_table_column (&theader, "A20",  "STOP_TIME",  "stop time of measurement",  "yyyy/mm/dd,hh:mm:ss");
+  gfits_define_table_column (&theader, "A20",  "REG_TIME",   "time of registration",      "yyyy/mm/dd,hh:mm:ss");
+  gfits_define_table_column (&theader, "F7.1", "EXPTIME",    "exposure time",             "seconds"); 
+  gfits_define_table_column (&theader, "A10",  "IMAGETYP",   "detrend type",              "");
+  gfits_define_table_column (&theader, "A10",  "FILTER",     "filter name",               "");
+  gfits_define_table_column (&theader, "A7",   "CCDINFO",    "ccd information",                  "");
+  gfits_define_table_column (&theader, "A7",   "MODE",       "data format mode",                  "");
+  gfits_define_table_column (&theader, "I3",   "VERSION",    "image version number",      "");
+  gfits_define_table_column (&theader, "I3",   "ORDER",      "selection order",           "");
+  gfits_define_table_column (&theader, "A64",  "LABEL",      "data label",                "");
+  gfits_define_table_column (&theader, "A256", "PATH",       "filename in db",            "");
   
   /* define TNULL, TNVAL values */
-  fits_modify (&theader, "TNULL1",  "%s", 1, "NULL");  /* KEY        */
-  fits_modify (&theader, "TNULL2",  "%s", 1, "NULL");  /* START_TIME */
-  fits_modify (&theader, "TNULL3",  "%s", 1, "NULL");  /* STOP_TIME  */
-  fits_modify (&theader, "TNULL4",  "%s", 1, "NULL");  /* REG_TIME   */
-  fits_modify (&theader, "TNULL5",  "%s", 1, "NaN");   /* EXPTIME    */
-  fits_modify (&theader, "TNULL6",  "%s", 1, "NULL");  /* IMAGETYP   */
-  fits_modify (&theader, "TNULL7",  "%s", 1, "NULL");  /* FILTER     */
-  fits_modify (&theader, "TNULL8",  "%s", 1, "NULL");  /* CCDINFO    */
-  fits_modify (&theader, "TNULL9",  "%s", 1, "NULL");  /* MODE       */
-  fits_modify (&theader, "TNULL10", "%s", 1, "-100");  /* VERSION    */
-  fits_modify (&theader, "TNULL11", "%s", 1, "-100");  /* ORDER      */
-  fits_modify (&theader, "TNULL12", "%s", 1, "NULL");  /* LABEL      */
-  fits_modify (&theader, "TNULL13", "%s", 1, "NULL");  /* PATH       */
-
-  fits_modify (&theader, "TNVAL1",  "%s", 1, "NA");    /* KEY        */
-  fits_modify (&theader, "TNVAL2",  "%s", 1, "NA");    /* START_TIME */
-  fits_modify (&theader, "TNVAL3",  "%s", 1, "NA");    /* STOP_TIME  */
-  fits_modify (&theader, "TNVAL4",  "%s", 1, "NA");    /* REG_TIME   */
-  fits_modify (&theader, "TNVAL5",  "%s", 1, "Inf");   /* EXPTIME    */
-  fits_modify (&theader, "TNVAL6",  "%s", 1, "NA");    /* IMAGETYP   */
-  fits_modify (&theader, "TNVAL7",  "%s", 1, "NA");    /* FILTER     */
-  fits_modify (&theader, "TNVAL8",  "%s", 1, "NA");    /* CCDINFO    */
-  fits_modify (&theader, "TNVAL9",  "%s", 1, "NA");    /* MODE       */
-  fits_modify (&theader, "TNVAL10", "%s", 1, "-200");  /* VERSION    */
-  fits_modify (&theader, "TNVAL11", "%s", 1, "-200");  /* ORDER      */
-  fits_modify (&theader, "TNVAL12", "%s", 1, "NA");    /* LABEL      */
-  fits_modify (&theader, "TNVAL13", "%s", 1, "NA");    /* PATH       */
+  gfits_modify (&theader, "TNULL1",  "%s", 1, "NULL");  /* KEY        */
+  gfits_modify (&theader, "TNULL2",  "%s", 1, "NULL");  /* START_TIME */
+  gfits_modify (&theader, "TNULL3",  "%s", 1, "NULL");  /* STOP_TIME  */
+  gfits_modify (&theader, "TNULL4",  "%s", 1, "NULL");  /* REG_TIME   */
+  gfits_modify (&theader, "TNULL5",  "%s", 1, "NaN");   /* EXPTIME    */
+  gfits_modify (&theader, "TNULL6",  "%s", 1, "NULL");  /* IMAGETYP   */
+  gfits_modify (&theader, "TNULL7",  "%s", 1, "NULL");  /* FILTER     */
+  gfits_modify (&theader, "TNULL8",  "%s", 1, "NULL");  /* CCDINFO    */
+  gfits_modify (&theader, "TNULL9",  "%s", 1, "NULL");  /* MODE       */
+  gfits_modify (&theader, "TNULL10", "%s", 1, "-100");  /* VERSION    */
+  gfits_modify (&theader, "TNULL11", "%s", 1, "-100");  /* ORDER      */
+  gfits_modify (&theader, "TNULL12", "%s", 1, "NULL");  /* LABEL      */
+  gfits_modify (&theader, "TNULL13", "%s", 1, "NULL");  /* PATH       */
+
+  gfits_modify (&theader, "TNVAL1",  "%s", 1, "NA");    /* KEY        */
+  gfits_modify (&theader, "TNVAL2",  "%s", 1, "NA");    /* START_TIME */
+  gfits_modify (&theader, "TNVAL3",  "%s", 1, "NA");    /* STOP_TIME  */
+  gfits_modify (&theader, "TNVAL4",  "%s", 1, "NA");    /* REG_TIME   */
+  gfits_modify (&theader, "TNVAL5",  "%s", 1, "Inf");   /* EXPTIME    */
+  gfits_modify (&theader, "TNVAL6",  "%s", 1, "NA");    /* IMAGETYP   */
+  gfits_modify (&theader, "TNVAL7",  "%s", 1, "NA");    /* FILTER     */
+  gfits_modify (&theader, "TNVAL8",  "%s", 1, "NA");    /* CCDINFO    */
+  gfits_modify (&theader, "TNVAL9",  "%s", 1, "NA");    /* MODE       */
+  gfits_modify (&theader, "TNVAL10", "%s", 1, "-200");  /* VERSION    */
+  gfits_modify (&theader, "TNVAL11", "%s", 1, "-200");  /* ORDER      */
+  gfits_modify (&theader, "TNVAL12", "%s", 1, "NA");    /* LABEL      */
+  gfits_modify (&theader, "TNVAL13", "%s", 1, "NA");    /* PATH       */
 
   /* create table, add data values */
-  fits_create_table (&theader, &table);
+  gfits_create_table (&theader, &table);
   
   /* add data to table */
@@ -165 +165 @@
     }
 
-    line = fits_table_print (&table, key, startstr, stopstr, regstr, 
+    line = gfits_table_print (&table, key, startstr, stopstr, regstr, 
                              newdata[0].exptime, typestr, filtstr, ccdstr, modestr,
                              newdata[0].Nentry, newdata[0].Norder, 
                              newdata[0].label, newdata[0].filename);
 
-    fits_add_rows (&table, line, 1, strlen(line));
+    gfits_add_rows (&table, line, 1, strlen(line));
     free (line);
     free (startstr);
@@ -182 +182 @@
     return (FALSE);
   }
-  fits_fwrite_header  (f, &header);
-  fits_fwrite_matrix  (f, &matrix);
-  fits_fwrite_Theader (f, &theader);
-  fits_fwrite_table   (f, &table);
+  gfits_fwrite_header  (f, &header);
+  gfits_fwrite_matrix  (f, &matrix);
+  gfits_fwrite_Theader (f, &theader);
+  gfits_fwrite_table   (f, &table);
   fclose (f);
   exit (0);