Changeset 24391 for trunk/extsrc/gpcsw/gpcsrc/fits/burntool/burntool.c

Timestamp:

Jun 12, 2009, 3:53:07 PM (17 years ago)

Author:

eugene

Message:

updates to burntool-and-related from camera svn

File:

• trunk/extsrc/gpcsw/gpcsrc/fits/burntool/burntool.c (modified) (14 diffs)

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

@@ -33 +33 @@
    int otanum;
    int nextend, cellxy, cell, cellcode;
-   int ext, update, restore, psfsize, psfavg;
+   int ext, update, restore, apply, tableonly, psfsize, psfavg;
    IMTYPE *buf;
    const char *burnfile=NULL,  *persistfile=NULL, *persistfitsfile=NULL;
@@ -102 +102 @@
 /* Parse the args */
    cellxy = -1;
-   update = 1;
-   restore = 0;
+   update = 1;          /* Calc fits, apply fits, write img and table */
+   restore = 0;         /* Restore previous fit only, write img */
+   apply = 0;           /* Apply previous fit only, write img */
+   tableonly = 0;       /* Calc fits (apply fits), write table only */
    psfsize = 32;
    psfavg = 0;
@@ -137 +139 @@
          update = argv[i][7] == 'y' || argv[i][7] == '1' || argv[i][7] == 't';
 
