Changeset 26766

Timestamp:

Feb 3, 2010, 1:00:09 PM (16 years ago)

Author:

watersc1

Message:

New burntool, with trails retained even if they had a poor slope.

Location:

trunk/extsrc/gpcsw/gpcsrc

Files:

• analysis/libpscoords/pscoords.c (modified) (1 diff)
• analysis/libpscoords/pscoords.h (modified) (1 diff)
• analysis/libpsf/psf.c (modified) (2 diffs)
• analysis/libpsf/psf2dim.f (modified) (1 diff)
• fits/burntool/burnfix.c (modified) (2 diffs)
• fits/burntool/burntool.c (modified) (17 diffs)
• fits/burntool/burntool.h (modified) (3 diffs)
• fits/burntool/burnutils.c (modified) (1 diff)
• fits/burntool/man/burntool.1 (modified) (2 diffs)
• fits/burntool/persist_fits.c (modified) (48 diffs)
• fits/burntool/persist_fits.h (modified) (1 diff)
• fits/burntool/persistfix.c (modified) (1 diff)
• fits/burntool/persistio.c (modified) (10 diffs)
• fits/burntool/psfstamp.c (modified) (9 diffs)
• fits/burntool/stardetect.c (modified) (1 diff)
• fits/burntool/trailfit.c (modified) (4 diffs)
• fits/libfhreg/general.h (modified) (3 diffs)
• fits/libfhreg/gpc_all.h (modified) (1 diff)
• fits/libfhreg/gpc_detector.h (modified) (3 diffs)
• fits/libfhreg/gpc_instrument.h (modified) (2 diffs)
• fits/libfhreg/gpc_shutter.h (modified) (1 diff)
• fits/libfhreg/gpc_telescope.h (modified) (3 diffs)

trunk/extsrc/gpcsw/gpcsrc/analysis/libpscoords/pscoords.c

@@ -181 +181 @@
 #define PSC_REFRACT_CONST 55.7  /* Standard refraction ("/tanz) at STP */
 #endif
+
+/* Return default values for current fit*/
+int psc_defaults(double *pscale, double *d2, double *d3, double *airdens)
+{
+   *pscale = PS_scale;
+   *d2 = PS_d2;
+   *d3 = PS_d3;
+   *airdens = PS_airdens;
+   return(0);
+}
 
 /* Enable application of chip offsets (um, mrad)? */

trunk/extsrc/gpcsw/gpcsrc/analysis/libpscoords/pscoords.h

@@ -244 +244 @@
 /* Enable application of chip offsets (um, mrad)? */
 int psc_load_otaoff(const char *fname);
+
+/* Return default values for current fit*/
+int psc_defaults(double *pscale, double *d2, double *d3, double *airdens);

trunk/extsrc/gpcsw/gpcsrc/analysis/libpsf/psf.c

@@ -111 +111 @@
 /* Load up results (with a few sanity checks!) */
    if(psfout != NULL && alg != PSF_2DIM) {
-      psfout->ix = 0;
-      psfout->iy = 0;
+//      psfout->ix = 0;
+//      psfout->iy = 0;
+// 091211: JT this is a harmless lie, supposed to be highest pixel
+      psfout->ix = xu;
+      psfout->iy = yu;
+//
       psfout->x0 = xu;
       psfout->y0 = yu;
@@ -128 +132 @@
          psfextra->xfw = xfwhm;
          psfextra->yfw = yfwhm;
+         psfextra->majfw = 0.0;
+         psfextra->minfw = 0.0;
+         psfextra->thfw = 0.0;
+         psfextra->wpeak = 0.0;
+         psfextra->wbkgnd = 0.0;
+         psfextra->dflux = 0.0;
+         psfextra->dbkgnd = 0.0;
+         psfextra->rmsbkgnd = 0.0;
       }
       if(alg == PSF_BIN) psfextra->binfactor = extra;

trunk/extsrc/gpcsw/gpcsrc/analysis/libpsf/psf2dim.f

@@ -188 +188 @@
       wpar(9) = 0.5
 * WAUX: NXPATCH, NYPATCH, NX, XOFF, YOFF, EADU, EXTRASKY, IGNORE_VALUE, INIT
-      waux(1) = min(n,nx-1-mx) + n + 1
-      waux(2) = min(n,ny-1-my) + n + 1
+C      waux(1) = min(n,nx-1-mx) + n + 1
+C      waux(2) = min(n,ny-1-my) + n + 1
+      waux(1) = min(2*n+1, nx-1-iwxs)
+      waux(2) = min(2*n+1, ny-1-iwys)
       waux(3) = nx
       waux(4) = iwxs

trunk/extsrc/gpcsw/gpcsrc/fits/burntool/burnfix.c

@@ -109 +109 @@
 /* Restore all the burns */
    for(k=0; k<cell->npersist; k++) {
-      if(!cell->persist[k].fiterr) 
+      if(!cell->persist[k].fiterr && 
+         (cell->persist[k].func == BURN_PWR || 
+          cell->persist[k].func == BURN_EXP) ) {
          sub_fit(nx, ny, NX, buf, &(cell->persist[k]), -1);
+      }
    }
    return(0);
@@ -124 +127 @@
 /* Restore all the burns */
    for(k=0; k<cell->npersist; k++) {
-      if(!cell->persist[k].fiterr) 
+      if(!cell->persist[k].fiterr && 
+         (cell->persist[k].func == BURN_PWR || 
+          cell->persist[k].func == BURN_EXP) ) {
          sub_fit(nx, ny, NX, buf, &(cell->persist[k]), +1);
+      }
    }
    return(0);

trunk/extsrc/gpcsw/gpcsrc/fits/burntool/burntool.c

@@ -50 +50 @@
       fprintf(stderr, "\rerror: burntool could not open file `%s'\n",
               ifilename);
-      exit(EXIT_FAILURE);
+      exit(-314);
    }
    nextend = fh_extensions(ihu);
@@ -57 +57 @@
               ifilename);
 #ifndef JT2DHACK
-      exit(EXIT_FAILURE);
+      exit(-315);
 #endif
    }
@@ -343 +343 @@
              ifilename);
      if(persist_fits_remove_tables(ihu, deltablefitsfile) != FH_SUCCESS) {
-       exit(EXIT_FAILURE);
-     }
-     else {
+       exit(-316);
+     } else {
        exit(EXIT_SUCCESS);
      }
@@ -365 +364 @@
 /* Read the persistence data for this OTA */
    if(persistfile != NULL) {                    /* Text data file */
-      if(persist_read(OTA, persistfile)) exit(EXIT_FAILURE);
+      if(persist_read(OTA, persistfile, apply)) exit(-317);
    } else if(persistfitsfile != NULL) {         /* FITS table */
-      if(persist_fits_read(OTA, persistfitsfile) != FH_SUCCESS)
-         exit(EXIT_FAILURE);
+      if(persist_fits_read(OTA, persistfitsfile, apply) != FH_SUCCESS)
+         exit(-318);
    }
 
@@ -427 +426 @@
                  "\rerror: Cannot read EXTNAME from `%s' for extension #%d\n",
                  ifilename, ext);
-         exit(EXIT_FAILURE);
+         exit(-319);
       }
       if(fh_get_str(ehu, "XTENSION", xtension, sizeof(xtension)) != FH_SUCCESS) {
@@ -433 +432 @@
                  "\rerror: Cannot read XTENSION from `%s' for extension #%d\n",
                  ifilename, ext);
-         exit(EXIT_FAILURE);     
+         exit(-320);
       }
       if(!strcmp("TABLE", xtension)) {
@@ -461 +460 @@
          fprintf(stderr,
                  "\rerror: Illegal cell number %d from '%s'\n", cell, extname);
-         exit(EXIT_FAILURE);
+         exit(-321);
       }
 
@@ -487 +486 @@
           (naxis >= 3 && fh_get_NAXIS3(ehu, &naxis3) != FH_SUCCESS)) {
          fprintf(stderr, "\rerror: Cannot get NAXIS*'\n");
-         exit(EXIT_FAILURE);
+         exit(-322);
       }
       if (naxis != 2) {
@@ -503 +502 @@
          }
          fprintf(stderr, "\rerror: 32bpp support not yet implemented in burntool.\n");
