Index: branches/pap/ippTools/src/pxchip.c =================================================================== --- branches/pap/ippTools/src/pxchip.c (revision 23948) +++ branches/pap/ippTools/src/pxchip.c (revision 25027) @@ -47,29 +47,29 @@ psMetadataAddF32(md, PS_LIST_TAIL, "-airmass_min", 0, "search by min airmass", NAN); psMetadataAddF32(md, PS_LIST_TAIL, "-airmass_max", 0, "search by max airmass", NAN); - psMetadataAddF64(md, PS_LIST_TAIL, "-ra_min", 0, "search by min", NAN); - psMetadataAddF64(md, PS_LIST_TAIL, "-ra_max", 0, "search by max", NAN); - psMetadataAddF64(md, PS_LIST_TAIL, "-decl_min", 0, "search by min", NAN); - psMetadataAddF64(md, PS_LIST_TAIL, "-decl_max", 0, "search by max", NAN); - psMetadataAddF32(md, PS_LIST_TAIL, "-exp_time_min", 0, "search by min", NAN); - psMetadataAddF32(md, PS_LIST_TAIL, "-exp_time_max", 0, "search by max", NAN); - psMetadataAddF32(md, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, "search by max fraction of saturated pixels", NAN); - psMetadataAddF32(md, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, "search by min fraction of saturated pixels", NAN); - psMetadataAddF64(md, PS_LIST_TAIL, "-bg_min", 0, "search by max", NAN); - psMetadataAddF64(md, PS_LIST_TAIL, "-bg_max", 0, "search by max", NAN); - psMetadataAddF64(md, PS_LIST_TAIL, "-bg_stdev_min", 0, "search by max", NAN); - psMetadataAddF64(md, PS_LIST_TAIL, "-bg_stdev_max", 0, "search by max", NAN); - psMetadataAddF64(md, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, "search by max", NAN); - psMetadataAddF64(md, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, "search by max", NAN); - psMetadataAddF64(md, PS_LIST_TAIL, "-alt_min", 0, "search by min", NAN); - psMetadataAddF64(md, PS_LIST_TAIL, "-alt_max", 0, "search by max", NAN); - psMetadataAddF64(md, PS_LIST_TAIL, "-az_min", 0, "search by min", NAN); - psMetadataAddF64(md, PS_LIST_TAIL, "-az_max", 0, "search by max", NAN); + psMetadataAddF64(md, PS_LIST_TAIL, "-ra_min", 0, "search by min RA (degrees) ", NAN); + psMetadataAddF64(md, PS_LIST_TAIL, "-ra_max", 0, "search by max RA (degrees) ", NAN); + psMetadataAddF64(md, PS_LIST_TAIL, "-decl_min", 0, "search by min DEC (degrees)", NAN); + psMetadataAddF64(md, PS_LIST_TAIL, "-decl_max", 0, "search by max DEC (degrees)", NAN); + psMetadataAddF32(md, PS_LIST_TAIL, "-exp_time_min", 0, "search by min exposure time", NAN); + psMetadataAddF32(md, PS_LIST_TAIL, "-exp_time_max", 0, "search by max exposure time", NAN); + psMetadataAddF32(md, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, "search by min fraction of saturated pixels", NAN); + psMetadataAddF32(md, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, "search by max fraction of saturated pixels", NAN); + psMetadataAddF64(md, PS_LIST_TAIL, "-bg_min", 0, "search by min background", NAN); + psMetadataAddF64(md, PS_LIST_TAIL, "-bg_max", 0, "search by max background", NAN); + psMetadataAddF64(md, PS_LIST_TAIL, "-bg_stdev_min", 0, "search by min background standard deviation", NAN); + psMetadataAddF64(md, PS_LIST_TAIL, "-bg_stdev_max", 0, "search by max background standard deviation", NAN); + psMetadataAddF64(md, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, "search by min background mean standard deviation (across imfiles)", NAN); + psMetadataAddF64(md, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, "search by max background mean standard deviation (across imfiles)", NAN); + psMetadataAddF64(md, PS_LIST_TAIL, "-alt_min", 0, "search by min altitude", NAN); + psMetadataAddF64(md, PS_LIST_TAIL, "-alt_max", 0, "search by max altitude", NAN); + psMetadataAddF64(md, PS_LIST_TAIL, "-az_min", 0, "search by min azimuth ", NAN); + psMetadataAddF64(md, PS_LIST_TAIL, "-az_max", 0, "search by max azimuth ", NAN); psMetadataAddF64(md, PS_LIST_TAIL, "-ccd_temp_min", 0, "search by min ccd tempature", NAN); psMetadataAddF64(md, PS_LIST_TAIL, "-ccd_temp_max", 0, "search by max ccd tempature", NAN); psMetadataAddF64(md, PS_LIST_TAIL, "-posang_min", 0, "search by min rotator position angle", NAN); psMetadataAddF64(md, PS_LIST_TAIL, "-posang_max", 0, "search by max rotator position angle", NAN); + psMetadataAddF32(md, PS_LIST_TAIL, "-sun_angle_min", 0, "search by min solar angle", NAN); + psMetadataAddF32(md, PS_LIST_TAIL, "-sun_angle_max", 0, "search by max solar angle", NAN); psMetadataAddStr(md, PS_LIST_TAIL, "-object", 0, "search by exposure object", NULL); - psMetadataAddF32(md, PS_LIST_TAIL, "-solang_min", 0, "search by min solar angle", NAN); - psMetadataAddF32(md, PS_LIST_TAIL, "-solang_max", 0, "search by max solar angle", NAN); psMetadataAddStr(md, PS_LIST_TAIL, "-comment", 0, "search by comment field (LIKE comparison)", NULL); psMetadataAddStr(md, PS_LIST_TAIL, "-obs_mode", 0, "search by observation mode", NULL); @@ -99,8 +99,8 @@ PXOPT_COPY_F64(config->args, where, "-airmass_min", "rawExp.airmass", ">="); PXOPT_COPY_F64(config->args, where, "-airmass_max", "rawExp.airmass", "<"); - PXOPT_COPY_F64(config->args, where, "-ra_min", "rawExp.ra", ">="); - PXOPT_COPY_F64(config->args, where, "-ra_max", "rawExp.ra", "<"); - PXOPT_COPY_F64(config->args, where, "-decl_min", "rawExp.decl", ">="); - PXOPT_COPY_F64(config->args, where, "-decl_max", "rawExp.decl", "<"); + PXOPT_COPY_RADEC(config->args, where, "-ra_min", "rawExp.ra", ">="); + PXOPT_COPY_RADEC(config->args, where, "-ra_max", "rawExp.ra", "<"); + PXOPT_COPY_RADEC(config->args, where, "-decl_min", "rawExp.decl", ">="); + PXOPT_COPY_RADEC(config->args, where, "-decl_max", "rawExp.decl", "<"); PXOPT_COPY_F32(config->args, where, "-exp_time_min", "rawExp.exp_time", ">="); PXOPT_COPY_F32(config->args, where, "-exp_time_max", "rawExp.exp_time", "<"); @@ -122,6 +122,6 @@ PXOPT_COPY_F64(config->args, where, "-posang_max", "rawExp.posang", "<"); PXOPT_COPY_STR(config->args, where, "-object", "rawExp.object", "=="); - PXOPT_COPY_F32(config->args, where, "-solang_min", "rawExp.solang", ">="); - PXOPT_COPY_F32(config->args, where, "-solang_max", "rawExp.solang", "<"); + PXOPT_COPY_F32(config->args, where, "-sun_angle_min", "rawExp.sun_angle", ">="); + PXOPT_COPY_F32(config->args, where, "-sun_angle_max", "rawExp.sun_angle", "<"); PXOPT_COPY_STR(config->args, where, "-comment", "rawExp.comment", "LIKE"); PXOPT_COPY_STR(config->args, where, "-obs_mode", "rawExp.obs_mode", "=="); @@ -175,5 +175,5 @@ psString query = psStringCopy("UPDATE chipRun JOIN rawExp USING(exp_id) SET state = '%s'"); - if (where) { + if (where && psListLength(where->list) > 0) { psString whereClause = psDBGenerateWhereSQL(where, NULL); psStringAppend(&query, " %s", whereClause); @@ -216,5 +216,5 @@ psString query = psStringCopy("UPDATE chipRun JOIN rawExp USING(exp_id) SET label = '%s'"); - if (where) { + if (where && psListLength(where->list) > 0) { psString whereClause = psDBGenerateWhereSQL(where, NULL); psStringAppend(&query, " %s", whereClause); @@ -264,5 +264,5 @@ dvodb, tess_id, - end_stage, + end_stage, 0 // magicked ) @@ -277,5 +277,5 @@ psS64 chip_id = psDBLastInsertID(config->dbh); - // Create rows in chipImfile table for each input exposure. + // Create rows in chipImfile table for each input exposure. // This creates the chip_image_id values psString query = "INSERT INTO chipImfile " @@ -295,5 +295,5 @@ return 0; } - + return chip_id; }