Index: branches/eam_branches/ohana.20170822/src/libdvo/Makefile =================================================================== --- branches/eam_branches/ohana.20170822/src/libdvo/Makefile (revision 40210) +++ branches/eam_branches/ohana.20170822/src/libdvo/Makefile (revision 40211) @@ -50,4 +50,5 @@ $(DESTINC)/ps1_v4_defs.h \ $(DESTINC)/ps1_v5_defs.h \ +$(DESTINC)/ps1_v6_defs.h \ $(DESTINC)/ps1_v5_ld_defs.h \ $(DESTINC)/ps1_ref_defs.h \ @@ -100,4 +101,5 @@ $(SRC)/dvo_convert_PS1_V4.$(ARCH).o \ $(SRC)/dvo_convert_PS1_V5.$(ARCH).o \ +$(SRC)/dvo_convert_PS1_V6.$(ARCH).o \ $(SRC)/dvo_convert_PS1_V5_LOAD.$(ARCH).o \ $(SRC)/dvo_convert_PS1_REF.$(ARCH).o \ Index: branches/eam_branches/ohana.20170822/src/libdvo/doc/notes.txt =================================================================== --- branches/eam_branches/ohana.20170822/src/libdvo/doc/notes.txt (revision 40210) +++ branches/eam_branches/ohana.20170822/src/libdvo/doc/notes.txt (revision 40211) @@ -16,5 +16,5 @@ uppercase, eg: AveragePanstarrs_DEV_0, AveragePanstarrs_PS1_2). -4) create a DVOTableFormat entry for the new format +4) create a DVOCatFormat entry for the new format (libdvo/include/dvo.h). the naming convention is DVO_FORMAT_FOO. Index: branches/eam_branches/ohana.20170822/src/libdvo/include/dvo.h =================================================================== --- branches/eam_branches/ohana.20170822/src/libdvo/include/dvo.h (revision 40210) +++ branches/eam_branches/ohana.20170822/src/libdvo/include/dvo.h (revision 40211) @@ -33,4 +33,5 @@ DVO_FORMAT_PS1_V4, DVO_FORMAT_PS1_V5, + DVO_FORMAT_PS1_V6, DVO_FORMAT_PS1_V5_LOAD, } DVOCatFormat; @@ -1073,4 +1074,5 @@ # include "ps1_v4_defs.h" # include "ps1_v5_defs.h" +# include "ps1_v6_defs.h" # include "ps1_v5_ld_defs.h" # include "ps1_ref_defs.h" Index: branches/eam_branches/ohana.20170822/src/libdvo/include/libdvo_astro.h =================================================================== --- branches/eam_branches/ohana.20170822/src/libdvo/include/libdvo_astro.h (revision 40210) +++ branches/eam_branches/ohana.20170822/src/libdvo/include/libdvo_astro.h (revision 40211) @@ -100,7 +100,8 @@ float apmifit; // aperture correction (mag) float dapmifit; // apmifit error (mag) - float Mcal; // calibration mag (mag) + float McalPSF; // calibration mag (mag) + float McalAPER; // calibration mag (mag) float dMcal; // error on Mcal (mag) - short Xm; // image chisq (10*log(value)) + short McalChiSq; // image chisq (10*log(value)) short photcode; // identifier for CCD, float exptime; // exposure time (seconds) Index: branches/eam_branches/ohana.20170822/src/libdvo/include/ps1_v6_defs.h =================================================================== --- branches/eam_branches/ohana.20170822/src/libdvo/include/ps1_v6_defs.h (revision 40211) +++ branches/eam_branches/ohana.20170822/src/libdvo/include/ps1_v6_defs.h (revision 40211) @@ -0,0 +1,26 @@ +Image *Image_PS1_V6_ToInternal (Image_PS1_V6 *in, off_t Nvalues, off_t Nalloc); +Image_PS1_V6 *ImageInternalTo_PS1_V6 (Image *in, off_t Nvalues); + +Average *Average_PS1_V6_ToInternal (Average_PS1_V6 *in, off_t Nvalues, SecFilt **primary); +Average_PS1_V6 *AverageInternalTo_PS1_V6 (Average *in, off_t Nvalues, SecFilt *primary); + +Measure *Measure_PS1_V6_ToInternal (Average *ave, Measure_PS1_V6 *in, off_t Nvalues); +Measure_PS1_V6 *MeasureInternalTo_PS1_V6 (Average *ave, Measure *in, off_t Nvalues); + +SecFilt *SecFilt_PS1_V6_ToInternal (SecFilt_PS1_V6 *in, off_t Nvalues); +SecFilt_PS1_V6 *SecFiltInternalTo_PS1_V6 (SecFilt *in, off_t Nvalues); + +Lensobj *Lensobj_PS1_V6_ToInternal (Lensobj_PS1_V6 *in, off_t Nvalues); +Lensobj_PS1_V6 *LensobjInternalTo_PS1_V6 (Lensobj *in, off_t Nvalues); + +Lensing *Lensing_PS1_V6_ToInternal (Lensing_PS1_V6 *in, off_t Nvalues); +Lensing_PS1_V6 *LensingInternalTo_PS1_V6 (Lensing *in, off_t Nvalues); + +StarPar *StarPar_PS1_V6_ToInternal (StarPar_PS1_V6 *in, off_t Nvalues); +StarPar_PS1_V6 *StarParInternalTo_PS1_V6 (StarPar *in, off_t Nvalues); + +GalPhot *GalPhot_PS1_V6_ToInternal (GalPhot_PS1_V6 *in, off_t Nvalues); +GalPhot_PS1_V6 *GalPhotInternalTo_PS1_V6 (GalPhot *in, off_t Nvalues); + +PhotCode *PhotCode_PS1_V6_To_Internal (PhotCode_PS1_V6 *in, off_t Nvalues); +PhotCode_PS1_V6 *PhotCode_Internal_To_PS1_V6 (PhotCode *in, off_t Nvalues); Index: branches/eam_branches/ohana.20170822/src/libdvo/src/ImageMetadata.c =================================================================== --- branches/eam_branches/ohana.20170822/src/libdvo/src/ImageMetadata.c (revision 40210) +++ branches/eam_branches/ohana.20170822/src/libdvo/src/ImageMetadata.c (revision 40211) @@ -64,5 +64,5 @@ GET_COLUMN (crval2, "CRVAL2", double); GET_COLUMN (theta, "THETA", float); - GET_COLUMN (Mcal, "MCAL", float); + GET_COLUMN (McalPSF, "MCAL", float); GET_COLUMN (secz, "SECZ", float); GET_COLUMN (Xcenter, "X_CENTER", float); @@ -77,5 +77,5 @@ image[i].crval2 = crval2[i] ; image[i].theta = theta[i] ; - image[i].Mcal = Mcal[i] ; + image[i].Mcal = McalPSF[i] ; image[i].secz = secz[i] ; image[i].Xcenter = Xcenter[i] ; @@ -90,5 +90,5 @@ free (crval2); free (theta); - free (Mcal); + free (McalPSF); free (secz); free (Xcenter); @@ -166,5 +166,5 @@ theta[i] = DEG_RAD*atan2(mosaic->pc1_2, mosaic->pc1_1); - Mcal[i] = image[i].Mcal; + Mcal[i] = image[i].McalPSF; secz[i] = image[i].secz; Xcenter[i] = 0.5*image[i].NX; Index: branches/eam_branches/ohana.20170822/src/libdvo/src/LoadPhotcodesFITS.c =================================================================== --- branches/eam_branches/ohana.20170822/src/libdvo/src/LoadPhotcodesFITS.c (revision 40210) +++ branches/eam_branches/ohana.20170822/src/libdvo/src/LoadPhotcodesFITS.c (revision 40211) @@ -64,4 +64,5 @@ CONVERT_FORMAT("DVO_PHOTCODE_PS1_V4", PS1_V4); CONVERT_FORMAT("DVO_PHOTCODE_PS1_V5", PS1_V5); + CONVERT_FORMAT("DVO_PHOTCODE_PS1_V6", PS1_V6); CONVERT_FORMAT("DVO_PHOTCODE_PS1_V5_LOAD", PS1_V5_LOAD); Index: branches/eam_branches/ohana.20170822/src/libdvo/src/SavePhotcodesFITS.c =================================================================== --- branches/eam_branches/ohana.20170822/src/libdvo/src/SavePhotcodesFITS.c (revision 40210) +++ branches/eam_branches/ohana.20170822/src/libdvo/src/SavePhotcodesFITS.c (revision 40211) @@ -30,9 +30,9 @@ // for the moment, we simply support the latest photcode format for output // XXX update this as needed as new formats are defined - PhotCode_PS1_V5 *photcode_output = PhotCode_Internal_To_PS1_V5 (table[0].code, table[0].Ncode); + PhotCode_PS1_V6 *photcode_output = PhotCode_Internal_To_PS1_V6 (table[0].code, table[0].Ncode); /* convert FITS format data to internal format (byteswaps & EXTNAME) */ if (!gfits_db_create (&db)) return (FALSE); - if (!gfits_table_set_PhotCode_PS1_V5 (&db.ftable, photcode_output, table[0].Ncode, TRUE)) return (FALSE); + if (!gfits_table_set_PhotCode_PS1_V6 (&db.ftable, photcode_output, table[0].Ncode, TRUE)) return (FALSE); if (!gfits_db_save (&db)) return (FALSE); if (!gfits_db_close (&db)) return (FALSE); Index: branches/eam_branches/ohana.20170822/src/libdvo/src/dbExtractImages.c =================================================================== --- branches/eam_branches/ohana.20170822/src/libdvo/src/dbExtractImages.c (revision 40210) +++ branches/eam_branches/ohana.20170822/src/libdvo/src/dbExtractImages.c (revision 40211) @@ -220,5 +220,6 @@ case IMAGE_MCAL: - value.Flt = image[N].Mcal; + // XXX : note add McalAPER methods + value.Flt = image[N].McalPSF; break; case IMAGE_dMCAL: @@ -226,5 +227,5 @@ break; case IMAGE_XM: - value.Flt = pow(10.0, 0.01*image[N].Xm); + value.Flt = image[N].McalChiSq; break; case IMAGE_PHOTCODE: Index: branches/eam_branches/ohana.20170822/src/libdvo/src/dbFields.c =================================================================== --- branches/eam_branches/ohana.20170822/src/libdvo/src/dbFields.c (revision 40210) +++ branches/eam_branches/ohana.20170822/src/libdvo/src/dbFields.c (revision 40211) @@ -333,4 +333,5 @@ // make a local working copy of fieldName and replace ':' with spaces + // XXX memory leak here: char *fieldCopy = strcreate(fieldName); for (j = 0; fieldCopy[j]; j++) { @@ -338,5 +339,7 @@ } + // XXX potential memory leak here char *firstWord = getword(fieldCopy); + if (!firstWord) return FALSE; // firstWord may be either flux, mag or photcode Index: branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_catalog.c =================================================================== --- branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_catalog.c (revision 40210) +++ branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_catalog.c (revision 40211) @@ -57,4 +57,5 @@ if (!strcasecmp (catformat, "PS1_V4")) return (DVO_FORMAT_PS1_V4); if (!strcasecmp (catformat, "PS1_V5")) return (DVO_FORMAT_PS1_V5); + if (!strcasecmp (catformat, "PS1_V6")) return (DVO_FORMAT_PS1_V6); if (!strcasecmp (catformat, "PS1_V5_LOAD")) return (DVO_FORMAT_PS1_V5_LOAD); if (!strcasecmp (catformat, "PS1_REF")) return (DVO_FORMAT_PS1_REF); Index: branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_catalog_raw.c =================================================================== --- branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_catalog_raw.c (revision 40210) +++ branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_catalog_raw.c (revision 40211) @@ -91,4 +91,5 @@ FORMAT_CASE (PS1_V4, PS1_V4); FORMAT_CASE (PS1_V5, PS1_V5); + FORMAT_CASE (PS1_V6, PS1_V6); FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD); FORMAT_CASE (PS1_REF, PS1_REF); @@ -288,4 +289,5 @@ if (catalog[0].catformat == DVO_FORMAT_PS1_V4) gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PS1_V4"); if (catalog[0].catformat == DVO_FORMAT_PS1_V5) gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PS1_V5"); + if (catalog[0].catformat == DVO_FORMAT_PS1_V6) gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PS1_V6"); if (catalog[0].catformat == DVO_FORMAT_PS1_V5_LOAD) gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PS1_V5_LOAD"); if (catalog[0].catformat == DVO_FORMAT_PS1_REF) gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PS1_REF"); @@ -394,4 +396,5 @@ FORMAT_CASE (PS1_V4, PS1_V4); FORMAT_CASE (PS1_V5, PS1_V5); + FORMAT_CASE (PS1_V6, PS1_V6); FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD); FORMAT_CASE (PS1_REF, PS1_REF); @@ -448,4 +451,5 @@ FORMAT_CASE (PS1_V4, PS1_V4); FORMAT_CASE (PS1_V5, PS1_V5); + FORMAT_CASE (PS1_V6, PS1_V6); FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD); FORMAT_CASE (PS1_REF, PS1_REF); @@ -505,4 +509,5 @@ FORMAT_CASE (PS1_V3, PS1_V3); FORMAT_CASE (PS1_V5, PS1_V5); + FORMAT_CASE (PS1_V6, PS1_V6); FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD); FORMAT_CASE (PS1_REF, PS1_REF); @@ -559,4 +564,5 @@ FORMAT_CASE (PS1_V4, PS1_V4); FORMAT_CASE (PS1_V5, PS1_V5); + FORMAT_CASE (PS1_V6, PS1_V6); FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD); FORMAT_CASE (PS1_REF, PS1_REF); @@ -617,4 +623,5 @@ FORMAT_CASE (PS1_V4, PS1_V4); FORMAT_CASE (PS1_V5, PS1_V5); + FORMAT_CASE (PS1_V6, PS1_V6); FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD); FORMAT_CASE (PS1_REF, PS1_REF); @@ -671,4 +678,5 @@ FORMAT_CASE (PS1_V4, PS1_V4); FORMAT_CASE (PS1_V5, PS1_V5); + FORMAT_CASE (PS1_V6, PS1_V6); FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD); FORMAT_CASE (PS1_REF, PS1_REF); Index: branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert.c =================================================================== --- branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert.c (revision 40210) +++ branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert.c (revision 40211) @@ -42,4 +42,5 @@ CONVERT_FORMAT ("DVO_AVERAGE_PS1_V4", PS1_V4); CONVERT_FORMAT ("DVO_AVERAGE_PS1_V5", PS1_V5); + CONVERT_FORMAT ("DVO_AVERAGE_PS1_V6", PS1_V6); CONVERT_FORMAT ("DVO_AVERAGE_PS1_V5_LOAD", PS1_V5_LOAD); CONVERT_FORMAT ("DVO_AVERAGE_PS1_REF", PS1_REF); @@ -133,4 +134,5 @@ CONVERT_FORMAT ("DVO_AVERAGE_PS1_V4", PS1_V4, PS1_V4); CONVERT_FORMAT ("DVO_AVERAGE_PS1_V5", PS1_V5, PS1_V5); + CONVERT_FORMAT ("DVO_AVERAGE_PS1_V6", PS1_V6, PS1_V6); CONVERT_FORMAT ("DVO_AVERAGE_PS1_V5_LOAD", PS1_V5_LOAD, PS1_V5_LOAD); CONVERT_FORMAT ("DVO_AVERAGE_PS1_REF", PS1_REF, PS1_REF); @@ -171,4 +173,5 @@ FORMAT_CASE (PS1_V4, PS1_V4); FORMAT_CASE (PS1_V5, PS1_V5); + FORMAT_CASE (PS1_V6, PS1_V6); FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD); FORMAT_CASE (PS1_REF, PS1_REF); @@ -270,4 +273,5 @@ CONVERT_FORMAT ("DVO_MEASURE_PS1_V4", PS1_V4, PS1_V4, FALSE); CONVERT_FORMAT ("DVO_MEASURE_PS1_V5", PS1_V5, PS1_V5, TRUE); + CONVERT_FORMAT ("DVO_MEASURE_PS1_V6", PS1_V6, PS1_V6, TRUE); CONVERT_FORMAT ("DVO_MEASURE_PS1_V5_LOAD", PS1_V5_LOAD, PS1_V5_LOAD, TRUE); CONVERT_FORMAT ("DVO_MEASURE_PS1_REF", PS1_REF, PS1_REF, FALSE); @@ -310,4 +314,5 @@ FORMAT_CASE (PS1_V4, PS1_V4, FALSE); FORMAT_CASE (PS1_V5, PS1_V5, TRUE); + FORMAT_CASE (PS1_V6, PS1_V6, TRUE); FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD, TRUE); FORMAT_CASE (PS1_REF, PS1_REF, FALSE); @@ -391,4 +396,5 @@ SKIPPING_FORMAT ("DVO_MISSING_PS1_V4", PS1_V4, PS1_V4); SKIPPING_FORMAT ("DVO_MISSING_PS1_V5", PS1_V5, PS1_V5); + SKIPPING_FORMAT ("DVO_MISSING_PS1_V6", PS1_V6, PS1_V6); SKIPPING_FORMAT ("DVO_MISSING_PS1_V5_LOAD", PS1_V5_LOAD, PS1_V5_LOAD); # undef CONVERT_FORMAT @@ -466,4 +472,5 @@ CONVERT_FORMAT ("DVO_SECFILT_PS1_V4", PS1_V4, PS1_V4); CONVERT_FORMAT ("DVO_SECFILT_PS1_V5", PS1_V5, PS1_V5); + CONVERT_FORMAT ("DVO_SECFILT_PS1_V6", PS1_V6, PS1_V6); CONVERT_FORMAT ("DVO_SECFILT_PS1_V5_LOAD", PS1_V5_LOAD, PS1_V5_LOAD); CONVERT_FORMAT ("DVO_SECFILT_PS1_REF", PS1_REF, PS1_REF); @@ -504,4 +511,5 @@ FORMAT_CASE (PS1_V4, PS1_V4); FORMAT_CASE (PS1_V5, PS1_V5); + FORMAT_CASE (PS1_V6, PS1_V6); FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD); FORMAT_CASE (PS1_REF, PS1_REF); @@ -612,4 +620,5 @@ SKIPPING_FORMAT ("DVO_LENSING_PS1_V4", PS1_V4, PS1_V4); CONVERT_FORMAT ("DVO_LENSING_PS1_V5", PS1_V5, PS1_V5_R3); + CONVERT_FORMAT ("DVO_LENSING_PS1_V6", PS1_V6, PS1_V6); CONVERT_FORMAT ("DVO_LENSING_PS1_V5_LOAD", PS1_V5_LOAD, PS1_V5_LOAD); SKIPPING_FORMAT ("DVO_LENSING_PS1_SIM", PS1_SIM, PS1_SIM); @@ -652,4 +661,5 @@ // FORMAT_CASE (PS1_V4, PS1_V4); FORMAT_CASE (PS1_V5, PS1_V5_R3); + FORMAT_CASE (PS1_V6, PS1_V6); FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD); # undef FORMAT_CASE @@ -732,4 +742,5 @@ SKIPPING_FORMAT ("DVO_LENSOBJ_PS1_V4", PS1_V4, PS1_V4); CONVERT_FORMAT ("DVO_LENSOBJ_PS1_V5", PS1_V5, PS1_V5_R1); + CONVERT_FORMAT ("DVO_LENSOBJ_PS1_V6", PS1_V6, PS1_V6); CONVERT_FORMAT ("DVO_LENSOBJ_PS1_V5_LOAD", PS1_V5_LOAD, PS1_V5_LOAD); SKIPPING_FORMAT ("DVO_LENSOBJ_PS1_SIM", PS1_SIM, PS1_SIM); @@ -772,4 +783,5 @@ // FORMAT_CASE (PS1_V4, PS1_V4); FORMAT_CASE (PS1_V5, PS1_V5_R1); + FORMAT_CASE (PS1_V6, PS1_V6); FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD); # undef FORMAT_CASE @@ -840,4 +852,5 @@ SKIPPING_FORMAT ("DVO_STARPAR_PS1_V4", PS1_V4, PS1_V4); CONVERT_FORMAT ("DVO_STARPAR_PS1_V5", PS1_V5, PS1_V5); + CONVERT_FORMAT ("DVO_STARPAR_PS1_V6", PS1_V6, PS1_V6); CONVERT_FORMAT ("DVO_STARPAR_PS1_V5_LOAD", PS1_V5_LOAD, PS1_V5_LOAD); # undef CONVERT_FORMAT @@ -880,4 +893,5 @@ // FORMAT_CASE (PS1_V4, PS1_V4); FORMAT_CASE (PS1_V5, PS1_V5); + FORMAT_CASE (PS1_V6, PS1_V6); FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD); # undef FORMAT_CASE @@ -961,4 +975,5 @@ SKIPPING_FORMAT ("DVO_GALPHOT_PS1_V4", PS1_V4, PS1_V4); CONVERT_FORMAT ("DVO_GALPHOT_PS1_V5", PS1_V5, PS1_V5_R1); + CONVERT_FORMAT ("DVO_GALPHOT_PS1_V6", PS1_V6, PS1_V6); CONVERT_FORMAT ("DVO_GALPHOT_PS1_V5_LOAD", PS1_V5_LOAD, PS1_V5_LOAD); SKIPPING_FORMAT ("DVO_GALPHOT_PS1_SIM", PS1_SIM, PS1_SIM); @@ -1000,5 +1015,5 @@ // FORMAT_CASE (PS1_V3, PS1_V3); // FORMAT_CASE (PS1_V4, PS1_V4); - FORMAT_CASE (PS1_V5, PS1_V5_R1); + FORMAT_CASE (PS1_V6, PS1_V6); FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD); # undef FORMAT_CASE @@ -1075,4 +1090,5 @@ CONVERT_FORMAT ("DVO_IMAGE_PS1_V4", PS1_V4, PS1_V4); CONVERT_FORMAT ("DVO_IMAGE_PS1_V5", PS1_V5, PS1_V5); + CONVERT_FORMAT ("DVO_IMAGE_PS1_V6", PS1_V6, PS1_V6); CONVERT_FORMAT ("DVO_IMAGE_PS1_V5_LOAD", PS1_V5_LOAD, PS1_V5_LOAD); CONVERT_FORMAT ("DVO_IMAGE_PS1_REF", PS1_REF, PS1_REF); @@ -1114,4 +1130,5 @@ FORMAT_CASE (PS1_V4, PS1_V4); FORMAT_CASE (PS1_V5, PS1_V5); + FORMAT_CASE (PS1_V6, PS1_V6); FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD); FORMAT_CASE (PS1_REF, PS1_REF); @@ -1166,4 +1183,5 @@ FORMAT_CASE (PS1_V4, PS1_V4); FORMAT_CASE (PS1_V5, PS1_V5); + FORMAT_CASE (PS1_V6, PS1_V6); FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD); FORMAT_CASE (PS1_REF, PS1_REF); Index: branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_image.c =================================================================== --- branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_image.c (revision 40210) +++ branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_image.c (revision 40211) @@ -223,4 +223,5 @@ if (db[0].format == DVO_FORMAT_PS1_V4) gfits_modify (&db[0].header, "FORMAT", "%s", 1, "PS1_V4"); if (db[0].format == DVO_FORMAT_PS1_V5) gfits_modify (&db[0].header, "FORMAT", "%s", 1, "PS1_V5"); + if (db[0].format == DVO_FORMAT_PS1_V6) gfits_modify (&db[0].header, "FORMAT", "%s", 1, "PS1_V6"); if (db[0].format == DVO_FORMAT_PS1_V5_LOAD) gfits_modify (&db[0].header, "FORMAT", "%s", 1, "PS1_V5_LOAD"); if (db[0].format == DVO_FORMAT_PS1_REF) gfits_modify (&db[0].header, "FORMAT", "%s", 1, "PS1_REF"); Index: branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_image_raw.c =================================================================== --- branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_image_raw.c (revision 40210) +++ branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_image_raw.c (revision 40211) @@ -60,4 +60,5 @@ if (db[0].format == DVO_FORMAT_PS1_V4) ImageSize = sizeof(Image_PS1_V4); if (db[0].format == DVO_FORMAT_PS1_V5) ImageSize = sizeof(Image_PS1_V5); + if (db[0].format == DVO_FORMAT_PS1_V6) ImageSize = sizeof(Image_PS1_V6); if (db[0].format == DVO_FORMAT_PS1_V5_LOAD) ImageSize = sizeof(Image_PS1_V5_LOAD); if (db[0].format == DVO_FORMAT_PS1_REF) ImageSize = sizeof(Image_PS1_REF); @@ -93,4 +94,5 @@ if (db[0].format == DVO_FORMAT_PS1_V4) gfits_table_mkheader_Image_PS1_V4 (&db[0].theader); if (db[0].format == DVO_FORMAT_PS1_V5) gfits_table_mkheader_Image_PS1_V5 (&db[0].theader); + if (db[0].format == DVO_FORMAT_PS1_V6) gfits_table_mkheader_Image_PS1_V6 (&db[0].theader); if (db[0].format == DVO_FORMAT_PS1_V5_LOAD) gfits_table_mkheader_Image_PS1_V5_LOAD (&db[0].theader); if (db[0].format == DVO_FORMAT_PS1_REF) gfits_table_mkheader_Image_PS1_REF (&db[0].theader);