-         exit(EXIT_FAILURE);
+         exit(-324);
       }
 /* Check BSCALE and warn if it is anything other than 1.0.
@@ -525 +524 @@
       }
 
-      buf = (IMTYPE*)malloc(naxis1*naxis2*naxis3*sizeof(short));
+      if( (buf = (IMTYPE*)malloc(naxis1*naxis2*naxis3*sizeof(short))) == NULL) {
+         fprintf(stderr, "\rerror: failed to alloc FITS buffer\n");
+         exit(-325);
+      }
       if (fh_read_padded_image(ehu, fh_file_desc(ehu), buf,
                                naxis1*naxis2*naxis3*sizeof(short),
@@ -531 +533 @@
          fprintf(stderr, "\rerror: failed to read image data for extension `%s'.\n",
                  extname);
-         free(buf);
-         exit(EXIT_FAILURE);
+//       free(buf);
+         exit(-326);
       }
 
@@ -617 +619 @@
                fprintf(stderr, "\rerror: failed to re-write image data for extension `%s'.\n",
                        extname);
-               free(buf);
-               exit(EXIT_FAILURE);
+//             free(buf);
+               exit(-327);
             }
          }
@@ -667 +669 @@
    if(2*SKY_MARG*ny > nmedian_buf) {
       if(median_buf != NULL) free(median_buf);
-      median_buf = (int *)calloc(2*SKY_MARG*ny, sizeof(int));
+      if( (median_buf = (int *)calloc(2*SKY_MARG*ny, sizeof(int))) == NULL) {
+         fprintf(stderr, "\rerror: failed to alloc median buffer\n");
+         exit(-667);
+      }
+
       nmedian_buf = 2*SKY_MARG*ny;
    }
@@ -674 +680 @@
    if(NX*NY > nimbuf) {
       if(imbuf != NULL) free(imbuf);
-      imbuf = (int *)calloc(NX*NY, sizeof(DTYPE));
+      if( (imbuf = (int *)calloc(NX*NY, sizeof(DTYPE))) == NULL) {
+         fprintf(stderr, "\rerror: failed to alloc cell copy\n");
+         exit(-668);
+      }
       nimbuf = NX*NY;
    }
@@ -681 +690 @@
    if(NX*NY > nmbuf) {
       if(mbuf != NULL) free(mbuf);
-      mbuf = (int *)calloc(NX*NY, sizeof(MTYPE));
+      if( (mbuf = (int *)calloc(NX*NY, sizeof(MTYPE))) == NULL) {
+         fprintf(stderr, "\rerror: failed to alloc mask buffer\n");
+         exit(-669);
+      }
       nmbuf = NX*NY;
    }
@@ -688 +700 @@
    if(NX*NY > nmsbuf) {
       if(msbuf != NULL) free(msbuf);
-      msbuf = (int *)calloc(NX*NY, sizeof(MTYPE));
+      if( (msbuf = (int *)calloc(NX*NY, sizeof(MTYPE))) == NULL) {
+         fprintf(stderr, "\rerror: failed to alloc veto buffer\n");
+         exit(-670);
+      }
       nmsbuf = NX*NY;
    }
@@ -755 +770 @@
    printf(" restore={t|f}  Restore the input MEF by adding input fits?\n");
    printf(" apply={t|f}    Modify the input MEF by subtracting previously calculated fits?\n");
-   printf(" tableonly={t|f} Calculate fits but do *not* modify the input MEF images, only write tables\n");
+   printf(" tableonly={t|f} Calculate fits but do *not* modify the input MEF pixels, only write tables\n");
    printf(" in=fname       Input file for previous burn persistence streaks\n");
    printf(" infits=fname   Input FITS file for previous burn persistence streaks (stored\n");

trunk/extsrc/gpcsw/gpcsrc/fits/burntool/burntool.h

@@ -91 +91 @@
 #define BURN_EXP  2             /* Exponential */
 #define BURN_BLASTED 3          /* Blasted top to bottom: flag only for IPP */
+#define BURN_POSSLOPE 4         /* Positive slope fit (bad) but significant */
 #define PSF_STAR  9             /* Unfitted: good psf star */
 
@@ -175 +176 @@
 STATIC int burn_restore(int nx, int ny, int NX, IMTYPE *buf, CELL *cell);
 STATIC int burn_apply(int nx, int ny, int NX, IMTYPE *buf, CELL *cell);
-STATIC int persist_read(CELL *cell, const char *infile);
+STATIC int persist_read(CELL *cell, const char *infile, int apply);
 STATIC int persist_write(CELL *cell, const char *outfile);
 STATIC int persist_fix(int nx, int ny, int stride, IMTYPE *buf, CELL *cell);
 STATIC int persist_merge(CELL *cell);
+
+//fh_result persist_fits_read(CELL *cell, const char *filename, int apply);
+//fh_result persist_fits_write(CELL *cell, HeaderUnit phu);
+//fh_result persist_fits_remove_tables(HeaderUnit phu_in, const char *fileout);
 
 STATIC int star_detect(int nx, int ny, int NX, int NY, DTYPE *data,
@@ -208 +213 @@
 STATIC int wlinearfit(int npt, double *x, double *y, 
                       double *w, double *a, double *b);
+STATIC int linearrms(int npt, double *x, double *y, double a, double b, double *rms);
 STATIC int int_median(int n, int *key);
 STATIC double double_median(int n, double *key);

trunk/extsrc/gpcsw/gpcsrc/fits/burntool/burnutils.c

@@ -290 +290 @@
    return(0);
 }
+
+/****************************************************************/
+/* Return of RMS relative to Fit y = ax + b */
+STATIC int linearrms(int npt, double *x, double *y, double a, double b, 
+                     double *rms)
+{
+   *rms = 0.0;
+   while(--npt >= 0) *rms += (y[npt]-a*x[npt]-b)*(y[npt]-a*x[npt]-b);
+   if(*rms > 0) *rms = sqrt(*rms);
+   return(0);
+}

trunk/extsrc/gpcsw/gpcsrc/fits/burntool/man/burntool.1

@@ -60 +60 @@
         correction is applied) and they will propagate from input to output
         until they finally achieve a legal fit with negligible amplitude.
+        Note that if burntool decides that a fit had a bad slope but was 
+        non-negligible it writes a function type "BURN_POSSLOPE" = 4 so
+        the box is available for masking if desired, and can be refitted
+        on subsequent images.
 
         Burntool also identifies really blasted areas which are saturated from
@@ -227 +231 @@
 
         tableonly={t|f}
-                Calculate fits but do *not* modify the input MEF images, 
+                Calculate fits but do *not* modify the input MEF pixels, 
                 only write the fit data as a FITS and/or text table (default f)
 

trunk/extsrc/gpcsw/gpcsrc/fits/burntool/persist_fits.c

@@ -52 +52 @@
    AREA_TABLE_COL_SXFIT,
    AREA_TABLE_COL_EXFIT,
+   AREA_TABLE_COL_FITERR,
    
    /* Add new columns above this line. */
@@ -86 +87 @@
    { "sxfit", "Starting column for fit",              "pixels",  FH_TABLE_FORMAT_INT,    3,     0 },
    { "exfit", "Ending column for fit",                "pixels",  FH_TABLE_FORMAT_INT,    3,     0 },
+   { "fiterr", "Error code of fit",                "",  FH_TABLE_FORMAT_INT,    3,     0 },
 };
 
