Index: /branches/eam_branches/ipp-20140423/Ohana/src/libautocode/def/average-ps1-dev-2.d =================================================================== --- /branches/eam_branches/ipp-20140423/Ohana/src/libautocode/def/average-ps1-dev-2.d (revision 36802) +++ /branches/eam_branches/ipp-20140423/Ohana/src/libautocode/def/average-ps1-dev-2.d (revision 36803) @@ -25,5 +25,5 @@ FIELD measureOffset, OFF_MEASURE, int, offset to first psf measurement FIELD missingOffset, OFF_MISSING, int, offset to first missing obs -FIELD extendOffset, OFF_EXTEND, int, offset to first extended measurement +FIELD refColor, REF_COLOR, float, color of astrometry ref stars FIELD code, code, unsigned short, ID code (star; ghost; etc) Index: /branches/eam_branches/ipp-20140423/Ohana/src/libautocode/def/average-ps1-v1.d =================================================================== --- /branches/eam_branches/ipp-20140423/Ohana/src/libautocode/def/average-ps1-v1.d (revision 36802) +++ /branches/eam_branches/ipp-20140423/Ohana/src/libautocode/def/average-ps1-v1.d (revision 36803) @@ -30,5 +30,5 @@ FIELD measureOffset, OFF_MEASURE, uint32_t, offset to first psf measurement FIELD missingOffset, OFF_MISSING, uint32_t, offset to first missing obs -FIELD extendOffset, OFF_EXTEND, uint32_t, offset to first extended measurement +FIELD refColor, REF_COLOR, float, color of astrometry ref stars # 'flags' was called 'code' prior to 2009.02.07 Index: /branches/eam_branches/ipp-20140423/Ohana/src/libautocode/def/average-ps1-v2.d =================================================================== --- /branches/eam_branches/ipp-20140423/Ohana/src/libautocode/def/average-ps1-v2.d (revision 36802) +++ /branches/eam_branches/ipp-20140423/Ohana/src/libautocode/def/average-ps1-v2.d (revision 36803) @@ -35,5 +35,5 @@ FIELD measureOffset, OFF_MEASURE, uint32_t, offset to first psf measurement FIELD missingOffset, OFF_MISSING, uint32_t, offset to first missing obs -FIELD extendOffset, OFF_EXTEND, uint32_t, offset to first extended measurement +FIELD refColor, REF_COLOR, float, color of astrometry ref stars # 'flags' was called 'code' prior to 2009.02.07 Index: /branches/eam_branches/ipp-20140423/Ohana/src/libautocode/def/average-ps1-v3.d =================================================================== --- /branches/eam_branches/ipp-20140423/Ohana/src/libautocode/def/average-ps1-v3.d (revision 36802) +++ /branches/eam_branches/ipp-20140423/Ohana/src/libautocode/def/average-ps1-v3.d (revision 36803) @@ -35,5 +35,5 @@ FIELD measureOffset, OFF_MEASURE, uint32_t, offset to first psf measurement FIELD missingOffset, OFF_MISSING, uint32_t, offset to first missing obs -FIELD extendOffset, OFF_EXTEND, uint32_t, offset to first extended measurement +FIELD refColor, REF_COLOR, float, color of astrometry ref stars # 'flags' was called 'code' prior to 2009.02.07 Index: /branches/eam_branches/ipp-20140423/Ohana/src/libautocode/def/average-ps1-v4.d =================================================================== --- /branches/eam_branches/ipp-20140423/Ohana/src/libautocode/def/average-ps1-v4.d (revision 36802) +++ /branches/eam_branches/ipp-20140423/Ohana/src/libautocode/def/average-ps1-v4.d (revision 36803) @@ -38,5 +38,5 @@ FIELD measureOffset, OFF_MEASURE, uint32_t, offset to first psf measurement FIELD missingOffset, OFF_MISSING, uint32_t, offset to first missing obs -FIELD extendOffset, OFF_EXTEND, uint32_t, offset to first extended measurement +FIELD refColor, REF_COLOR, float, color of reference stars # 'flags' was called 'code' prior to 2009.02.07 Index: /branches/eam_branches/ipp-20140423/Ohana/src/libautocode/def/average.d =================================================================== --- /branches/eam_branches/ipp-20140423/Ohana/src/libautocode/def/average.d (revision 36802) +++ /branches/eam_branches/ipp-20140423/Ohana/src/libautocode/def/average.d (revision 36803) @@ -38,5 +38,5 @@ FIELD measureOffset, OFF_MEASURE, int, offset to first psf measurement FIELD missingOffset, OFF_MISSING, int, offset to first missing obs -FIELD extendOffset, OFF_EXTEND, int, offset to first extended measurement +FIELD refColor, REF_COLOR, float, color of astrometry ref stars # 'flags' was called 'code' prior to 2009.02.07 Index: /branches/eam_branches/ipp-20140423/Ohana/src/libautocode/def/image-ps1-v2.d =================================================================== --- /branches/eam_branches/ipp-20140423/Ohana/src/libautocode/def/image-ps1-v2.d (revision 36802) +++ /branches/eam_branches/ipp-20140423/Ohana/src/libautocode/def/image-ps1-v2.d (revision 36803) @@ -42,5 +42,5 @@ FIELD DECo, DEC_CENTER, float, image center, degrees FIELD Radius, RADIUS, float, image radius, degrees -FIELD DUMMY, DUMMY, float, dummy +FIELD refColor, REF_COLOR, float, dummy # should we define the max length of name as a macro? Index: /branches/eam_branches/ipp-20140423/Ohana/src/libautocode/def/image-ps1-v3.d =================================================================== --- /branches/eam_branches/ipp-20140423/Ohana/src/libautocode/def/image-ps1-v3.d (revision 36802) +++ /branches/eam_branches/ipp-20140423/Ohana/src/libautocode/def/image-ps1-v3.d (revision 36803) @@ -42,5 +42,5 @@ FIELD DECo, DEC_CENTER, float, image center, degrees FIELD Radius, RADIUS, float, image radius, degrees -FIELD DUMMY, DUMMY, float, dummy +FIELD refColor, REF_COLOR, float, dummy # should we define the max length of name as a macro? Index: /branches/eam_branches/ipp-20140423/Ohana/src/libautocode/def/image-ps1-v4.d =================================================================== --- /branches/eam_branches/ipp-20140423/Ohana/src/libautocode/def/image-ps1-v4.d (revision 36802) +++ /branches/eam_branches/ipp-20140423/Ohana/src/libautocode/def/image-ps1-v4.d (revision 36803) @@ -42,5 +42,5 @@ FIELD DECo, DEC_CENTER, float, image center, degrees FIELD Radius, RADIUS, float, image radius, degrees -FIELD DUMMY, DUMMY, float, dummy +FIELD refColor, REF_COLOR, float, dummy # should we define the max length of name as a macro? Index: /branches/eam_branches/ipp-20140423/Ohana/src/libautocode/def/image.d =================================================================== --- /branches/eam_branches/ipp-20140423/Ohana/src/libautocode/def/image.d (revision 36802) +++ /branches/eam_branches/ipp-20140423/Ohana/src/libautocode/def/image.d (revision 36803) @@ -44,5 +44,5 @@ FIELD DECo, DEC_CENTER, float, image center, degrees FIELD Radius, RADIUS, float, image radius, degrees -FIELD DUMMY, DUMMY, float, dummy +FIELD refColor, REF_COLOR, float, dummy FIELD name, NAME, char[121], name of original image Index: /branches/eam_branches/ipp-20140423/Ohana/src/libdvo/include/dvo.h =================================================================== --- /branches/eam_branches/ipp-20140423/Ohana/src/libdvo/include/dvo.h (revision 36802) +++ /branches/eam_branches/ipp-20140423/Ohana/src/libdvo/include/dvo.h (revision 36803) @@ -481,5 +481,5 @@ uint32_t measureOffset; // offset to first psf measurement uint32_t missingOffset; // offset to first missing obs - uint32_t extendOffset; // offset to first extended measurement + float refColor; // offset to first extended measurement uint32_t flags; // average object flags (star; ghost; etc) uint32_t photFlagsUpper; // upper bit of 2 bit summary of per-measure photflags Index: /branches/eam_branches/ipp-20140423/Ohana/src/libdvo/include/dvodb.h =================================================================== --- /branches/eam_branches/ipp-20140423/Ohana/src/libdvo/include/dvodb.h (revision 36802) +++ /branches/eam_branches/ipp-20140423/Ohana/src/libdvo/include/dvodb.h (revision 36803) @@ -222,4 +222,5 @@ AVE_EXTID_HI, AVE_EXTID_LO, + AVE_REF_COLOR, }; @@ -289,5 +290,6 @@ IMAGE_NFIT_ASTROM, IMAGE_NLINK_PHOTOM, - IMAGE_NLINK_ASTROM + IMAGE_NLINK_ASTROM, + IMAGE_REF_COLOR }; Index: /branches/eam_branches/ipp-20140423/Ohana/src/libdvo/src/dbExtractAverages.c =================================================================== --- /branches/eam_branches/ipp-20140423/Ohana/src/libdvo/src/dbExtractAverages.c (revision 36802) +++ /branches/eam_branches/ipp-20140423/Ohana/src/libdvo/src/dbExtractAverages.c (revision 36803) @@ -161,4 +161,7 @@ case AVE_STARGAL: value.Flt = average[0].stargal; + break; + case AVE_REF_COLOR: + value.Flt = average[0].refColor; break; Index: /branches/eam_branches/ipp-20140423/Ohana/src/libdvo/src/dbExtractImages.c =================================================================== --- /branches/eam_branches/ipp-20140423/Ohana/src/libdvo/src/dbExtractImages.c (revision 36802) +++ /branches/eam_branches/ipp-20140423/Ohana/src/libdvo/src/dbExtractImages.c (revision 36803) @@ -69,6 +69,11 @@ if (!haveCelestial) { if (!FindMosaicForImage (image, Nimage, N)) return value; - x = 0.5*image[N].NX; - y = 0.5*image[N].NY; + if (!strcmp(&image[N].coords.ctype[4], "-DIS")) { + x = 0.0; + y = 0.0; + } else { + x = 0.5*image[N].NX; + y = 0.5*image[N].NY; + } XY_to_RD (&RAo, &DECo, x, y, &image[N].coords); haveCelestial = TRUE; @@ -79,6 +84,11 @@ if (!haveCelestial) { if (!FindMosaicForImage (image, Nimage, N)) return value; - x = 0.5*image[N].NX; - y = 0.5*image[N].NY; + if (!strcmp(&image[N].coords.ctype[4], "-DIS")) { + x = 0.0; + y = 0.0; + } else { + x = 0.5*image[N].NX; + y = 0.5*image[N].NY; + } XY_to_RD (&RAo, &DECo, x, y, &image[N].coords); haveCelestial = TRUE; @@ -90,6 +100,11 @@ if (!haveCelestial) { if (!FindMosaicForImage (image, Nimage, N)) return value; - x = 0.5*image[N].NX; - y = 0.5*image[N].NY; + if (!strcmp(&image[N].coords.ctype[4], "-DIS")) { + x = 0.0; + y = 0.0; + } else { + x = 0.5*image[N].NX; + y = 0.5*image[N].NY; + } XY_to_RD (&RAo, &DECo, x, y, &image[N].coords); haveCelestial = TRUE; @@ -104,6 +119,11 @@ if (!haveCelestial) { if (!FindMosaicForImage (image, Nimage, N)) return value; - x = 0.5*image[N].NX; - y = 0.5*image[N].NY; + if (!strcmp(&image[N].coords.ctype[4], "-DIS")) { + x = 0.0; + y = 0.0; + } else { + x = 0.5*image[N].NX; + y = 0.5*image[N].NY; + } XY_to_RD (&RAo, &DECo, x, y, &image[N].coords); haveCelestial = TRUE; @@ -118,6 +138,11 @@ if (!haveCelestial) { if (!FindMosaicForImage (image, Nimage, N)) return value; - x = 0.5*image[N].NX; - y = 0.5*image[N].NY; + if (!strcmp(&image[N].coords.ctype[4], "-DIS")) { + x = 0.0; + y = 0.0; + } else { + x = 0.5*image[N].NX; + y = 0.5*image[N].NY; + } XY_to_RD (&RAo, &DECo, x, y, &image[N].coords); haveCelestial = TRUE; @@ -132,6 +157,11 @@ if (!haveCelestial) { if (!FindMosaicForImage (image, Nimage, N)) return value; - x = 0.5*image[N].NX; - y = 0.5*image[N].NY; + if (!strcmp(&image[N].coords.ctype[4], "-DIS")) { + x = 0.0; + y = 0.0; + } else { + x = 0.5*image[N].NX; + y = 0.5*image[N].NY; + } XY_to_RD (&RAo, &DECo, x, y, &image[N].coords); haveCelestial = TRUE; @@ -344,4 +374,8 @@ value.Int = image[N].nLinkAstrom; break; + + case IMAGE_REF_COLOR: + value.Flt = image[N].refColor; + break; } return (value); Index: /branches/eam_branches/ipp-20140423/Ohana/src/libdvo/src/dbFields.c =================================================================== --- /branches/eam_branches/ipp-20140423/Ohana/src/libdvo/src/dbFields.c (revision 36802) +++ /branches/eam_branches/ipp-20140423/Ohana/src/libdvo/src/dbFields.c (revision 36803) @@ -381,4 +381,5 @@ if (!strcasecmp (fieldName, "EXTID_HI")) ESCAPE (AVE_EXTID_HI, MAG_NONE, OPIHI_INT); if (!strcasecmp (fieldName, "EXTID_LO")) ESCAPE (AVE_EXTID_LO, MAG_NONE, OPIHI_INT); + if (!strcasecmp (fieldName, "REF_COLOR")) ESCAPE (AVE_REF_COLOR, MAG_NONE, OPIHI_FLT); // check for code:mode in photcode name @@ -522,8 +523,9 @@ if (!strcasecmp (fieldName, "UCDIST")) ESCAPE (IMAGE_UBERCAL_DIST,MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "NFIT_PHOTOM")) ESCAPE (IMAGE_NFIT_PHOTOM,MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "NFIT_ASTROM")) ESCAPE (IMAGE_NFIT_ASTROM,MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "NLINK_PHOTOM")) ESCAPE (IMAGE_NLINK_PHOTOM,MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "NLINK_ASTROM")) ESCAPE (IMAGE_NLINK_ASTROM,MAG_NONE, OPIHI_INT); + if (!strcasecmp (fieldName, "NFIT_PHOTOM")) ESCAPE (IMAGE_NFIT_PHOTOM, MAG_NONE, OPIHI_INT); + if (!strcasecmp (fieldName, "NFIT_ASTROM")) ESCAPE (IMAGE_NFIT_ASTROM, MAG_NONE, OPIHI_INT); + if (!strcasecmp (fieldName, "NLINK_PHOTOM")) ESCAPE (IMAGE_NLINK_PHOTOM, MAG_NONE, OPIHI_INT); + if (!strcasecmp (fieldName, "NLINK_ASTROM")) ESCAPE (IMAGE_NLINK_ASTROM, MAG_NONE, OPIHI_INT); + if (!strcasecmp (fieldName, "REF_COLOR")) ESCAPE (IMAGE_REF_COLOR, MAG_NONE, OPIHI_FLT); // for words that don't parse, try a photcode Index: /branches/eam_branches/ipp-20140423/Ohana/src/libdvo/src/dvo_catalog.c =================================================================== --- /branches/eam_branches/ipp-20140423/Ohana/src/libdvo/src/dvo_catalog.c (revision 36802) +++ /branches/eam_branches/ipp-20140423/Ohana/src/libdvo/src/dvo_catalog.c (revision 36803) @@ -100,5 +100,5 @@ average->measureOffset = -1; average->missingOffset = -1; - average->extendOffset = -1; + average->refColor = NAN; average->flags = 0; Index: /branches/eam_branches/ipp-20140423/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_2.c =================================================================== --- /branches/eam_branches/ipp-20140423/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_2.c (revision 36802) +++ /branches/eam_branches/ipp-20140423/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_2.c (revision 36803) @@ -119,5 +119,5 @@ out[i].measureOffset = in[i].measureOffset; out[i].missingOffset = in[i].missingOffset; - out[i].extendOffset = in[i].extendOffset; + out[i].refColor = in[i].refColor; out[i].objID = in[i].objID; out[i].catID = in[i].catID; @@ -153,5 +153,5 @@ out[i].measureOffset = in[i].measureOffset; out[i].missingOffset = in[i].missingOffset; - out[i].extendOffset = in[i].extendOffset; + out[i].refColor = in[i].refColor; out[i].objID = in[i].objID; out[i].catID = in[i].catID; Index: /branches/eam_branches/ipp-20140423/Ohana/src/libdvo/src/dvo_convert_PS1_V1.c =================================================================== --- /branches/eam_branches/ipp-20140423/Ohana/src/libdvo/src/dvo_convert_PS1_V1.c (revision 36802) +++ /branches/eam_branches/ipp-20140423/Ohana/src/libdvo/src/dvo_convert_PS1_V1.c (revision 36803) @@ -140,5 +140,5 @@ out[i].measureOffset = in[i].measureOffset; out[i].missingOffset = in[i].missingOffset; - out[i].extendOffset = in[i].extendOffset; + out[i].refColor = in[i].refColor; out[i].flags = in[i].flags; out[i].objID = in[i].objID; @@ -175,5 +175,5 @@ out[i].measureOffset = in[i].measureOffset; out[i].missingOffset = in[i].missingOffset; - out[i].extendOffset = in[i].extendOffset; + out[i].refColor = in[i].refColor; out[i].flags = in[i].flags; out[i].objID = in[i].objID; Index: /branches/eam_branches/ipp-20140423/Ohana/src/libdvo/src/dvo_convert_PS1_V2.c =================================================================== --- /branches/eam_branches/ipp-20140423/Ohana/src/libdvo/src/dvo_convert_PS1_V2.c (revision 36802) +++ /branches/eam_branches/ipp-20140423/Ohana/src/libdvo/src/dvo_convert_PS1_V2.c (revision 36803) @@ -145,5 +145,5 @@ out[i].measureOffset = in[i].measureOffset; out[i].missingOffset = in[i].missingOffset; - out[i].extendOffset = in[i].extendOffset; + out[i].refColor = in[i].refColor; out[i].flags = in[i].flags; out[i].objID = in[i].objID; @@ -184,5 +184,5 @@ out[i].measureOffset = in[i].measureOffset; out[i].missingOffset = in[i].missingOffset; - out[i].extendOffset = in[i].extendOffset; + out[i].refColor = in[i].refColor; out[i].flags = in[i].flags; out[i].objID = in[i].objID; @@ -269,4 +269,5 @@ out[i].DECo = in[i].DECo; out[i].Radius = in[i].Radius; + out[i].refColor = in[i].refColor; out[i].detection_limit = in[i].detection_limit; @@ -331,4 +332,5 @@ out[i].DECo = in[i].DECo; out[i].Radius = in[i].Radius; + out[i].refColor = in[i].refColor; out[i].detection_limit = in[i].detection_limit; Index: /branches/eam_branches/ipp-20140423/Ohana/src/libdvo/src/dvo_convert_PS1_V3.c =================================================================== --- /branches/eam_branches/ipp-20140423/Ohana/src/libdvo/src/dvo_convert_PS1_V3.c (revision 36802) +++ /branches/eam_branches/ipp-20140423/Ohana/src/libdvo/src/dvo_convert_PS1_V3.c (revision 36803) @@ -145,5 +145,5 @@ out[i].measureOffset = in[i].measureOffset; out[i].missingOffset = in[i].missingOffset; - out[i].extendOffset = in[i].extendOffset; + out[i].refColor = in[i].refColor; out[i].flags = in[i].flags; out[i].photFlagsUpper = in[i].photFlagsUpper; @@ -186,5 +186,5 @@ out[i].measureOffset = in[i].measureOffset; out[i].missingOffset = in[i].missingOffset; - out[i].extendOffset = in[i].extendOffset; + out[i].refColor = in[i].refColor; out[i].flags = in[i].flags; out[i].photFlagsUpper = in[i].photFlagsUpper; @@ -279,4 +279,5 @@ out[i].DECo = in[i].DECo; out[i].Radius = in[i].Radius; + out[i].refColor = in[i].refColor; out[i].detection_limit = in[i].detection_limit; @@ -341,4 +342,5 @@ out[i].DECo = in[i].DECo; out[i].Radius = in[i].Radius; + out[i].refColor = in[i].refColor; out[i].detection_limit = in[i].detection_limit; Index: /branches/eam_branches/ipp-20140423/Ohana/src/libdvo/src/dvo_convert_PS1_V4.c =================================================================== --- /branches/eam_branches/ipp-20140423/Ohana/src/libdvo/src/dvo_convert_PS1_V4.c (revision 36802) +++ /branches/eam_branches/ipp-20140423/Ohana/src/libdvo/src/dvo_convert_PS1_V4.c (revision 36803) @@ -166,5 +166,5 @@ out[i].measureOffset = in[i].measureOffset; out[i].missingOffset = in[i].missingOffset; - out[i].extendOffset = in[i].extendOffset; + out[i].refColor = in[i].refColor; out[i].flags = in[i].flags; out[i].photFlagsUpper = in[i].photFlagsUpper; @@ -210,5 +210,5 @@ out[i].measureOffset = in[i].measureOffset; out[i].missingOffset = in[i].missingOffset; - out[i].extendOffset = in[i].extendOffset; + out[i].refColor = in[i].refColor; out[i].flags = in[i].flags; out[i].photFlagsUpper = in[i].photFlagsUpper; @@ -317,4 +317,5 @@ out[i].DECo = in[i].DECo; out[i].Radius = in[i].Radius; + out[i].refColor = in[i].refColor; out[i].detection_limit = in[i].detection_limit; @@ -379,4 +380,5 @@ out[i].DECo = in[i].DECo; out[i].Radius = in[i].Radius; + out[i].refColor = in[i].refColor; out[i].detection_limit = in[i].detection_limit; @@ -680,5 +682,5 @@ out[i].measureOffset = in[i].measureOffset; out[i].missingOffset = in[i].missingOffset; - out[i].extendOffset = in[i].extendOffset; + out[i].refColor = in[i].refColor; out[i].flags = in[i].flags; out[i].photFlagsUpper = in[i].photFlagsUpper;