Changeset 29

Timestamp:

Jan 24, 2003, 12:46:58 AM (23 years ago)

Author:

eugene

Message:

refined CADC table columns

Location:

trunk/Ohana/src/imregister

Files:

• base/ConfigInit.c (modified) (1 diff)
• imreg/output.c (modified) (4 diffs)
• include/imregister.h (modified) (1 diff)

trunk/Ohana/src/imregister/base/ConfigInit.c

@@ -31 +31 @@
   WarnConfig (config, "DETREND_RECIPES",             "%s", 0, RecipeFile);
                                                    
+  /* pixel scale for FWHM */ 
+  WarnConfig (config, "ASEC_PIX",                    "%lf", 0, &ARCSEC_PIXEL);
+
   /* keyword abstractions for parse_time */        
   WarnConfig (config, "DATE-KEYWORD",                "%s", 0, DateKeyword);

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

@@ -175 +175 @@
 void DumpCADCTable (char *filename, RegImage *image, int *match, int Nmatch) {
   
-  int i;
-  char *obsstr, *regstr, *line, dummy[64];
-  char *modestr, *typestr, *ccdstr, *datestr;
+  int i, obsid;
+  char *datestr, *line, hdrname[99];
   unsigned long tsecond;
   Header header, theader;
@@ -183 +182 @@
   FTable table;
   RegImage *subset;
-
-  bzero (dummy, 64);
-  memset (dummy, ' ', 63);
 
   /* create primary header */
@@ -204 +200 @@
 
   /* define table layout */
-  fits_define_table_column (&theader, "A64",   "FILE",       "filename in db",        "",                              1.0, 0.0);
-  fits_define_table_column (&theader, "F7.1",  "SKY",        "background level",     "counts / pixel",                 1.0, 0.0); 
-  fits_define_table_column (&theader, "F6.1",  "BIAS",       "bias level",           "counts / pixel",                 1.0, 0.0); 
-  fits_define_table_column (&theader, "F5.2",  "FWHM",       "image quality",        "pixels",                         1.0, 0.0); 
+  fits_define_table_column (&theader, "A99",   "FILENAME",     "filename in db",        "",                              1.0, 0.0);
+  fits_define_table_column (&theader, "A99",   "HDR_FILENAME", "filename in db",        "",                              1.0, 0.0);
+  fits_define_table_column (&theader, "I10",   "OBSID",        "image ID number",        "pixels",                         1.0, 0.0); 
+  fits_define_table_column (&theader, "F5.2",  "OBS_IQ",       "image quality",        "pixels",                         1.0, 0.0); 
+  fits_define_table_column (&theader, "F9.3",  "OBS_BG_VAL",   "background level",     "counts / pixel",                 1.0, 0.0); 
 
   /* define TNULL, TNVAL values */
-  fits_modify (&theader, "TNULL1",  "%s", 1, "NULL");  /* FILE  */
-  fits_modify (&theader, "TNULL2",  "%s", 1, "NaN");   /* SKY   */
-  fits_modify (&theader, "TNULL3",  "%s", 1, "NaN");   /* BIAS  */
-  fits_modify (&theader, "TNULL4",  "%s", 1, "NaN");   /* FWHM  */
-
-  fits_modify (&theader, "TNVAL1",  "%s", 1, "NA");    /* FILE  */
-  fits_modify (&theader, "TNVAL2",  "%s", 1, "Inf");   /* SKY   */
-  fits_modify (&theader, "TNVAL3",  "%s", 1, "Inf");   /* BIAS  */
-  fits_modify (&theader, "TNVAL4",  "%s", 1, "Inf");   /* FWHM  */
+  fits_modify (&theader, "TNULL1",  "%s", 1, "NULL");  /* FILENAME     */
+  fits_modify (&theader, "TNULL2",  "%s", 1, "NULL");  /* HDR_FILENAME */
+  fits_modify (&theader, "TNULL3",  "%s", 1, "0");     /* OBSID        */
+  fits_modify (&theader, "TNULL4",  "%s", 1, "NaN");   /* OBS_IQ       */
+  fits_modify (&theader, "TNULL5",  "%s", 1, "NaN");   /* OBS_BG_VAL   */
+
+  fits_modify (&theader, "TNVAL1",  "%s", 1, "NA");    /* FILENAME     */
+  fits_modify (&theader, "TNVAL2",  "%s", 1, "NA");    /* HDR_FILENAME */
+  fits_modify (&theader, "TNVAL3",  "%s", 1, "-1");    /* OBSID        */
+  fits_modify (&theader, "TNVAL4",  "%s", 1, "Inf");   /* OBS_IQ       */
+  fits_modify (&theader, "TNVAL5",  "%s", 1, "Inf");   /* OBS_BG_VAL   */
 
   /* create table, add data values */
@@ -226 +225 @@
   for (i = 0; i < Nmatch; i++) {
     subset = &image[match[i]];
-    line = fits_table_print (&table, subset[0].pathname, subset[0].sky, subset[0].bias, subset[0].fwhm);
+
+    /* filename: NNNNNNx.fits or NNNNNNxNN.fits */
+    /* OBSID & HDR_FILENAME are derived from FILENAME */
+    obsid = atoi (subset[0].filename);
+    if (obsid < 400000) fprintf (stderr, "warning: derived obsid < 400000\n");
+    sprintf (hdrname, "%s.hdr", subset[0].filename);
+
+    line = fits_table_print (&table, subset[0].filename, hdrname, obsid, (subset[0].fwhm*ARCSEC_PIXEL), subset[0].sky);
 
     fits_add_rows (&table, line, 1, strlen(line));

trunk/Ohana/src/imregister/include/imregister.h

@@ -46 +46 @@
 char DECSexigKeyword[16];
 char CameraKeyword[16];
+double ARCSEC_PIXEL;
 
 /* global vars used by camera info */