Changeset 27838 for branches/tap_branches/extsrc/gpcsw/gpcsrc/fits/burntool/burntool.c

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

• . (modified) (1 prop)
• extsrc/gpcsw/gpcsrc/fits/burntool/burntool.c (modified) (17 diffs)

branches/tap_branches/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");