-/* Modify the input MEF by subtracting fits? */
+/* Modify the input MEF by adding back fits? */
       } else if(strncmp(argv[i], "restore=", 8) == 0) { /* restore={t|f} */
          restore = argv[i][8] == 'y' || argv[i][8] == '1' || argv[i][8] == 't';
+
+/* Modify the input MEF by subtracting previously calculated fits? */
+      } else if(strncmp(argv[i], "apply=", 6) == 0) {   /* apply={t|f} */
+         apply = argv[i][6] == 'y' || argv[i][6] == '1' || argv[i][6] == 't';
+
+/* Calculate and write tables only? */
+      } else if(strncmp(argv[i], "tableonly=", 10) == 0) {/* tableonly={t|f} */
+         tableonly = argv[i][10] == 'y' || argv[i][10] == '1' || argv[i][10] == 't';
 
 /* Output file for burn streaks */
@@ -150 +160 @@
 
 /* Input text file for previous burn persistence streaks */
-      } else if(strncmp(argv[i], "infits=", 8) == 0) {  /* in=fname */
+      } else if(strncmp(argv[i], "trailin=", 8) == 0) {/* trailin=fname */
          persistfile = argv[i] + 8;
 
 /* Same thing, but information is stored in tables in a FITS file. */
-      } else if(strncmp(argv[i], "trailinfits=", 8) == 0) { /* infits=fname */
+      } else if(strncmp(argv[i], "trailinfits=", 12) == 0) { /* trailinfits=fname */
          persistfitsfile = argv[i] + 12;
 
@@ -162 +172 @@
 
 /* Same thing, but information is stored in tables in a FITS file. */
-      } else if(strncmp(argv[i], "trailinfits=", 8) == 0) { /* trailin=fname */
-         persistfitsfile = argv[i] + 12;
+      } else if(strncmp(argv[i], "infits=", 7) == 0) { /* infits=fname */
+         persistfitsfile = argv[i] + 7;
 
 /* Output file for PSF gallery */
@@ -322 +332 @@
    /* If there is no other persistence info supplied, try getting
     * it from the input FITS file. */
-   if(restore && persistfile == NULL) {
-     if(persistfitsfile == NULL) persistfitsfile = ifilename;
+   if((restore || apply) && persistfile == NULL) {
+      if(persistfitsfile == NULL) persistfitsfile = ifilename;
    }
 
@@ -334 +344 @@
 
 /* Read the persistence data for this OTA */
-   if(persistfile != NULL) {
+   if(persistfile != NULL) {                    /* Text data file */
       if(persist_read(OTA, persistfile)) exit(EXIT_FAILURE);
-   }
-   else if(persistfitsfile != NULL) {
-     if(persist_fits_read(OTA, persistfitsfile) != FH_SUCCESS) exit(EXIT_FAILURE);
+   } else if(persistfitsfile != NULL) {         /* FITS table */
+      if(persist_fits_read(OTA, persistfitsfile) != FH_SUCCESS)
+         exit(EXIT_FAILURE);
    }
 
@@ -369 +379 @@
                "warning: Restoring old burns, but header indicates no burns previously corrected.\n");             
      }
-     else if (update && (burn_applied == FH_TRUE)) {
+     else if ((update||apply) && (burn_applied == FH_TRUE)) {
        fprintf(stderr, 
                "warning: Applying burn correction, but header indicates burns previously corrected.\n");             
@@ -491 +501 @@
 
       if(VERBOSE & VERB_NORM) {
-         printf("nx=%d ny=%d prex=%d postx=%d posty=%d BZERO=%.1f\n", 
+         printf("nx=%d ny=%d prex=%d postx=%d posty=%d BZERO=%d\n", 
                 naxis1, naxis2, prescan1, ovrscan1, ovrscan2, BZERO);
       }
@@ -542 +552 @@
          }
 
-
-         if(!restore) {
-
+         if(apply) {
+/* Use the table-driven fits instead of calculating new ones */
+            burn_apply(naxis1-ovrscan1, naxis2-ovrscan2, naxis1, 
+                       buf, OTA+cell);
+/* Tell us about it? */
+            if(VERBOSE & VERB_NORM) burn_blab(OTA+cell);
+
+         } else if(restore) {
+/* Restore the old burns */
+            burn_restore(naxis1-ovrscan1, naxis2-ovrscan2, naxis1, 
+                         buf, OTA+cell);
+
+         } else {
 /* Fix up the burns */
             burn_fix(naxis1-ovrscan1, naxis2-ovrscan2, naxis1, naxis2, buf, 
@@ -559 +579 @@
             if(VERBOSE & VERB_NORM) burn_blab(OTA+cell);
 
-/* Fix up the streaks */
-            persist_fix(naxis1-ovrscan1, naxis2-ovrscan2, naxis1, buf, 
-                        OTA+cell);
-
+/* Fix up the streaks (don't bother if table only) */
+            if(!tableonly) {
+               persist_fix(naxis1-ovrscan1, naxis2-ovrscan2, naxis1, buf, 
+                           OTA+cell);
 /* Tell us about it? */
-            if(VERBOSE & VERB_NORM) persist_blab(OTA+cell);
-
-         } else {
-/* Restore the old burns */
-            burn_restore(naxis1-ovrscan1, naxis2-ovrscan2, naxis1, 
-                         buf, OTA+cell);
+               if(VERBOSE & VERB_NORM) persist_blab(OTA+cell);
+            }
          }
 
 /* Write the corrected data back to the FITS. */
-         if(update) {
+         if(!tableonly && update) {
             fh_ehu(ehu, 0);     /* Seek back to the start of data */
             if (fh_write_padded_image(ehu, fh_file_desc(ehu), buf,
@@ -590 +606 @@
 
 /* Dump out the postage stamp file */
-   if(psffile != NULL) {
+   if(psffile != NULL && !restore && !apply) {
       psf_write(psfsize, psfsize, OTA, otanum, psffile);
    }
 
 /* Dump out the PSF stats */
-   if(psfstatfile != NULL) {
+   if(psfstatfile != NULL && !restore && !apply) {
       psf_write_stats(psfsize, psfsize, OTA, otanum, psfstatfile, psfavg);
    }
@@ -601 +617 @@
 /* Write burn info to FITS file. */
    if(update) persist_fits_write(OTA, ihu);
-
    
-   if(restore) {    
+   if(restore || tableonly) {    
      /* Indicate in the header that the burns are not applied. */
-     fh_set_bool(ihu, FH_AUTO, PHU_NAME_BURN_APPLIED, 
-                 FH_FALSE, PHU_COMMENT_BURN_APPLIED);
-     fh_rewrite(ihu);
+      fh_set_bool(ihu, FH_AUTO, PHU_NAME_BURN_APPLIED, 
+                  FH_FALSE, PHU_COMMENT_BURN_APPLIED);
+      fh_rewrite(ihu);
+   } else if(apply) {
+     /* Indicate in the header that the burns have been applied. */
+      fh_set_bool(ihu, FH_AUTO, PHU_NAME_BURN_APPLIED, 
+                  FH_TRUE, PHU_COMMENT_BURN_APPLIED);
+      fh_rewrite(ihu);
    }
 
@@ -711 +731 @@
    printf(" cell=N         Work on just one cell? Cell count [0:63] mode.\n");
    printf(" mask=0101...   64 digits to work on cells 0:63.\n");
-   printf(" update={t|f}   Modify the input MEF by subtracting fits?\n");
+   printf(" update={t|f}   Modify the input MEF writing table and subtracting fits?\n");
    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(" in=fname       Input file for previous burn persistence streaks\n");
    printf(" infits=fname   Input FITS file for previous burn persistence streaks (stored\n");