@@ -222 +224 @@
       for(k=0; k<cell[j].npersist; k++) 
       {
+/* Retire old burns */
+         if(cell[j].time - cell[j].persist[k].time > EXPIRE_TRAIL_TIME)
+            continue;
+
          if(PERSIST_RETAIN) {
 /* Keep fits which have a dubious slope */
@@ -306 +312 @@
       (fh_table_write_value(table, data, row, AREA_TABLE_COL_NFIT,  &(area->nfit))  != FH_SUCCESS) ||
       (fh_table_write_value(table, data, row, AREA_TABLE_COL_SXFIT, &(area->sxfit)) != FH_SUCCESS) ||
-      (fh_table_write_value(table, data, row, AREA_TABLE_COL_EXFIT, &(area->exfit)) != FH_SUCCESS))
-   {
-      fprintf(stderr, "error: Error writing data to row %d of area table.\n", row);
+      (fh_table_write_value(table, data, row, AREA_TABLE_COL_EXFIT, &(area->exfit)) != FH_SUCCESS) ||
+      (fh_table_write_value(table, data, row, AREA_TABLE_COL_FITERR, &(area->fiterr)) != FH_SUCCESS))
+   {
+      fprintf(stderr, "\rerror: Error writing data to row %d of area table.\n", row);
       return FH_BAD_VALUE;
    }
@@ -346 +353 @@
       for(k=0; k<cell[j].npersist; k++) 
       {
+/* Retire old burns */
+         if(cell[j].time - cell[j].persist[k].time > EXPIRE_TRAIL_TIME)
+            continue;
+
          if(PERSIST_RETAIN) {
 /* Keep fits which have a dubious slope */
@@ -422 +433 @@
       (fh_table_write_value(table, data, row, FIT_TABLE_COL_ZERO, &zero) != FH_SUCCESS))
    {
-      fprintf(stderr, "error: Error writing data to row %d of fit table.\n", row);
+      fprintf(stderr, "\rerror: Error writing data to row %d of fit table.\n", row);
       return FH_BAD_VALUE;
    }
@@ -460 +471 @@
       for(k=0; k<cell[j].npersist; k++) 
       {
+/* Retire old burns */
+         if(cell[j].time - cell[j].persist[k].time > EXPIRE_TRAIL_TIME)
+            continue;
+
          if(PERSIST_RETAIN) {
 /* Keep fits which have a dubious slope */
@@ -526 +541 @@
  */
 static fh_result
-read_area(fhTable * table, void * data, int row)
+read_area(fhTable * table, void * data, int row, int apply)
 {
    int cell_num;
@@ -534 +549 @@
    {
       fprintf(stderr,
-              "error: Unable to get cell number from row %d of burn area table\n",
+              "\rerror: Unable to get cell number from row %d of burn area table\n",
               row);
       return FH_BAD_VALUE;
@@ -542 +557 @@
    if((cell_num < 0) || (cell_num > MAXCELL))
    {
-      fprintf(stderr, "error: illegal cell %d in area table row %d\n",
+      fprintf(stderr, "\rerror: illegal cell %d in area table row %d\n",
               cell_num, row);
       boxbuf[row].cell = -1;
@@ -573 +588 @@
       (fh_table_read_value(table, data, row, AREA_TABLE_COL_NFIT,  &(boxbuf[row].nfit)) != FH_SUCCESS) ||
       (fh_table_read_value(table, data, row, AREA_TABLE_COL_SXFIT, &(boxbuf[row].sxfit)) != FH_SUCCESS) ||
-      (fh_table_read_value(table, data, row, AREA_TABLE_COL_EXFIT, &(boxbuf[row].exfit)) != FH_SUCCESS))
+      (fh_table_read_value(table, data, row, AREA_TABLE_COL_EXFIT, &(boxbuf[row].exfit)) != FH_SUCCESS) ||
+      (fh_table_read_value(table, data, row, AREA_TABLE_COL_FITERR, &(boxbuf[row].fiterr)) != FH_SUCCESS))
    {
       fprintf(stderr,
-              "error: Error reading values from row %d of burn area table\n",
+              "\rerror: Error reading values from row %d of burn area table\n",
               row);
       boxbuf[row].nfit = 0;
@@ -593 +609 @@
       boxbuf[row].xfit = (int *)calloc(boxbuf[row].nfit, sizeof(int));
       boxbuf[row].yfit = (int *)calloc(boxbuf[row].nfit, sizeof(int));
-      boxbuf[row].fiterr = 0;
+
+      if(boxbuf[row].zero == NULL ||
+         boxbuf[row].xfit == NULL ||
+         boxbuf[row].yfit == NULL) {
+         fprintf(stderr, "\rerror: failed to alloc boxbuf\n");
+         exit(-671);
+      }
+// 100203 JT: fiterr now saved and read, refit if not just an "apply"
+      if(!apply) boxbuf[row].fiterr = 0;
    }
 
@@ -616 +640 @@
  */
 static fh_result
-read_area_table(HeaderUnit hu, fhTable * table)
+read_area_table(HeaderUnit hu, fhTable * table, int apply)
 {
    fh_result result = FH_INVALID;
@@ -627 +651 @@
       (fh_get_int(hu, "TFIELDS", &num_cols) != FH_SUCCESS))
    {
-      fprintf(stderr, "error: Unable to find required keywords for area table dimensions\n");
+      fprintf(stderr, "\rerror: Unable to find required keywords for area table dimensions\n");
       return FH_NOT_FOUND;
    }
@@ -634 +658 @@
    if(num_cols != table->num_cols) 
    {
-      fprintf(stderr, "error: %d-column area table found, expected %d cols.\n",
+      fprintf(stderr, "\rerror: %d-column area table found, expected %d cols.\n",
               num_cols, table->num_cols);
       return FH_BAD_VALUE;
@@ -642 +666 @@
    {
       fprintf(stderr, 
-              "error: too many boxes in area table. Max is %d, got %d\n",
+              "\rerror: too many boxes in area table. Max is %d, got %d\n",
               MAXBURN, num_rows);
       return FH_BAD_VALUE;
@@ -654 +678 @@
    {
       fprintf(stderr, 
-              "error: Unable to allocate %d bytes for area table.\n",
+              "\rerror: Unable to allocate %d bytes for area table.\n",
               table->table_size);
       return FH_NO_MEMORY;
@@ -662 +686 @@
                     table->table_size, FH_TYPESIZE_8) != FH_SUCCESS)
    {
-      fprintf(stderr, "error: Unable to map area table body for reading.\n");
+      fprintf(stderr, "\rerror: Unable to map area table body for reading.\n");
       free(data);
       return FH_INVALID;
@@ -669 +693 @@
    for(i = 0; i < num_rows; i++)
    {
-      if((result = read_area(table, data, i)) != FH_SUCCESS) break;
+      if((result = read_area(table, data, i, apply)) != FH_SUCCESS) break;
    }
 
@@ -713 +737 @@
    {
       fprintf(stderr,
-              "error: Unable to get cell number from row %d of fit table\n",
+              "\rerror: Unable to get cell number from row %d of fit table\n",
               row);
       return FH_BAD_VALUE;
@@ -720 +744 @@
    if((*cell < 0) || (*cell > MAXCELL))
    {
-      fprintf(stderr, "error: illegal cell %d in fit table row %d\n",
+      fprintf(stderr, "\rerror: illegal cell %d in fit table row %d\n",
               *cell, row);
       
@@ -733 +757 @@
    {
       fprintf(stderr,
-              "error: Error reading values from row %d of burn area table\n",
+              "\rerror: Error reading values from row %d of burn area table\n",
               row);
       return FH_BAD_VALUE;
@@ -782 +806 @@
       (fh_get_int(hu, "TFIELDS", &num_cols) != FH_SUCCESS))
    {
-      fprintf(stderr, "error: Unable to find required keywords for fit table dimensions\n");
+      fprintf(stderr, "\rerror: Unable to find required keywords for fit table dimensions\n");
       return FH_NOT_FOUND;
    }
@@ -789 +813 @@
    if(num_cols != table->num_cols) 
    {
-      fprintf(stderr, "error: %d-column fit table found, expected %d cols.\n",
+      fprintf(stderr, "\rerror: %d-column fit table found, expected %d cols.\n",
               num_cols, table->num_cols);
       return FH_BAD_VALUE;
@@ -805 +829 @@
    {
       fprintf(stderr, 
-              "error: Unable to allocate %d bytes for area table.\n",
+              "\rerror: Unable to allocate %d bytes for area table.\n",
               table->table_size);
       return FH_NO_MEMORY;
@@ -811 +835 @@
    if(fh_read_image(hu, fh_file_desc(hu), data, table->table_size, FH_TYPESIZE_8) != FH_SUCCESS)
    {
-      fprintf(stderr, "error: Unable to read fit table body.\n");
+      fprintf(stderr, "\rerror: Unable to read fit table body.\n");
       free(data);
       return FH_INVALID;
@@ -836 +860 @@
          {
             fprintf(stderr, 
-                    "error: Fit in table row %d does not match current area "
+                    "\rerror: Fit in table row %d does not match current area "
                     "(table cell=%d cx=%d cy=%d vs. area cell=%d cx=%d cy=%d)\n",
                     fit_table_row,
@@ -882 +906 @@
  */
 fh_result
-persist_fits_read(CELL *cell, const char * filename)
+persist_fits_read(CELL *cell, const char * filename, int apply)
 {
    HeaderUnit phu;
@@ -891 +915 @@
    {
       fprintf(stderr, 
-              "error: unable to create header structure for FITS file \"%s\"\n",
+              "\rerror: unable to create header structure for FITS file \"%s\"\n",
               filename);
       return FH_NO_MEMORY;
@@ -899 +923 @@
    if ((result = fh_file(phu, filename, FH_FILE_RDONLY)) != FH_SUCCESS)
    {
-      fprintf(stderr, 
-              "error: unable to open FITS file \"%s\"\n",
+      fprintf(stderr, "\rerror: unable to open FITS file \"%s\"\n",
               filename);
       fh_destroy(phu);
@@ -911 +934 @@
    if(!area_hu || !fit_hu) 
    {
-      fprintf(stderr, 
-              "error: Unable to find persistence info in FITS file.\n");
+      fprintf(stderr, "\rerror: Unable to find persistence info in FITS file.\n");
       fh_destroy(phu);
       return FH_NOT_FOUND;
@@ -921 +943 @@
 
    fh_ehu_by_extname(phu, DEFAULT_EXTNAME_AREA_TABLE);
-   if((result = read_area_table(area_hu, &area_table)) != FH_SUCCESS)
+   if((result = read_area_table(area_hu, &area_table, apply)) != FH_SUCCESS)
    {
       free(area_table.strbuf);
       free(fit_table.strbuf);
       fh_destroy(phu);
+      fprintf(stderr, "\rerror: Unable to read area table from FITS file.\n");
       return result;
    }
@@ -935 +958 @@
       free(fit_table.strbuf);
       fh_destroy(phu);
+      fprintf(stderr, "\rerror: Unable to read fit table from FITS file.\n");
       return result;
    }
@@ -961 +985 @@
       for(k=0; k<MAXCELL; k++) {
          if( (i=cell[k].npersist) > 0) {
-            cell[k].persist = (OBJBOX *)calloc(i, sizeof(OBJBOX));
+            if( (cell[k].persist = (OBJBOX *)calloc(i, sizeof(OBJBOX))) == NULL) {
+               fprintf(stderr, "\rerror: failed to alloc cell persist buffer\n");
+               exit(-672);
+            }
             cell[k].npersist = 0;
          }
@@ -1018 +1045 @@
    {
       fprintf(stderr, 
-              "error: Unable to write correction info to FITS file. Correction FITS tables already exist.\n");
+              "\rerror: Unable to write correction info to FITS file. Correction FITS tables already exist.\n");
       return FH_NO_SPACE;
    }
@@ -1025 +1052 @@
    if ((fd = fh_file_desc(phu)) == -1)
    {
-      fprintf(stderr, "error: header passed has no associated file.\n");
+      fprintf(stderr, "\rerror: header passed has no associated file.\n");
       return FH_INVALID;
    }
@@ -1033 +1060 @@
    {
       fprintf(stderr,
-              "error: Unable to seek to end of file.\n");
+              "\rerror: Unable to seek to end of file.\n");
       return FH_IN_ERRNO;
    }
@@ -1042 +1069 @@
    {
       fprintf(stderr, 
-              "error: Unable to create headers for correction FITS tables.\n");
+              "\rerror: Unable to create headers for correction FITS tables.\n");
       if(area_hu) fh_destroy(area_hu);
       if(fit_hu) fh_destroy(fit_hu);
@@ -1066 +1093 @@
       (fh_munmap_table(area_hu) != FH_SUCCESS))
    {
-      fprintf(stderr, "error: Error encountered writing area table to FITS file.\n");
+      fprintf(stderr, "\rerror: Error encountered writing area table to FITS file.\n");
       fh_destroy(fit_hu);
       free(area_table.strbuf);
@@ -1087 +1114 @@
       (fh_munmap_table(fit_hu) != FH_SUCCESS))
    {
-      fprintf(stderr, "error: Error encountered writing area table to FITS file.\n");
+      fprintf(stderr, "\rerror: Error encountered writing area table to FITS file.\n");
       free(area_table.strbuf);
       free(fit_table.strbuf);
@@ -1149 +1176 @@
    if(fh_get_int(phu_in, "NEXTEND", &num_extensions) != FH_SUCCESS)
    {
-      fprintf(stderr, "error: Unable to get NEXTEND from input primary FITS header.\n");
+      fprintf(stderr, "\rerror: Unable to get NEXTEND from input primary FITS header.\n");
       return FH_INVALID;
    }
@@ -1157 +1184 @@
    {
       fprintf(stderr, 
-              "error: Unable to find persistence info in FITS file.\n");
+              "\rerror: Unable to find persistence info in FITS file.\n");
       return FH_INVALID;
    }
@@ -1175 +1202 @@
    if((fd_out = open(fileout, O_CREAT | O_RDWR, 0644)) < 0)
    {
-      fprintf(stderr, "error: Failed to open \"%s\" for output.\n",
+      fprintf(stderr, "\rerror: Failed to open \"%s\" for output.\n",
               fileout);
       exit(EXIT_FAILURE);
@@ -1192 +1219 @@
       (fh_write(phu_out, fd_out) != FH_SUCCESS))
    {
-      fprintf(stderr, "error: Unable to copy primary header to \"%s\"\n",
+      fprintf(stderr, "\rerror: Unable to copy primary header to \"%s\"\n",
               fileout);
       fh_destroy(phu_out);
@@ -1209 +1236 @@
       if(!(ehu_in = fh_ehu(phu_in, i)))
       {
-         fprintf(stderr, "error: Unable to read extension %d from input FITS file\n", i);
+         fprintf(stderr, "\rerror: Unable to read extension %d from input FITS file\n", i);
          fh_destroy(phu_out);
          close(fd_out);
@@ -1217 +1244 @@
       if (fh_get_str(ehu_in, "EXTNAME", extname, sizeof(extname)) != FH_SUCCESS)
       {
-         fprintf(stderr, "error: Unable to get EXTNAME from extension %d in input FITS file.\n", i); 
+         fprintf(stderr, "\rerror: Unable to get EXTNAME from extension %d in input FITS file.\n", i); 
          fh_destroy(phu_out);
          close(fd_out);
@@ -1233 +1260 @@
             (fh_reserve(ehu_out, (2880/80)) != FH_SUCCESS))
          {
-            fprintf(stderr, "error: Unable to copy extension %d to %s.\n", i, fileout); 
+            fprintf(stderr, "\rerror: Unable to copy extension %d to %s.\n", i, fileout); 
             fh_destroy(phu_out);
             close(fd_out);
@@ -1248 +1275 @@
             (fh_copy_padded_image(ehu_out, fd_out, fh_file_desc(ehu_in)) != FH_SUCCESS))
          {
-            fprintf(stderr, "error: Unable to copy extension %d to %s.\n", i, fileout); 
+            fprintf(stderr, "\rerror: Unable to copy extension %d to %s.\n", i, fileout); 
             fh_destroy(phu_out);
             close(fd_out);

trunk/extsrc/gpcsw/gpcsrc/fits/burntool/persist_fits.h

@@ -24 +24 @@
 
 fh_result
-persist_fits_read(CELL *cell, const char * filename);
+persist_fits_read(CELL *cell, const char * filename, int apply);
 
 fh_result

trunk/extsrc/gpcsw/gpcsrc/fits/burntool/persistfix.c

@@ -34 +34 @@
          }
          continue;
+      }
+
+/* This had a significant positive slope, what do we do now? */
+      if( (cell->persist)[k].func == BURN_POSSLOPE) {
+/* try again, so let it slide through... */
       }
 

trunk/extsrc/gpcsw/gpcsrc/fits/burntool/persistio.c

@@ -16 +16 @@
 /****************************************************************/
 /* persist_read(): Read all the persistence trails from a file */
-STATIC int persist_read(CELL *cell, const char *infile)
+STATIC int persist_read(CELL *cell, const char *infile, int apply)
 {
    int i, k, nbox=0;
@@ -38 +38 @@
    while(fgets(line, 1024, fp) != NULL) {
       if(line[0] == '#') continue;
-      sscanf(line, "%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %lf %d %d %d",
+      sscanf(line, "%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %lf %d %d %d %d",
              &boxbuf[nbox].cell, &boxbuf[nbox].time,
              &boxbuf[nbox].cx, &boxbuf[nbox].cy,
@@ -50 +50 @@
              &boxbuf[nbox].func, &boxbuf[nbox].up,
              &boxbuf[nbox].slope, &boxbuf[nbox].nfit,
-             &boxbuf[nbox].sxfit, &boxbuf[nbox].exfit);
+             &boxbuf[nbox].sxfit, &boxbuf[nbox].exfit,
+             &boxbuf[nbox].fiterr);
       if(boxbuf[nbox].nfit > 0) {
          boxbuf[nbox].zero = (double *)calloc(boxbuf[nbox].nfit, sizeof(double));
          boxbuf[nbox].xfit = (int *)calloc(boxbuf[nbox].nfit, sizeof(int));
          boxbuf[nbox].yfit = (int *)calloc(boxbuf[nbox].nfit, sizeof(int));
+         if(boxbuf[nbox].zero == NULL ||
+            boxbuf[nbox].xfit == NULL ||
+            boxbuf[nbox].yfit == NULL) {
+            fprintf(stderr, "\rerror: failed to alloc boxbuf\n");
+            exit(-673);
+         }
+
          for(i=0; i<boxbuf[nbox].nfit; i++) {
             if(fgets(line, 1024, fp) == NULL) {
@@ -64 +72 @@
          }
       }
-      boxbuf[nbox].fiterr = 0;
+// 100203 JT: fiterr now saved and read, refit if not just an "apply"
+      if(!apply) boxbuf[nbox].fiterr = 0;
 /* Augment counts */
       k = boxbuf[nbox].cell;
@@ -85 +94 @@
    for(k=0; k<MAXCELL; k++) {
       if( (i=cell[k].npersist) > 0) {
-         cell[k].persist = (OBJBOX *)calloc(i, sizeof(OBJBOX));
+         if( (cell[k].persist = (OBJBOX *)calloc(i, sizeof(OBJBOX))) == NULL) {
+            fprintf(stderr, "\rerror: failed to alloc cell persist buffer\n");
+            exit(-674);
+         }
          cell[k].npersist = 0;
       }
@@ -242 +254 @@
       for(k=0; k<cell[j].npersist; k++) {
 
+/* Retire old burns */
+         if(cell[j].time - cell[j].persist[k].time > EXPIRE_TRAIL_TIME)
+            continue;
+
          if(PERSIST_RETAIN) {
 /* Keep fits which have a dubious slope */
@@ -252 +268 @@
             if(cell[j].persist[k].nfit <= 0) continue;
          }
-         fprintf(fp, "%3d %7d  %3d %3d %5d %3d  %3d %3d  %3d %3d  %3d %3d %3d %3d %3d %3d %3d %3d  %1d %1d %9.6f %3d %3d %3d\n",
+         fprintf(fp, "%3d %7d  %3d %3d %5d %3d  %3d %3d  %3d %3d  %3d %3d %3d %3d %3d %3d %3d %3d  %1d %1d %9.6f %3d %3d %3d %d\n",
                  j, cell[j].persist[k].time, 
                  cell[j].persist[k].cx, cell[j].persist[k].cy, 
@@ -264 +280 @@
                  cell[j].persist[k].func, cell[j].persist[k].up, 
                  cell[j].persist[k].slope, cell[j].persist[k].nfit,
-                 cell[j].persist[k].sxfit, cell[j].persist[k].exfit);
+                 cell[j].persist[k].sxfit, cell[j].persist[k].exfit, 
+                 cell[j].persist[k].fiterr);
          for(i=0; i<cell[j].persist[k].nfit; i++) {
             fprintf(fp, "%3d %3d %8.4f\n", cell[j].persist[k].xfit[i], 
@@ -288 +305 @@
 
          i = (cell[j].burn[k].ex - cell[j].burn[k].sx + 1) / 2;
-         fprintf(fp, "%3d %7d  %3d %3d %5d %3d  %3d %3d  %3d %3d  %3d %3d %3d %3d %3d %3d %3d %3d  %1d %1d %9.6f %3d %3d %3d\n", 
+         fprintf(fp, "%3d %7d  %3d %3d %5d %3d  %3d %3d  %3d %3d  %3d %3d %3d %3d %3d %3d %3d %3d  %1d %1d %9.6f %3d %3d %3d %d\n", 
                  j, cell[j].burn[k].time, 
                  cell[j].burn[k].cx, cell[j].burn[k].cy,
@@ -300 +317 @@
                  cell[j].burn[k].func, cell[j].burn[k].up, 
                  cell[j].burn[k].slope, cell[j].burn[k].nfit,
-                 cell[j].burn[k].sxfit, cell[j].burn[k].exfit);
+                 cell[j].burn[k].sxfit, cell[j].burn[k].exfit, 
+                 cell[j].burn[k].fiterr);
          for(i=0; i<cell[j].burn[k].nfit; i++) {
             fprintf(fp, "%3d %3d %8.4f\n", cell[j].burn[k].xfit[i], 

trunk/extsrc/gpcsw/gpcsrc/fits/burntool/psfstamp.c

@@ -112 +112 @@
 
 /* Make a postage stamp for it */
-      box[k].stamp = (IMTYPE *)calloc(size*size, sizeof(IMTYPE));
+      if( (box[k].stamp = (IMTYPE *)calloc(size*size, sizeof(IMTYPE))) == NULL) {
+         fprintf(stderr, "\rerror: failed to stamp buffer\n");
+         exit(-675);
+      }
+
       sum = 0;
       for(j=y0; j<=y1; j++) {
@@ -136 +140 @@
    int i, k, l, nstar, fdout, otacx, otacy, xid, yid, ntot=0, sumax;
    int cellcount, ota_xid, ota_yid;
-   double scale, phi, fwhm[3], q[5], qt, xfp, yfp, pi=4*atan(1.0);
+   double scale, phi, fwhm[3], q[7], qt, xfp, yfp, pi=4*atan(1.0);
    IMTYPE *median_image;
    CELL *cell;
@@ -171 +175 @@
 
 /* Create a median image and write as the first one */
-   median_image = (IMTYPE *)calloc(nx*ny, sizeof(IMTYPE));
+   if( (median_image = (IMTYPE *)calloc(nx*ny, sizeof(IMTYPE))) == NULL) {
+      fprintf(stderr, "\rerror: failed to alloc median PSF image\n");
+      exit(-676);
+   }
    for(i=0; i<nx*ny; i++) {
       nstar = 0;
@@ -256 +263 @@
    int k, l, cellx, celly, ota_xid, ota_yid, nfwave, nqavg;
    double xota, yota, xfp, yfp, phi;
-   double fwhm[3], q[5], fw[MAXPSFMEDIAN];
+   double fwhm[3], q[7], fw[MAXPSFMEDIAN];
    double m2[MAXPSFMEDIAN], qp[MAXPSFMEDIAN], qc[MAXPSFMEDIAN];
    double qt[MAXPSFMEDIAN], fwavg[MAXPSFMEDIAN];
+   double qpavg[MAXPSFMEDIAN], qcavg[MAXPSFMEDIAN], qtavg[MAXPSFMEDIAN];
    double q3c[MAXPSFMEDIAN], q3s[MAXPSFMEDIAN];
-   double qpavg[MAXPSFMEDIAN], qcavg[MAXPSFMEDIAN], qtavg[MAXPSFMEDIAN];
    double q3cavg[MAXPSFMEDIAN], q3savg[MAXPSFMEDIAN];
+   double q1c[MAXPSFMEDIAN], q1s[MAXPSFMEDIAN];
+   double q1cavg[MAXPSFMEDIAN], q1savg[MAXPSFMEDIAN];
    int nstar[MAXCELL], nfw[MAXCELL];
    double fwmed[MAXCELL], m2med[MAXCELL];
    double qpmed[MAXCELL], qcmed[MAXCELL], qtmed[MAXCELL];
    double q3cmed[MAXCELL], q3smed[MAXCELL];
-   double qpmacro, qcmacro, qtmacro, fwmacro, q3cmacro, q3smacro;
+   double q1cmed[MAXCELL], q1smed[MAXCELL];
+   double qpmacro, qcmacro, qtmacro, fwmacro, q3cmacro, q3smacro, q1cmacro, q1smacro;
    FILE *fp;
    CELL *cell;
@@ -310 +320 @@
                      q3c[nstar[k]] = q[3];
                      q3s[nstar[k]] = q[4];
+                     q1c[nstar[k]] = q[5];
+                     q1s[nstar[k]] = q[6];
 /* Get the position in the focal plane and therefore the qt statistic */
                      psc_cell_to_pixel(cellx, celly, 0.5*PSC_HCELL/PSC_PIXEL, 
@@ -333 +345 @@
                   q3cmed[k] = double_median(nstar[k], q3c);
                   q3smed[k] = double_median(nstar[k], q3s);
+                  q1cmed[k] = double_median(nstar[k], q1c);
+                  q1smed[k] = double_median(nstar[k], q1s);
                } else {
                   m2med[k] = qpmed[k] = qcmed[k] = qtmed[k] = -99.99;
                   q3cmed[k] = q3smed[k] = -99.99;
+                  q1cmed[k] = q1smed[k] = -99.99;
                }
 /* Toss these results into the macrocell median hopper */
@@ -348 +363 @@
                      q3cavg[nqavg] = q3c[l];
                      q3savg[nqavg] = q3s[l];
+                     q1cavg[nqavg] = q1c[l];
+                     q1savg[nqavg] = q1s[l];
                      nqavg++;
                   }
@@ -359 +376 @@
          q3cmacro = double_median(nqavg, q3cavg);
          q3smacro = double_median(nqavg, q3savg);
-         if(nqavg == 0) qpmacro = qcmacro = qtmacro = q3cmacro = q3smacro = -99.99;
+         q1cmacro = double_median(nqavg, q1cavg);
+         q1smacro = double_median(nqavg, q1savg);
+         if(nqavg == 0) qpmacro = qcmacro = qtmacro = q3cmacro = q3smacro = q1cmacro = q1smacro = -99.99;
          fwmacro = double_median(nfwave, fwavg);
 
@@ -370 +389 @@
                cell = ota + k;
 
-               fprintf(fp, "ext=xy%1d%1d bias=%d sky=%d rmssky=%d npsf=%d fwhm=%.2f fwmed=%.2f m2=%.2f qp=%.3f qc=%.3f qt=%.3f q3c=%.3f q3s=%.3f qpm=%.3f qcm=%.3f qtm=%.3f q3cm=%.3f q3sm=%.3f\n", 
+               fprintf(fp, "ext=xy%1d%1d bias=%d sky=%d rmssky=%d npsf=%d fwhm=%.2f fwmed=%.2f m2=%.2f qp=%.3f qc=%.3f qt=%.3f q3c=%.3f q3s=%.3f q1c=%.3f q1s=%.3f qpm=%.3f qcm=%.3f qtm=%.3f q3cm=%.3f q3sm=%.3f q1cm=%.3f q1sm=%.3f\n", 
                        cellx, celly, cell->bias, cell->sky, cell->rms, 
                        nstar[k], fwmed[k], fwmacro, m2med[k], 
-                       qpmed[k], qcmed[k], qtmed[k], q3cmed[k], q3smed[k],
-                       qpmacro, qcmacro, qtmacro, q3cmacro, q3smacro);
+                       qpmed[k], qcmed[k], qtmed[k], q3cmed[k], q3smed[k], 
+                       q1cmed[k], q1smed[k],
+                       qpmacro, qcmacro, qtmacro, q3cmacro, q3smacro, 
+                       q1cmacro, q1smacro);
             }
          }

trunk/extsrc/gpcsw/gpcsrc/fits/burntool/stardetect.c

@@ -193 +193 @@
    cell->burn = (OBJBOX *)calloc(cell->nburn, sizeof(OBJBOX));
    cell->star = (OBJBOX *)calloc(cell->nstar, sizeof(OBJBOX));
+   if( cell->burn == NULL || cell->star == NULL) {
+      fprintf(stderr, "\rerror: failed to alloc burn box\n");
+      exit(-678);
+   }
 
 /* Copy the boxes to the cell info structure */

trunk/extsrc/gpcsw/gpcsrc/fits/burntool/trailfit.c

@@ -30 +30 @@
 
    if(box->func != BURN_PWR && box->func != BURN_EXP) {
-      fprintf(stderr, "error: unimplemented fit function %d\n", box->func);
+      fprintf(stderr, "error: unimplemented fit function %d (err %d)\n", 
+              box->func, box->fiterr);
       return(-1);
    }
@@ -137 +138 @@
    box->xfit = (int *)calloc(xe-xs+1, sizeof(int));
    box->yfit = (int *)calloc(xe-xs+1, sizeof(int));
+   if(box->zero == NULL || box->xfit == NULL || box->yfit == NULL) {
+      fprintf(stderr, "\rerror: failed to alloc box memory\n");
+      exit(-679);
+   }
 /* Some defaults */
    box->slope = 0.0;
@@ -229 +234 @@
       box->nfit = 0;
       box->fiterr = FIT_SLOPE_ERROR;
+/* Check whether it's a significant trail (but with pos slope) or just noise */
+      linearrms(nfit, ybuf+y1, zbuf+y1, slope, zero, &trial);
+/* 100203 JT: bad idea: appears to be a bug in read/writing ABS(nfit) */
+//      if(trial > 2*rms) box->nfit = -box->nfit;
+      if(trial > 2*rms) box->func = BURN_POSSLOPE;
       return(-1);
    }
@@ -268 +278 @@
 /* FIXME: what's a really good criterion for negligible fit? */
 /* 100 pixels up fit is zsum or ~zsum/e */
-      if(zsum > NEGLIGIBLE_TRAIL*rms) {
+//      if(zsum > NEGLIGIBLE_TRAIL*rms) {
+      if(zsum > NEGLIGIBLE_TRAIL*rms ||
+/* 100113: but also evaluate at the end of the fit for stubby trails */
+         zbuf[y2]*zsum > NEGLIGIBLE_TRAIL*rms) {
 
 /* Ascertain the starting point of where the fit is good */

trunk/extsrc/gpcsw/gpcsrc/fits/libfhreg/general.h

@@ -79 +79 @@
 MK_PFL( 10.0,   BZERO   ,1, "Zero factor"                                     )
 MK_PFL( 11.0,   BSCALE  ,1, "Scale factor"                                    )
+MK_STR( 12.0,   BUNIT   ,   "fits-data * BSCALE + BZERO = these units"        )
 
 /*
@@ -90 +91 @@
 MK_CMT(   50.5, CMTSUM5 ,   ""                                                )
 MK_STR(   51.0, CMMTOBS ,   ""                                                )
+MK_STR(   51.1, CMMTOBS1,   ""                                                )
+MK_STR(   51.2, CMMTOBS2,   ""                                                )
+MK_STR(   51.3, CMMTOBS3,   ""                                                )
+MK_STR(   51.4, CMMTOBS4,   ""                                                )
+MK_STR(   51.5, CMMTOBS5,   ""                                                )
+MK_STR(   51.6, CMMTOBS6,   ""                                                )
+MK_STR(   51.7, CMMTOBS7,   ""                                                )
+MK_STR(   51.8, CMMTOBS8,   ""                                                )
+MK_STR(   51.9, CMMTOBS9,   ""                                                )
 MK_STR(   52.0, CMMTSEQ ,   ""                                                )
 MK_STR(   53.0, OBJECT  ,   ""                                                )
@@ -127 +137 @@
 
 MK_STR(   95.0, OBSTYPE,    "Observation/Exposure type"                       )
-MK_PFL(   96.0, EXPTIME,3,  "Exposure time (seconds)"                         )
-MK_PFL(   96.1, EXPREQ ,3,  "Exposure time requested (seconds)"               )
-MK_PFL(   97.0, DARKTIME,3, "Dark current time (seconds)"                     )
+MK_PFL(   96.0, EXPTIME,3,  "[sec] Exposure time"                             )
+MK_PFL(   96.1, EXPREQ ,3,  "[sec] Exposure time requested"                   )
+MK_PFL(   97.0, DARKTIME,3, "[sec] Dark current time"                         )
+MK_INT(   97.5,  PONTIME,   "[sec] Time since last detector \"power on\""     )
+MK_INT(   97.6,  SATTIME,   "[sec] Time since last detected saturation event" )
+MK_INT(   97.7,  TRKTIME,   "[sec] Time since last detected tracking error"   )
+MK_INT(   97.8,  VDOTIME,   "[sec] Time since \"video\" command used"         )

trunk/extsrc/gpcsw/gpcsrc/fits/libfhreg/gpc_all.h

@@ -20 +20 @@
 #include "gpc_wcs.h"
 #include "gpc_plant.h"
+#include "gpc_postprocess.h"

trunk/extsrc/gpcsw/gpcsrc/fits/libfhreg/gpc_detector.h

@@ -69 +69 @@
 MK_INT(  152.1, SATURATE,   "[ADU] Saturation value"                          )
 MK_FLT(  155.0, GAIN    ,3, "[e/ADU] est. gain from xray"                     )
-MK_FLT(  155.9, XRNOISE, 2, "[ADU] RMS noise in overscan on xray"             )
-MK_FLT(  156.0, RDNOISE ,2, "[ADU] RMS Read noise on overscan"                )
+MK_FLT(  155.9, XRNOISE, 3, "[e] RMS noise in overscan on xray"               )
+MK_FLT(  156.0, RDNOISE ,3, "[e] Read noise"                                  )
 MK_FLT(  157.0, DCURRENT,5, "[ADU/pixel/sec] Dark current"                    )
 MK_FLT(  157.1, DARKCUR ,5, "[e-/pixel/hour] Dark current"                    )
 MK_STR(  158.0, QEPOINTS,   "QE%@wavelength in nm"                            )
 MK_INT(  159.0, BIASLVL,    "[ADU] Bias level (overscan mean)"                )
-MK_INT(  159.2, BACKEST,    "[ADU] Background level est., overscan corrected" )
+MK_INT(  159.2, BACKEST,    "[ADU] Background level estimation"               )
 MK_STR(  165.0, DETSTAT ,   "Detector status"                                 )
 MK_FLT(  166.0, DETTEM  ,3, "[C] Detector temperature"                        )
+MK_CMT(  166.1, CMTDETT1,   "If DETTEMOV is T, DETTEMP was overridden. Old"   )
+MK_CMT(  166.2, CMTDETT2,   "temp. is CDETTEM and new temp. was derived as:"  )
+MK_CMT(  166.3, CMTDETT3,   "V = (ADU-B) / (A*32768)"                         )
+MK_CMT(  166.4, CMTDETT4,   "T = 3369-sqrt[3369^2+1313^2*(13.1*V-1)/(V-1)]"   )
+MK_BLN(  166.5, DETTEMOV,   "Detector temperature overridden"                 )
+MK_INT(  166.6, DETTEADU,   "[ADU] Detector temperature A/D measurement"      )
+MK_PFL(  166.7, DETTCOFA,3, "Coefficient A used in overriding detector temp." )
+MK_INT(  166.8, DETTCOFB,   "Coefficient B used in overriding detector temp." )
+MK_FLT(  166.9, CDETTEM ,3, "[C] Detector temperature calc. by controller"    )
 MK_PFL(  170.0, PIXSIZE ,3, "[um] Pixel size for both axes"                   )
 MK_PFL(  171.1, PIXSIZE1,3, "[um] Pixel size for axis 1"                      )
@@ -105 +114 @@
 MK_INT(  185.2, CCDBIN2 ,   "Binning factor along axis 2"                     )
 MK_INT(  186.1, PRESCAN1,   "Prescan count on axis 1"                         )
+MK_INT(  186.11,PRESCANX,   "Post-xtrig-bias portion of prescan1"             )
 MK_INT(  186.2, PRESCAN2,   "Prescan count on axis 2"                         )
 MK_INT(  187.1, OVRSCAN1,   "Overscan count on axis 1"                        )
@@ -144 +154 @@
 MK_INT(  198.07,CON_UP,     "[seconds] Controller up-time"                    )
 MK_STR(  198.08,CON_VSUM,   "Device operating point md5sum"                   )
+MK_INT(  198.10,FPGASER,    "Controller FPGA board serial number"             )
+MK_STR(  198.11,FPGAVER,    "Controller FPGA board version"                   )
+MK_STR(  198.12,FPGATAR,    "Controller FPGA board target system"             )
+MK_STR(  198.13,FPGAEC,     "Controller FPGA board engineering changes"       )
+MK_INT(  198.20,DAQ3USER,   "Controller DAQ3U board serial number"            )
+MK_STR(  198.21,DAQ3UVER,   "Controller DAQ3U board version"                  )
+MK_STR(  198.22,DAQ3UTAR,   "Controller DAQ3U board target system"            )
+MK_STR(  198.23,DAQ3UEC,    "Controller DAQ3U board engineering changes"      )
+MK_INT(  198.20,PREAMSER,   "Controller Preamp board serial number"           )
+MK_STR(  198.21,PREAMVER,   "Controller Preamp board version"                 )
+MK_STR(  198.22,PREAMTAR,   "Controller Preamp board target system"           )
+MK_STR(  198.23,PREAMEC,    "Controller Preamp board engineering changes"     )
+MK_INT(  198.30,DAQLBSER,   "DAQ3U loopback test board serial number"         )
+MK_STR(  198.31,DAQLBVER,   "DAQ3U loopback test board version"               )
+MK_STR(  198.32,DAQLBTAR,   "DAQ3U loopback test board target system"         )
+MK_STR(  198.33,DAQLBEC,    "DAQ3U loopback test board engineering changes"   )
 MK_INT(  198.40,TSP_SHOP,   "Milliseconds from last clean to shutter open"    )
 MK_INT(  198.41,TSP_SHCL,   "Milliseconds from last clean to shutter close"   )

trunk/extsrc/gpcsw/gpcsrc/fits/libfhreg/gpc_instrument.h

@@ -63 +63 @@
 MK_PFL( 1009.11,L3AIRTMP,1, "[C] Air temperature in space above L3"           )
 MK_PFL( 1009.12,L3DEWPT, 1, "[C] Calculated dew point in space above L3"      )
+MK_PFL( 1009.20,ENHUMID, 1, "[%] Rel. humidity of cam. evironment (ferit)"    )
+MK_PFL( 1009.21,ENAIRTMP,1, "[C] Air temperature of camera environment"       )
+MK_PFL( 1009.22,ENDEWPT, 1, "[C] Calculated dew point of camera environment"  )
+MK_STR( 1009.30,GLYSTAT,    "Camera heat exchanger glycol status"             )
+MK_STR( 1009.31,GLYMODE,    "Camera heat exchanger glycol mode"               )
 MK_STR( 1010.0, FILTSTAT,   "Filter mechanism status"                         )
 MK_STR( 1010.1, FILTERID,   "Filter glass identification"                     )
@@ -80 +85 @@
 MK_INT( 1224.0, SH_ARMPN  , "motion controller input pins"                    )
 MK_PFL( 1225.0, SH_DIODE,1, "Vref/4096 (Vref=5V nominal) photodiode volts"    )
+MK_STR( 1260.1, CS_LIGHT,   "Cal screen laser status during exposure"         )
+MK_STR( 1261.0, CS_LIMIT,   "Cal screen laser exposure limit: time|volt"      )
+MK_PFL( 1262.0, CS_WAVE,1,  "Cal screen laser wavelength"                     )
+MK_PFL( 1263.0, CS_EXPT,1,  "Cal screen laser exposure time"                  )
+MK_PFL( 1264.0, CS_VOLTS,3, "Cal screen laser photodiode limit voltage"       )
+MK_PFL( 1265.1, CS_INTV1,3, "Cal screen photodiode integrator pre-voltage"    )
+MK_PFL( 1265.2, CS_INTV2,3, "Cal screen photodiode integrator start-voltage"  )
+MK_PFL( 1265.3, CS_INTV3,3, "Cal screen photodiode integrator stop-voltage"   )
+MK_PFL( 1265.4, CS_INTV4,3, "Cal screen photodiode integrator post-voltage"   )
+MK_PFL( 1266.1, CS_INTT1,3, "Cal screen photodiode integrator pre-seconds"    )
+MK_PFL( 1266.2, CS_INTT2,3, "Cal screen photodiode integrator exposure sec"   )
+MK_PFL( 1266.3, CS_INTT3,3, "Cal screen photodiode integrator post-seconds"   )
+MK_PFL( 1267.0, CS_SHOP,3,  "GPC1 shutter open start"                         )
+MK_PFL( 1268.0, CS_SHCL,3,  "GPC1 shutter close start"                        )
+

trunk/extsrc/gpcsw/gpcsrc/fits/libfhreg/gpc_shutter.h

@@ -57 +57 @@
 MK_STR(  201.0, SHUTSTAT,   "Shutter status"                                  )
 MK_STR(  201.1, SHUTERR,    "Shutter error code"                              )
-MK_STR(  202.00,SHUTOPEN,   "Shutter open time (TAI)"                         )
-MK_STR(  202.01,SHUTCLOS,   "Shutter close time (TAI)"                        )
-MK_PFL(  202.02,SHUTOPWN,6, "Shutter open uncertainty before SHUTOPEN (sec)"  )
-MK_PFL(  202.03,SHUTCLWN,6, "Shutter close uncertainty before SHUTCLOS (sec)" )
-MK_STR(  202.04,SHUTOUTC,   "Shutter open time (UTC)"                         )
-MK_STR(  202.05,SHUTCUTC,   "Shutter close time (UTC)"                        )
-MK_INT(  202.06,SHUTLEAP,   "Leap seconds used in TAI-UTC conversion (sec)"   )
-MK_PFL(  202.07,SHUTREQ, 6, "Requested exposure duration (sec)"               )
-MK_PFL(  202.08,SHUTTIME,6, "Actual exposure duration (sec)"                  )
+MK_STR(  202.00,SHUTOPEN,   "[TAI date time] Shutter open time"               )
+MK_STR(  202.01,SHUTCLOS,   "[TAI date time] Shutter close time"              )
+MK_PFL(  202.02,SHUTOPWN,6, "[sec] Shutter open uncertainty before SHUTOPEN"  )
+MK_PFL(  202.03,SHUTCLWN,6, "[sec] Shutter close uncertainty before SHUTCLOS" )
+MK_STR(  202.04,SHUTOUTC,   "[UTC date time] Shutter open time"               )
+MK_STR(  202.05,SHUTCUTC,   "[UTC date time] Shutter close time"              )
+MK_INT(  202.06,SHUTLEAP,   "[sec] Leap seconds used in TAI-UTC conversion"   )
+MK_PFL(  202.07,SHUTREQ, 6, "[sec] Requested exposure duration"               )
+MK_PFL(  202.08,SHUTTIME,6, "[sec] Actual exposure duration"                  )
 MK_STR(  202.09,SHUTOPBL,   "Shutter blade in aperture at start of exposure"  )
 MK_STR(  202.10,SHUTCLBL,   "Shutter blade in aperture at end of exposure"    )

trunk/extsrc/gpcsw/gpcsrc/fits/libfhreg/gpc_telescope.h

@@ -70 +70 @@
 MK_STR(  503.0, TELSTAT ,   "Telescope control system status"                 )
 MK_STR(  503.1, DOMSTAT ,   "Telescope enclosure status"                      )
-MK_STR(  503.2, GUISTAT ,   "Telescope guiding system status"                 )
-MK_STR(  503.3, GUICONF ,   "Telescope guiding configuration"                 )
-MK_STR(  503.4, GUIKERN ,   "Filter kernel used for guiding"                  )
-MK_PFL(  503.5, GUIGAIX ,2, "Telescope guiding gain factor (x offset)"        )
-MK_PFL(  503.6, GUIGAIY ,2, "Telescope guiding gain factor (y offset)"        )
-MK_PFL(  503.7, GUIRATE ,1, "Telescope guiding rate (Hz)"                     )
 MK_VAL(  521.1, EQUINOX ,   "Telescope equinox of coordinates"                )
 MK_VAL(  521.2, EPOCH   ,   "Telescope equinox of coordinates"                )
-MK_PFL(  522.1, RA      ,6, "Telescope Right Ascension (degrees)"             )
-MK_PFL(  522.2, DEC     ,6, "Telescope Declination (degrees)"                 )
-MK_PFL(  522.3, AZ      ,6, "Telescope azimuth (degrees)"                     )
-MK_PFL(  522.4, ALT     ,6, "Telescope pointing altitude (degrees)"           )
-MK_PFL(  522.5, ROT     ,6, "Telescope rotator angle (degrees)"               )
-MK_PFL(  522.6, POSANGLE,6, "Telescope position angle (degrees)"              )
-MK_PFL(  523.0, COMRA   ,6, "Commanded telescope Right Ascension (degrees)"   )
-MK_PFL(  523.1, COMDEC  ,6, "Commanded telescope Declination (degrees)"       )
-MK_PFL(  523.2, COMAZ   ,6, "Commanded telescope azimuth (degrees)"           )
-MK_PFL(  523.3, COMALT  ,6, "Commanded telescope pointing altitude (degrees)" )
-MK_PFL(  523.4, COMROT  ,6, "Commanded telescope rotator angle (degrees)"     )
-MK_PFL(  523.5, MOONANG ,6, "Angular distance to moon (degrees)" )
+MK_PFL(  522.1, RA      ,6, "[deg] Telescope FOV center Right Ascension"      )
+MK_PFL(  522.2, DEC     ,6, "[deg] Telescope FOV center Declination"          )
+MK_STR(  522.21,RASTRNG ,   "[deg:mm:ss] Telescope sexagesimal Right Ascen."  )
+MK_STR(  522.22,DECSTRNG,   "[deg:mm:ss] Telescope sexagesimal Declination"   )
+MK_PFL(  522.3, AZ      ,6, "[deg] Telescope azimuth"                         )
+MK_PFL(  522.4, ALT     ,6, "[deg] Telescope pointing altitude"               )
+MK_PFL(  522.5, ROT     ,6, "[deg] Telescope rotator angle"                   )
+MK_PFL(  522.6, POSANGLE,6, "[deg] Telescope position angle"                  )
+MK_PFL(  523.0, COMRA   ,6, "[deg] Commanded telescope Right Ascension"       )
+MK_PFL(  523.1, COMDEC  ,6, "[deg] Commanded telescope Declination"           )
+MK_PFL(  523.2, COMAZ   ,6, "[deg] Commanded telescope azimuth"               )
+MK_PFL(  523.3, COMALT  ,6, "[deg] Commanded telescope pointing altitude"     )
+MK_PFL(  523.4, COMROT  ,6, "[deg] Commanded telescope rotator angle"         )
+MK_PFL(  523.5, MOONANG ,6, "[deg] Angular distance to moon"                  )
+MK_PFL(  523.6, AIRMASS ,3, "Airmass at start of observation"                 )
 MK_CMT(  530.00,CMTTELO1,   "NOTE: Telescope RA DEC or ALT AZ already include")
 MK_CMT(  530.10,CMTTELO2,   "      the following offsets.  Do not re-apply!"  )
-MK_PFL(  532.1, TELOFRA ,6, "Telescope offset in RA (degrees)"                )
-MK_PFL(  532.2, TELOFDEC,6, "Telescope offset in DEC (degrees)"               )
-MK_PFL(  532.3, TELOFAZ ,6, "Telescope offset in AZ (degrees)"                )
-MK_PFL(  532.4, TELOFALT,6, "Telescope offset in ALT (degrees)"               )
-MK_PFL(  532.5, TELOFROT,6, "Telescope offset in ROT (degrees)"               )
-MK_PFL(  532.7, TELOFX  ,6, "Telescope offset in camera X (degrees)"          )
-MK_PFL(  532.8, TELOFY  ,6, "Telescope offset in camera Y (degrees)"          )
-MK_PFL(  540.1, AIRMASS ,3, "Airmass at start of observation"                 )
-MK_PFL(  541.1, M1X     ,6, "Primary mirror x position (um)"                  )
-MK_PFL(  541.2, M1Y     ,6, "Primary mirror y position (um)"                  )
-MK_PFL(  541.3, M1Z     ,6, "Primary mirror z position (um)"                  )
-MK_PFL(  541.4, M1TIP   ,6, "Primary mirror tip (arcsec)"                     )
-MK_PFL(  541.5, M1TILT  ,6, "Primary mirror tilt (arcsec)"                    )
-MK_PFL(  542.1, M2X     ,6, "Secondary mirror x position (um)"                )
-MK_PFL(  542.2, M2Y     ,6, "Secondary mirror y position (um)"                )
-MK_PFL(  542.3, M2Z     ,6, "Secondary mirror z position (um)"                )
-MK_PFL(  542.4, M2TIP   ,6, "Secondary mirror tip (arcsec)"                   )
-MK_PFL(  542.5, M2TILT  ,6, "Secondary mirror tilt (arcsec)"                  )
+MK_PFL(  532.1, TELOFRA ,6, "[deg] Telescope offset in RA"                    )
+MK_PFL(  532.2, TELOFDEC,6, "[deg] Telescope offset in DEC"                   )
+MK_PFL(  532.3, TELOFAZ ,6, "[deg] Telescope offset in AZ"                    )
+MK_PFL(  532.4, TELOFALT,6, "[deg] Telescope offset in ALT"                   )
+MK_PFL(  532.5, TELOFROT,6, "[deg] Telescope offset in ROT"                   )
+MK_PFL(  532.7, TELOFX  ,6, "[deg] Telescope offset in camera X"              )
+MK_PFL(  532.8, TELOFY  ,6, "[deg] Telescope offset in camera Y"              )
+
+/*
+ * Guiding
+ */
+MK_STR(  540.00,GUISTAT ,   "Telescope guiding system status"                 )
+MK_STR(  540.01,GUICONF ,   "Telescope guiding configuration"                 )
+MK_STR(  540.02,GUISTAR ,   "Telescope guiding (single or multi-star)"        )
+MK_BLN(  540.03,GUIROTEN,   "Telescope guiding rotation enabled"              )
+MK_PFL(  540.10,GUIGAIX ,2, "Telescope guiding gain factor (x offset)"        )
+MK_PFL(  540.11,GUIGAIY ,2, "Telescope guiding gain factor (y offset)"        )
+MK_PFL(  540.12,GUIRATE ,1, "[Hz] Telescope guiding rate"                     )
+MK_STR(  540.20,GUIKERN ,   "Filter kernel used for guiding"                  )
+MK_STR(  540.21,GUIKERN1,   "Filter kernel used for guiding (cont)"           )
+MK_STR(  540.22,GUIKERN2,   "Filter kernel used for guiding (cont)"           )
+MK_STR(  540.23,GUIKERN3,   "Filter kernel used for guiding (cont)"           )
+MK_STR(  540.24,GUIKERN4,   "Filter kernel used for guiding (cont)"           )
+MK_STR(  540.25,GUIKERN5,   "Filter kernel used for guiding (cont)"           )
+MK_STR(  540.26,GUIKERN6,   "Filter kernel used for guiding (cont)"           )
+MK_STR(  540.27,GUIKERN7,   "Filter kernel used for guiding (cont)"           )
+MK_STR(  540.28,GUIKERN8,   "Filter kernel used for guiding (cont)"           )
+MK_STR(  540.29,GUIKERN9,   "Filter kernel used for guiding (cont)"           )
+MK_INT(  540.30,GUIKLEN ,   "Number of taps in filter kernel"                 )
+MK_INT(  540.31,GUIKSUM ,   "Sum of all filter kernel taps"                   )
+MK_INT(  540.40,GUINSTAR,   "Number of guide stars sought"                    )
+MK_INT(  540.41,GUINOK,     "Number of guide stars used (median)"             )
+MK_INT(  540.42,GUIERR,     "90 percentile of guide fit error codes"          )
+MK_PFL(  540.43,GUIDR,   2, "[arcsec] median RMS of guide star offsets"       )
+MK_PFL(  540.50,GUIXMED, 2, "[arcsec] median x offset of guide stars"         )
+MK_PFL(  540.51,GUIX50,  2, "[arcsec] 50% range of guide star x"              )
+MK_PFL(  540.52,GUIX90,  2, "[arcsec] 90% range of guide star x"              )
+MK_PFL(  540.60,GUIYMED, 2, "[arcsec] median y offset of guide stars"         )
+MK_PFL(  540.61,GUIY50,  2, "[arcsec] 50% range of guide star y"              )
+MK_PFL(  540.62,GUIY90,  2, "[arcsec] 90% range of guide star y"              )
+MK_PFL(  540.70,GUIROT,  4, "[deg] median rotation offset of guide stars"     )
+MK_PFL(  540.71,GUIROT50,4, "[deg] 50% range of rotation offset"              )
+MK_PFL(  540.72,GUIROT90,4, "[deg] 90% range of rotation offset"              )
+MK_PFL(  540.80,GUIFWMED,2, "[arcsec] median guide star FWHM"                 )
+MK_PFL(  540.81,GUIFW50, 2, "[arcsec] 50% range of guide star FWHM"           )
+MK_PFL(  540.82,GUIFW90, 2, "[arcsec] 90% range of guide star FWHM"           )
+MK_PFL(  540.90,GUIM1MED,2, "[mag] median zeropoint"                          )
+MK_PFL(  540.91,GUIM150, 2, "[mag] 50% range of median zeropoint"             )
+MK_PFL(  540.92,GUIM190, 2, "[mag] 90% range of median zeropoint"             )
+MK_PFL(  540.93,GUIXTNCT,2, "[mag] total extinction during exposure"          )
+MK_PFL(  540.94,GUIZPRMS,2, "[mag] median RMS scatter of zeropoints"          )
+
+/*
+ * Mirror info
+ */
+MK_PFL(  541.1, M1X     ,6, "[um] Primary mirror x position"                  )
+MK_PFL(  541.2, M1Y     ,6, "[um] Primary mirror y position"                  )
+MK_PFL(  541.3, M1Z     ,6, "[um] Primary mirror z position"                  )
+MK_PFL(  541.4, M1TIP   ,6, "[arcsec] Primary mirror tip"                     )
+MK_PFL(  541.5, M1TILT  ,6, "[arcsec] Primary mirror tilt"                    )
+MK_PFL(  542.1, M2X     ,6, "[um] Secondary mirror x position"                )
+MK_PFL(  542.2, M2Y     ,6, "[um] Secondary mirror y position"                )
+MK_PFL(  542.3, M2Z     ,6, "[um] Secondary mirror z position"                )
+MK_PFL(  542.4, M2TIP   ,6, "[arcsec] Secondary mirror tip"                   )
+MK_PFL(  542.5, M2TILT  ,6, "[arcsec] Secondary mirror tilt"                  )
 MK_STR(  543.0, M1M2MODV,   "Telescope mirror position model version"         )
-MK_PFL(  543.1, M1NOMX  ,6, "Modeled Primary mirror x position (um)"          )
-MK_PFL(  543.2, M1NOMY  ,6, "Modeled Primary mirror y position (um)"          )
-MK_PFL(  543.3, M1NOMZ  ,6, "Modeled Primary mirror z position (um)"          )
-MK_PFL(  543.4, M1NOMTIP,6, "Modeled Primary mirror tip (arcsec)"             )
-MK_PFL(  543.5, M1NOMTIL,6, "Modeled Primary mirror tilt (arcsec)"            )
-MK_PFL(  544.1, M2NOMX  ,6, "Modeled Secondary mirror x position (um)"        )
-MK_PFL(  544.2, M2NOMY  ,6, "Modeled Secondary mirror y position (um)"        )
-MK_PFL(  544.3, M2NOMZ  ,6, "Modeled Secondary mirror z position (um)"        )
-MK_PFL(  544.4, M2NOMTIP,6, "Modeled Secondary mirror tip (arcsec)"           )
-MK_PFL(  544.5, M2NOMTIL,6, "Modeled Secondary mirror tilt (arcsec)"          )
-MK_STR(  550.1, TELTEMTR,   "Mid truss temperatures (C)"                      )
-MK_STR(  550.2, TELTEMSP,   "Spider temperatures (C)"                         )
-MK_STR(  550.3, TELTEMMS,   "Primary mirror support temps (C)"                )
-MK_STR(  550.4, TELTEMM1,   "Primary mirror temps (C)"                        )
-MK_STR(  550.5, TELTEMM2,   "Secondary mirror temps (C)"                      )
-MK_STR(  550.6, TELTEMEX,   "Miscellaneous temperatures (C)"                  )
+MK_PFL(  543.1, M1NOMX  ,6, "[um] Modeled Primary mirror x position"          )
+MK_PFL(  543.2, M1NOMY  ,6, "[um] Modeled Primary mirror y position"          )
+MK_PFL(  543.3, M1NOMZ  ,6, "[um] Modeled Primary mirror z position"          )
+MK_PFL(  543.4, M1NOMTIP,6, "[arcsec] Modeled Primary mirror tip"             )
+MK_PFL(  543.5, M1NOMTIL,6, "[arcsec] Modeled Primary mirror tilt"            )
+MK_PFL(  544.1, M2NOMX  ,6, "[um] Modeled Secondary mirror x position"        )
+MK_PFL(  544.2, M2NOMY  ,6, "[um] Modeled Secondary mirror y position"        )
+MK_PFL(  544.3, M2NOMZ  ,6, "[um] Modeled Secondary mirror z position"        )
+MK_PFL(  544.4, M2NOMTIP,6, "[arcsec] Modeled Secondary mirror tip"           )
+MK_PFL(  544.5, M2NOMTIL,6, "[arcsec] Modeled Secondary mirror tilt"          )
+MK_STR(  550.1, TELTEMTR,   "[C] MTL 11,12,2,3,5,6,8,9"                       )
+MK_STR(  550.2, TELTEMSP,   "[C] IS 10,1,4,7 O 10,1,4,7"                      )
+MK_STR(  550.3, TELTEMMS,   "[C] M1 Perim. 12,3,6,9,Air"                      )
+MK_STR(  550.4, TELTEMM1,   "[C] M1I 12,3,6,9 O12,3,6,9"                      )
+MK_STR(  550.5, TELTEMM2,   "[C] M2 I 12,O 12,3,3,6,6,9,9"                    )
+MK_STR(  550.6, TELTEMEX,   "[C] M2 Can Air,Surf,CentSec 12,3,6,9"            )
 
 /*
  * Wavefront
  */
-MK_PFL(  551.01,WVFA    ,14,"Wavefront A actuator force (N)"                  )
-MK_PFL(  551.02,WVFB    ,14,"Wavefront B actuator force (N)"                  )
-MK_PFL(  551.03,WVFC    ,14,"Wavefront C actuator force (N)"                  )
-MK_PFL(  551.04,WVFD    ,14,"Wavefront D actuator force (N)"                  )
-MK_PFL(  551.05,WVFE    ,14,"Wavefront E actuator force (N)"                  )
-MK_PFL(  551.06,WVFF    ,14,"Wavefront F actuator force (N)"                  )
-MK_PFL(  551.07,WVFG    ,14,"Wavefront G actuator force (N)"                  )
-MK_PFL(  551.08,WVFH    ,14,"Wavefront H actuator force (N)"                  )
-MK_PFL(  551.09,WVFI    ,14,"Wavefront I actuator force (N)"                  )
-MK_PFL(  551.10,WVFJ    ,14,"Wavefront J actuator force (N)"                  )
-MK_PFL(  551.11,WVFK    ,14,"Wavefront K actuator force (N)"                  )
-MK_PFL(  551.12,WVFL    ,14,"Wavefront L actuator force (N)"                  )
+MK_PFL(  551.01,WVFA    ,14,"[N] Wavefront A actuator force"                  )
+MK_PFL(  551.02,WVFB    ,14,"[N] Wavefront B actuator force"                  )
+MK_PFL(  551.03,WVFC    ,14,"[N] Wavefront C actuator force"                  )
+MK_PFL(  551.04,WVFD    ,14,"[N] Wavefront D actuator force"                  )
+MK_PFL(  551.05,WVFE    ,14,"[N] Wavefront E actuator force"                  )
+MK_PFL(  551.06,WVFF    ,14,"[N] Wavefront F actuator force"                  )
+MK_PFL(  551.07,WVFG    ,14,"[N] Wavefront G actuator force"                  )
+MK_PFL(  551.08,WVFH    ,14,"[N] Wavefront H actuator force"                  )
+MK_PFL(  551.09,WVFI    ,14,"[N] Wavefront I actuator force"                  )
+MK_PFL(  551.10,WVFJ    ,14,"[N] Wavefront J actuator force"                  )
+MK_PFL(  551.11,WVFK    ,14,"[N] Wavefront K actuator force"                  )
+MK_PFL(  551.12,WVFL    ,14,"[N] Wavefront L actuator force"                  )
 
 /*
@@ -151 +195 @@
 MK_PFL(  560.3, ENVWIN,  1, "[m/s]         Weather, wind speed"               )
 MK_PFL(  560.4, ENVDIR,  1, "[deg E. of N] Weather, wind direction"           )
-MK_PFL(  561.0, SEEING,  1, "[arcsec]      Weather, seeing from DIMM, FWHM"   )
+MK_PFL(  561.0, SEEING,  3, "[arcsec]      Weather, seeing from DIMM, FWHM"   )
 
 /* 
@@ -157 +201 @@
  *
  *TYPE --IDX--  KEYWORD- PRC -------------------COMMENT----------------------*/
-MK_PFL( 586.02, HA      ,16,"Hour angle at start (degrees)"                   )
-MK_PFL( 586.03, ST      ,16,"Sidereal time at start (hours)"                  )
-MK_PFL( 586.04, ZD      ,16,"Zenith distance (degrees)"                       )
-MK_STR( 587.00, RASTRNG ,   "Actual Right Ascension (incl offset)"            )
-MK_STR( 587.01, DECSTRNG,   "Actual Declination (incl offset)"                )
+MK_PFL( 586.02, HA      ,16,"[deg] Hour angle at start"                       )
+MK_PFL( 586.03, ST      ,16,"[hours] Sidereal time at start"                  )
+MK_PFL( 586.04, ZD      ,16,"[deg] Zenith distance"                           )
 MK_STR( 587.02, HASTRNG ,   "Hour angle at start"                             )
 MK_STR( 587.03, STSTRNG ,   "Sidereal time at start"                          )     
-MK_STR( 587.04, ZDSTRNG ,   "Zenith distance (deg:mm:ss)"                     )                   
+MK_STR( 587.04, ZDSTRNG ,   "[deg:mm:ss] Zenith distance"                     )