Changeset 3492

Timestamp:

Mar 23, 2005, 9:34:48 PM (21 years ago)

Author:

eugene

Message:

working on FITS autocode

Location:

trunk/Ohana/src

Files:

• imregister/spreg/output.c (modified) (6 diffs)
• libfits/table/F_table_format.c (modified) (2 diffs)

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

@@ -70 +70 @@
   fits_fwrite_matrix   (f, &matrix);
   fits_fwrite_Theader  (f, &theader);
-  fits_fwrite_ftable   (f, &ftable));
+  fits_fwrite_ftable   (f, &ftable);
   fclose (f);
 
@@ -80 +80 @@
   
   int i;
-  char *obsstr, *regstr, *line, dummy[64], *datestr;
+  char *obsstr, *regstr, *line, *datestr;
   unsigned long tsecond;
   Header header, theader;
@@ -86 +86 @@
   FTable table;
   Spectrum *subset;
-
-  bzero (dummy, 64);
-  memset (dummy, ' ', 63);
 
   /* create primary header */
@@ -97 +94 @@
   fits_print (&header, "NEXTEND", "%d", 1, 1);
   
-  /* create table header */
-  fits_create_table_header (&theader, "TABLE", "SPECTRUM_DATABASE");
-      
-  /* 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);
+  ftable.header = &theader;
+  fits_table_set_SpectrumASCII (&ftable, NULL, 0);
+  
+  /* the ASCII table is always a little harder than the binary 
+     need to build the data line a bit carefully 
+   */
 
-  /* define table layout (can this be autocoded?) */
-  fits_define_table_column (&theader, "A32",  "FILENAME",   "filename in db",        "");
-  fits_define_table_column (&theader, "A64",  "PATHNAME",   "fullpath in db",        "");
-  fits_define_table_column (&theader, "A16",  "INSTRUMENT", "instrument",            "");
-  fits_define_table_column (&theader, "A16",  "TELESCOPE",  "telescope",             "");
-  fits_define_table_column (&theader, "A16",  "OBJNAME",    "object name",           "");
-  fits_define_table_column (&theader, "A16",  "EXTNAME",    "extname in file",       "");
-
-  fits_define_table_column (&theader, "F10.6","RA",         "ra",                    "degrees"); 
-  fits_define_table_column (&theader, "F10.6","DEC",        "dec",                   "degrees"); 
-  fits_define_table_column (&theader, "F6.1", "EXPTIME",    "exposure time",         "seconds"); 
-  fits_define_table_column (&theader, "F5.3", "AIRMASS",    "airmass",               ""); 
-  fits_define_table_column (&theader, "F7.2", "Ws",         "spectral range start",  "Angstrom"); 
-  fits_define_table_column (&theader, "F7.2", "We",         "spectral range end",    "Angstrom"); 
-  fits_define_table_column (&theader, "F7.2", "dW",         "spectral resolution",   "Angstrom / pix"); 
-
-  fits_define_table_column (&theader, "I3",   "NSPECTRA",   "number of spectra",     ""); 
-  fits_define_table_column (&theader, "A20",  "OBS_TIME",   "time of observation",   "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, "I2",   "MODE",       "phu/mef/ext",           "");
-  fits_define_table_column (&theader, "I2",   "STATE",      "raw/wav/flx/etc",       "");
-  fits_define_table_column (&theader, "I3",   "FLAG",       "status flags",          "");
-
-  /* create table, add data values */
-  fits_create_table (&theader, &table);
-  
   /* add data to table */
   for (i = 0; i < Nmatch; i++) {
@@ -139 +107 @@
     regstr   = sec_to_date (subset[0].regtime);
 
+    /* we should get an error here if we don't construct this line correctly */
     line = fits_table_print (&table, subset[0].filename, subset[0].pathname, subset[0].instrument, 
                              subset[0].telescope, subset[0].objname, subset[0].extname, 
@@ -151 +120 @@
     free (regstr);
   }
+
+  /* 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);
 
   fits_write_header  (filename, &header);

trunk/Ohana/src/libfits/table/F_table_format.c

@@ -79 +79 @@
   return (TRUE);
 }
+
+/*
+  valid TABLE column formats:
+  FN.N  - floating point
+  INN   - integer
+  ANN   - NN char string
+  
+*/
 
 /** extract a table subset to a vtable ***/
@@ -180 +188 @@
 }
 
-/*
-  valid TABLE column formats:
-  FN.N  - floating point
-  INN   - integer
-  ANN   - NN char string
-  
-*/
-
-
     /* vsnprintf (&line[off], Nchar + 1, format, argp); */