Index: /trunk/psLib/src/fits/psFitsHeader.c =================================================================== --- /trunk/psLib/src/fits/psFitsHeader.c (revision 25086) +++ /trunk/psLib/src/fits/psFitsHeader.c (revision 25087) @@ -50,5 +50,5 @@ // List of the start of FITS header keys not to write (handled by cfitsio); NULL-terminated -static const char *noWriteFitsKeyStarts[] = { "NAXIS", "TTYPE", "TFORM", NULL }; +static const char *noWriteFitsKeyStarts[] = { "NAXIS", "TTYPE", "TFORM", "TZERO", "TSCAL", NULL }; // List of compressed FITS header keys not to write (handled by cfitsio); NULL-terminated @@ -305,4 +305,5 @@ keyType = 'C'; } + psTrace("psLib.fits", 3, "Reading keyword %s, type %c\n", keyName, keyType); if (status != 0) { break; @@ -327,6 +328,12 @@ -INFINITY); } else { - success = psMetadataAddS32(header, PS_LIST_TAIL, keyNameTrans, dupFlag, keyComment, - atoi(keyValue)); + long long value = atoll(keyValue); // Value + if (value > PS_MIN_S32 && value < PS_MAX_S32) { + success = psMetadataAddS32(header, PS_LIST_TAIL, keyNameTrans, dupFlag, keyComment, + value); + } else { + success = psMetadataAddS64(header, PS_LIST_TAIL, keyNameTrans, dupFlag, keyComment, + value); + } } break; @@ -509,16 +516,10 @@ psMetadataItem *simpleItem = psMetadataLookup(output, "SIMPLE"); // SIMPLE in the header if (simpleItem) { - if (simpleItem->type != PS_DATA_BOOL) { - psError(PS_ERR_BAD_PARAMETER_TYPE, true, "SIMPLE in a FITS header must be of boolean type: " - "not %x --- assuming FALSE.\n", simpleItem->type); + if (simpleItem->type != PS_DATA_BOOL || !simpleItem->data.B) { int value = false; // Temporary holder for boolean + psWarning("Writing SIMPLE=F to FITS header by request"); fits_update_key(fits->fd, TLOGICAL, "SIMPLE", &value, "File does not conform to FITS standard", &status); simple = false; - } else if (!simpleItem->data.B) { - simple = false; - int value = false; // Temporary holder for boolean - fits_update_key(fits->fd, TLOGICAL, "SIMPLE", &value, - "File does not conform to FITS standard", &status); } // Uncompressed SIMPLE = T is taken care of by cfitsio. @@ -546,4 +547,5 @@ char comment[FLEN_CARD]; // Comment for ZIMAGE; unused int value; // Value for ZIMAGE; unused + psTrace("psLib.fits", 3, "Writing header ZSIMPLE to preserve PHU"); fits_read_key(fits->fd, TLOGICAL, "ZIMAGE", &value, comment, &status); fits_insert_key_log(fits->fd, "ZSIMPLE", simple, "Uncompressed file's conforms to FITS", &status); @@ -575,8 +577,10 @@ if (keywordInList(name, noWriteCompressedKeys) || (keyStarts && keywordStartsWith(name, noWriteCompressedKeyStarts))) { + psTrace("psLib.fits", 3, "Not writing FITS keyword %s", name); continue; } } else if (keywordInList(name, noWriteCompressedKeys) || (keyStarts && keywordStartsWith(name, noWriteCompressedKeyStarts))) { + psTrace("psLib.fits", 3, "Not writing FITS keyword %s", name); continue; } @@ -584,4 +588,5 @@ if (keywordInList(name, noWriteFitsKeys) || (keyStarts && keywordStartsWith(name, noWriteFitsKeyStarts))) { + psTrace("psLib.fits", 3, "Not writing FITS keyword %s", name); continue; } @@ -592,4 +597,5 @@ psWarning("COMMENT header is not of type STRING (%x) --- ignored.", item->type); } else { + psTrace("psLib.fits", 5, "Writing header COMMENT: %s", item->data.str); fits_write_comment(fits->fd, item->data.str, &status); } @@ -598,4 +604,5 @@ psWarning("COMMENT header is not of type STRING (%x) --- ignored.", item->type); } else { + psTrace("psLib.fits", 5, "Writing header HISTORY: %s", item->data.str); fits_write_history(fits->fd, item->data.str, &status); } @@ -605,28 +612,36 @@ case PS_DATA_BOOL: { int value = item->data.B; + psTrace("psLib.fits", 5, "Writing BOOL header %s: %d", name, value); fits_update_key(fits->fd, TLOGICAL, name, &value, item->comment, &status); break; } case PS_DATA_S8: + psTrace("psLib.fits", 5, "Writing S8 header %s: %d", name, (int)item->data.S8); fits_update_key(fits->fd, TBYTE, name, &item->data.S8, item->comment, &status); break; case PS_DATA_S16: + psTrace("psLib.fits", 5, "Writing S16 header %s: %d", name, (int)item->data.S16); fits_update_key(fits->fd, TSHORT, name, &item->data.S16, item->comment, &status); break; case PS_DATA_S32: + psTrace("psLib.fits", 5, "Writing S32 header %s: %d", name, (int)item->data.S32); fits_update_key(fits->fd, TINT, name, &item->data.S32, item->comment, &status); break; case PS_DATA_S64: + psTrace("psLib.fits", 5, "Writing S64 header %s: %" PRId64, name, item->data.S64); fits_update_key(fits->fd, TLONGLONG, name, &item->data.S64, item->comment, &status); break; case PS_DATA_U8: { unsigned short int temp = item->data.U8; + psTrace("psLib.fits", 5, "Writing U8 header %s: %d", name, (int)item->data.U8); fits_update_key(fits->fd, TUSHORT, name, &temp, item->comment, &status); break; } case PS_DATA_U16: + psTrace("psLib.fits", 5, "Writing U16 header %s: %d", name, (int)item->data.U16); fits_update_key(fits->fd, TUSHORT, name, &item->data.U16, item->comment, &status); break; case PS_DATA_U32: + psTrace("psLib.fits", 5, "Writing U32 header %s: %d", name, (unsigned int)item->data.U32); fits_update_key(fits->fd, TUINT, name, &item->data.U32, item->comment, &status); break; @@ -639,8 +654,10 @@ } psS64 temp = item->data.U64; // Signed version + psTrace("psLib.fits", 5, "Writing U64 header %s: %" PRIu64, name, item->data.U64); fits_update_key(fits->fd, TLONGLONG, name, &temp, item->comment, &status); break; case PS_DATA_F32: { int infCheck = 0; // Result of isinf() + psTrace("psLib.fits", 5, "Writing F32 header %s: %f", name, item->data.F32); if (isnan(item->data.F32)) { fits_update_key(fits->fd, TSTRING, name, "NaN", item->comment, &status); @@ -659,4 +676,5 @@ case PS_DATA_F64: { int infCheck = 0; // Result of isinf() + psTrace("psLib.fits", 5, "Writing F32 header %s: %lf", name, item->data.F64); if (isnan(item->data.F64)) { fits_update_key(fits->fd, TSTRING, name, "NaN", item->comment, &status); @@ -674,4 +692,5 @@ } case PS_DATA_STRING: + psTrace("psLib.fits", 5, "Writing STR header %s: %s", name, item->data.str); fits_update_key(fits->fd, TSTRING, name, item->data.V, item->comment, &status); break;