Index: /tags/ipp-20121218/dbconfig/changes.txt =================================================================== --- /tags/ipp-20121218/dbconfig/changes.txt (revision 35200) +++ /tags/ipp-20121218/dbconfig/changes.txt (revision 35201) @@ -2265,2 +2265,7 @@ ALTER TABLE skycalResult ADD column n_forced INT after n_extended; UPDATE dbversion set schema_version = '1.1.73', updated= CURRENT_TIMESTAMP(); + +ALTER TABLE skycalResult ADD COLUMN fwhm_major FLOAT AFTER zpt_stdev; +ALTER TABLE skycalResult ADD COLUMN fwhm_minor FLOAT AFTER fwhm_major; + + Index: /tags/ipp-20121218/dbconfig/staticsky.md =================================================================== --- /tags/ipp-20121218/dbconfig/staticsky.md (revision 35200) +++ /tags/ipp-20121218/dbconfig/staticsky.md (revision 35201) @@ -59,4 +59,6 @@ zpt_obs F32 0.0 zpt_stdev F32 0.0 + fwhm_major F32 0.0 + fwhm_minor F32 0.0 quality S16 0 # Key software_ver STR 16 Index: /tags/ipp-20121218/ippTools/share/staticskytool_revert.sql =================================================================== --- /tags/ipp-20121218/ippTools/share/staticskytool_revert.sql (revision 35200) +++ /tags/ipp-20121218/ippTools/share/staticskytool_revert.sql (revision 35201) @@ -1,5 +1,9 @@ DELETE FROM staticskyResult -USING staticskyResult, staticskyRun +USING staticskyResult, staticskyRun, staticskyInput, stackRun, skycell WHERE staticskyRun.sky_id = staticskyResult.sky_id + AND staticskyRun.sky_id = staticskyInput.sky_id + AND staticskyInput.stack_id = stackRun.stack_id + AND stackRun.tess_id = skycell.tess_id + AND stackRun.skycell_id = skycell.skycell_id AND staticskyRun.state = 'new' AND staticskyResult.fault != 0 Index: /tags/ipp-20121218/ippTools/share/staticskytool_revertskycal.sql =================================================================== --- /tags/ipp-20121218/ippTools/share/staticskytool_revertskycal.sql (revision 35200) +++ /tags/ipp-20121218/ippTools/share/staticskytool_revertskycal.sql (revision 35201) @@ -1,6 +1,8 @@ DELETE FROM skycalResult -USING skycalResult, skycalRun, stackRun +USING skycalResult, skycalRun, stackRun, skycell WHERE skycalRun.skycal_id = skycalResult.skycal_id AND stackRun.stack_id = skycalRun.stack_id AND skycalRun.state = 'new' AND skycalResult.fault != 0 + AND stackRun.tess_id = skycell.tess_id + AND stackRun.skycell_id = skycell.skycell_id Index: /tags/ipp-20121218/ippTools/src/staticskytool.c =================================================================== --- /tags/ipp-20121218/ippTools/src/staticskytool.c (revision 35200) +++ /tags/ipp-20121218/ippTools/src/staticskytool.c (revision 35201) @@ -397,4 +397,5 @@ PXOPT_COPY_S64(config->args, where, "-sky_id", "sky_id", "=="); PXOPT_COPY_STR(config->args, where, "-label", "staticskyRun.label", "=="); + PXOPT_COPY_STR(config->args, where, "-data_group", "staticskyRun.data_group", "=="); PXOPT_COPY_STR(config->args, where, "-state", "staticskyRun.state", "=="); PXOPT_COPY_STR(config->args, where, "-tess_id", "stackRun.tess_id", "=="); @@ -503,4 +504,5 @@ PXOPT_COPY_S64(config->args, whereMD, "-sky_id", "sky_id", "=="); pxAddLabelSearchArgs (config, whereMD, "-label", "staticskyRun.label", "=="); + pxskycellAddWhere(config, whereMD); PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); @@ -735,4 +737,9 @@ pxAddLabelSearchArgs(config, where, "-label", "staticskyRun.label", "=="); PXOPT_COPY_S16(config->args, where, "-fault", "staticskyResult.fault", "=="); + + if (!pxskycellAddWhere(config, where)) { + psError(PXTOOLS_ERR_CONFIG, false, "failed to add skycell search arguments"); + return false; + } if (!psListLength(where->list) && !psMetadataLookupBool(NULL, config->args, "-all")) { @@ -1274,4 +1281,6 @@ PXOPT_LOOKUP_F32(zpt_obs, config->args, "-zpt_obs", false, false); PXOPT_LOOKUP_F32(zpt_stdev, config->args, "-zpt_stdev", false, false); + PXOPT_LOOKUP_F32(fwhm_major, config->args, "-fwhm_major", false, false); + PXOPT_LOOKUP_F32(fwhm_minor, config->args, "-fwhm_minor", false, false); @@ -1327,4 +1336,6 @@ zpt_obs, zpt_stdev, + fwhm_major, + fwhm_minor, quality, software_ver, @@ -1478,4 +1489,8 @@ pxAddLabelSearchArgs(config, where, "-filter", "stackRun.filter", "=="); PXOPT_COPY_S16(config->args, where, "-fault", "skycalResult.fault", "=="); + if (!pxskycellAddWhere(config, where)) { + psError(PXTOOLS_ERR_CONFIG, false, "failed to add skycell search arguments"); + return false; + } if (!psListLength(where->list) && !psMetadataLookupBool(NULL, config->args, "-all")) { Index: /tags/ipp-20121218/ippTools/src/staticskytoolConfig.c =================================================================== --- /tags/ipp-20121218/ippTools/src/staticskytoolConfig.c (revision 35200) +++ /tags/ipp-20121218/ippTools/src/staticskytoolConfig.c (revision 35201) @@ -84,4 +84,5 @@ psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0, "search by state", NULL); psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label", 0, "search by label", 0); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-data_group", 0, "search by data_group", 0); psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-tess_id", 0, "search by tess_id", NULL); psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-skycell_id", 0, "search by skycell_id", NULL); @@ -103,4 +104,5 @@ psMetadataAddS64(todoArgs, PS_LIST_TAIL, "-sky_id", 0, "search by staticsky ID", 0); psMetadataAddStr(todoArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by label", NULL); + pxskycellAddArguments(todoArgs); psMetadataAddU64(todoArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); psMetadataAddBool(todoArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); @@ -138,4 +140,5 @@ psMetadataAddStr(revertArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by label", 0); psMetadataAddS16(revertArgs, PS_LIST_TAIL, "-fault", 0, "search by fault code", 0); + pxskycellAddArguments(revertArgs); psMetadataAddBool(revertArgs, PS_LIST_TAIL, "-all", 0, "allow no search terms", false); @@ -208,6 +211,8 @@ psMetadataAddF32(addskycalresultArgs, PS_LIST_TAIL, "-sigma_ra", 0, "define exposure E ra", NAN); psMetadataAddF32(addskycalresultArgs, PS_LIST_TAIL, "-sigma_dec", 0, "define exposure E dec", NAN); - psMetadataAddF32(addskycalresultArgs, PS_LIST_TAIL, "-zpt_obs", 0, "define observed zero point", 0); - psMetadataAddF32(addskycalresultArgs, PS_LIST_TAIL, "-zpt_stdev", 0, "define observed zero point stdandard deviation", 0); + psMetadataAddF32(addskycalresultArgs, PS_LIST_TAIL, "-zpt_obs", 0, "define observed zero point", NAN); + psMetadataAddF32(addskycalresultArgs, PS_LIST_TAIL, "-zpt_stdev", 0, "define observed zero point stdandard deviation", NAN); + psMetadataAddF32(addskycalresultArgs, PS_LIST_TAIL, "-fwhm_major", 0, "define fwhm (major axis; pixels)", NAN); + psMetadataAddF32(addskycalresultArgs, PS_LIST_TAIL, "-fwhm_minor", 0, "define fwhm (minor axis; pixels)", NAN); psMetadataAddF32(addskycalresultArgs, PS_LIST_TAIL, "-dtime_script", 0, "define elapsed time in script (seconds)", NAN); @@ -238,4 +243,5 @@ psMetadataAddStr(revertskycalArgs, PS_LIST_TAIL, "-data_group", PS_META_DUPLICATE_OK, "search by data_group", 0); psMetadataAddStr(revertskycalArgs, PS_LIST_TAIL, "-filter", PS_META_DUPLICATE_OK, "search by filter", 0); + pxskycellAddArguments(revertskycalArgs); psMetadataAddS16(revertskycalArgs, PS_LIST_TAIL, "-fault", 0, "search by fault code", 0); psMetadataAddBool(revertskycalArgs, PS_LIST_TAIL, "-all", 0, "allow no search terms", false);