Index: trunk/ippTools/src/regtoolConfig.c =================================================================== --- trunk/ippTools/src/regtoolConfig.c (revision 17584) +++ trunk/ippTools/src/regtoolConfig.c (revision 17585) @@ -64,108 +64,56 @@ // -addprocessedimfile psMetadata *addprocessedimfileArgs = psMetadataAlloc(); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-exp_id", 0, - "define exposure ID (required)", NULL); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-exp_name", 0, - "define the exp_name (required)", NULL); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-inst", 0, - "define the camera name (required)", NULL); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-telescope", 0, - "define the telescope name (required)", NULL); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-tmp_class_id", 0, - "define temp. class ID (required)", NULL); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-class_id", 0, - "define class ID (required)", NULL); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-uri", 0, - "define URI (required)", NULL); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-exp_type", 0, - "define exposure type", NULL); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-filelevel", 0, - "define filelevel", NULL); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-filter", 0, - "define filter ", NULL); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-comment", 0, - "define comment ", NULL); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-airmass", 0, - "define airmass", NAN); - psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-ra", 0, - "define RA", NAN); - psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-decl", 0, - "define DEC", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-exp_time", 0, - "define exposure time", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-sat_pixel_frac", 0, - "define fraction of saturated pixels", NAN); - psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-bg", 0, - "define exposue background", NAN); - psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-bg_stdev", 0, - "define exposue background stdev", NAN); - psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, - "define exposue background mean stdev", NAN); - psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-alt", 0, - "define altitute", NAN); - psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-az", 0, - "define azimuth", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-ccd_temp", 0, - "define ccd tempature", NAN); - psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-posang", 0, - "define rotator position angle", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m1_x", 0, - "define M1 X position", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m1_y", 0, - "define M1 Y position", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m1_z", 0, - "define M1 Z position", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m1_tip", 0, - "define M1 TIP position", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m1_tilt", 0, - "define M1 TILT position", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m2_x", 0, - "define M2 X position", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m2_y", 0, - "define M2 Y position", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m2_z", 0, - "define M2 Z position", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m2_tip", 0, - "define M2 TIP position", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m2_tilt", 0, - "define M2 TILT position", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-env_temperature", 0, - "define Environmental Temperature", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-env_humidity", 0, - "define Environmental Humidity", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-env_wind_speed", 0, - "define Environmental Wind Speed", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-env_wind_dir", 0, - "define Environmental Wind Direction", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-teltemp_m1", 0, - "define Telescope Temperature : M1", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-teltemp_m1cell", 0, - "define Telescope Temperature : M1 Cell", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-teltemp_m2", 0, - "define Telescope Temperature : M2", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-teltemp_spider", 0, - "define Telescope Temperature : Spider", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-teltemp_truss", 0, - "define Telescope Temperature : Truss", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-teltemp_extra", 0, - "define Telescope Temperature : Extra", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-pon_time", 0, - "define time to last Power On", NAN); - psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-user_1", 0, - "define user statistic (1)", NAN); - psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-user_2", 0, - "define user statistic (2)", NAN); - psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-user_3", 0, - "define user statistic (3)", NAN); - psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-user_4", 0, - "define user statistic (4)", NAN); - psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-user_5", 0, - "define user statistic (5)", NAN); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-object", 0, - "define exposure object", NULL); - psMetadataAddTime(addprocessedimfileArgs, PS_LIST_TAIL, "-dateobs", 0, - "define observation time", NULL); - psMetadataAddS16(addprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, - "set fault code", 0); + psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "define exposure ID (required)", NULL); + psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-exp_name", 0, "define the exp_name (required)", NULL); + psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-inst", 0, "define the camera name (required)", NULL); + psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-telescope", 0, "define the telescope name (required)", NULL); + psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-tmp_class_id", 0, "define temp. class ID (required)", NULL); + psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-class_id", 0, "define class ID (required)", NULL); + psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-uri", 0, "define URI (required)", NULL); + psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-exp_type", 0, "define exposure type", NULL); + psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-filelevel", 0, "define filelevel", NULL); + psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-filter", 0, "define filter ", NULL); + psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-comment", 0, "define comment ", NULL); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-airmass", 0, "define airmass", NAN); + psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-ra", 0, "define RA", NAN); + psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-decl", 0, "define DEC", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-exp_time", 0, "define exposure time", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-sat_pixel_frac", 0, "define fraction of saturated pixels", NAN); + psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-bg", 0, "define exposue background", NAN); + psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-bg_stdev", 0, "define exposue background stdev", NAN); + psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, "define exposue background mean stdev", NAN); + psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-alt", 0, "define altitute", NAN); + psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-az", 0, "define azimuth", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-ccd_temp", 0, "define ccd tempature", NAN); + psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-posang", 0, "define rotator position angle", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m1_x", 0, "define M1 X position", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m1_y", 0, "define M1 Y position", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m1_z", 0, "define M1 Z position", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m1_tip", 0, "define M1 TIP position", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m1_tilt", 0, "define M1 TILT position", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m2_x", 0, "define M2 X position", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m2_y", 0, "define M2 Y position", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m2_z", 0, "define M2 Z position", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m2_tip", 0, "define M2 TIP position", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m2_tilt", 0, "define M2 TILT position", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-env_temperature",0, "define Environmental Temperature", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-env_humidity", 0, "define Environmental Humidity", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-env_wind_speed", 0, "define Environmental Wind Speed", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-env_wind_dir", 0, "define Environmental Wind Direction", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-teltemp_m1", 0, "define Telescope Temperature : M1", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-teltemp_m1cell", 0, "define Telescope Temperature : M1 Cell", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-teltemp_m2", 0, "define Telescope Temperature : M2", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-teltemp_spider", 0, "define Telescope Temperature : Spider", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-teltemp_truss", 0, "define Telescope Temperature : Truss", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-teltemp_extra", 0, "define Telescope Temperature : Extra", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-pon_time", 0, "define time to last Power On", NAN); + psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-user_1", 0, "define user statistic (1)", NAN); + psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-user_2", 0, "define user statistic (2)", NAN); + psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-user_3", 0, "define user statistic (3)", NAN); + psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-user_4", 0, "define user statistic (4)", NAN); + psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-user_5", 0, "define user statistic (5)", NAN); + psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-object", 0, "define exposure object", NULL); + psMetadataAddTime(addprocessedimfileArgs, PS_LIST_TAIL, "-dateobs", 0, "define observation time", NULL); + psMetadataAddS16(addprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, "set fault code", 0); // -processedimfile @@ -343,6 +291,43 @@ // -processedexp psMetadata *processedexpArgs = psMetadataAlloc(); - psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-exp_id", 0, - "search by exposure ID", NULL); + psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exposure ID", NULL); + psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-exp_name", 0, "search by exp_name", NULL); + psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-inst", 0, "search for camera", NULL); + psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-telescope", 0, "search for telescope", NULL); + psMetadataAddTime(processedexpArgs, PS_LIST_TAIL, "-dateobs_begin", 0, "search for exposures by time (>=)", NULL); + psMetadataAddTime(processedexpArgs, PS_LIST_TAIL, "-dateobs_end", 0, "search for exposures by time (<)", NULL); + psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-exp_tag", 0, "search by exp_tag", NULL); + psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-exp_type", 0, "search by exp_type", "object"); + psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-filelevel", 0, "search by filelevel", NULL); + psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-reduction", 0, "search by reduction class", NULL); + psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-filter", 0, "search for filter", NULL); + psMetadataAddF32(processedexpArgs, PS_LIST_TAIL, "-airmass_min", 0, "search by min airmass", NAN); + psMetadataAddF32(processedexpArgs, PS_LIST_TAIL, "-airmass_max", 0, "search by max airmass", NAN); + psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-ra_min", 0, "search by min", NAN); + psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-ra_max", 0, "search by max", NAN); + psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-decl_min", 0, "search by min", NAN); + psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-decl_max", 0, "search by max", NAN); + psMetadataAddF32(processedexpArgs, PS_LIST_TAIL, "-exp_time_min", 0, "search by min", NAN); + psMetadataAddF32(processedexpArgs, PS_LIST_TAIL, "-exp_time_max", 0, "search by max", NAN); + psMetadataAddF32(processedexpArgs, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, "search by max fraction of saturated pixels", NAN); + psMetadataAddF32(processedexpArgs, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, "search by min fraction of saturated pixels", NAN); + psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-bg_min", 0, "search by max", NAN); + psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-bg_max", 0, "search by max", NAN); + psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-bg_stdev_min", 0, "search by max", NAN); + psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-bg_stdev_max", 0, "search by max", NAN); + psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, "search by max", NAN); + psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, "search by max", NAN); + psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-alt_min", 0, "search by min", NAN); + psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-alt_max", 0, "search by max", NAN); + psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-az_min", 0, "search by min", NAN); + psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-az_max", 0, "search by max", NAN); + psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, "search by min ccd tempature", NAN); + psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, "search by max ccd tempature", NAN); + psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-posang_min", 0, "search by min rotator position angle", NAN); + psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-posang_max", 0, "search by max rotator position angle", NAN); + psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-object", 0, "search by exposure object", NULL); + psMetadataAddF32(processedexpArgs, PS_LIST_TAIL, "-solang_min", 0, "define min solar angle", NAN); + psMetadataAddF32(processedexpArgs, PS_LIST_TAIL, "-solang_max", 0, "define max solar angle", NAN); + psMetadataAddU64(processedexpArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0);