Index: trunk/ippTools/src/chiptoolConfig.c =================================================================== --- trunk/ippTools/src/chiptoolConfig.c (revision 17609) +++ trunk/ippTools/src/chiptoolConfig.c (revision 17611) @@ -98,43 +98,43 @@ // -updaterun psMetadata *updaterunArgs = psMetadataAlloc(); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-chip_id", 0, "search by chip ID", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exp_id", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_name", 0, "search by exp_name", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-inst", 0, "search for camera", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-telescope", 0, "search for telescope", NULL); - psMetadataAddTime(updaterunArgs, PS_LIST_TAIL, "-dateobs_begin", 0, "search for exposures by time (>=)", NULL); - psMetadataAddTime(updaterunArgs, PS_LIST_TAIL, "-dateobs_end", 0, "search for exposures by time (<)", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_tag", 0, "search by exp_tag", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_type", 0, "search by exp_type", "object"); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-filelevel", 0, "search by filelevel", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-reduction", 0, "search by reduction class", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-filter", 0, "search by filter", NULL); - psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-airmass_min", 0, "search by min airmass", NAN); - psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-airmass_max", 0, "search by max airmass", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ra_min", 0, "search by min", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ra_max", 0, "search by max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-decl_min", 0, "search by min", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-decl_max", 0, "search by max", NAN); - psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-exp_time_min", 0, "search by min", NAN); - psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-exp_time_max", 0, "search by max", NAN); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-chip_id", 0, "search by chip ID", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exp_id", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_name", 0, "search by exp_name", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-inst", 0, "search for camera", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-telescope", 0, "search for telescope", NULL); + psMetadataAddTime(updaterunArgs, PS_LIST_TAIL, "-dateobs_begin", 0, "search for exposures by time (>=)", NULL); + psMetadataAddTime(updaterunArgs, PS_LIST_TAIL, "-dateobs_end", 0, "search for exposures by time (<)", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_tag", 0, "search by exp_tag", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_type", 0, "search by exp_type", "object"); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-filelevel", 0, "search by filelevel", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-reduction", 0, "search by reduction class", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-filter", 0, "search by filter", NULL); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-airmass_min", 0, "search by min airmass", NAN); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-airmass_max", 0, "search by max airmass", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ra_min", 0, "search by min", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ra_max", 0, "search by max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-decl_min", 0, "search by min", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-decl_max", 0, "search by max", NAN); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-exp_time_min", 0, "search by min", NAN); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-exp_time_max", 0, "search by max", NAN); psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, "search by max fraction of saturated pixels", NAN); psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, "search by min fraction of saturated pixels", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_min", 0, "search by max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_max", 0, "search by max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_stdev_min", 0, "search by max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_stdev_max", 0, "search by max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_min", 0, "search by max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_max", 0, "search by max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_stdev_min", 0, "search by max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_stdev_max", 0, "search by max", NAN); psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, "search by max", NAN); psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, "search by max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-alt_min", 0, "search by min", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-alt_max", 0, "search by max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-az_min", 0, "search by min", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-az_max", 0, "search by max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, "search by min ccd tempature", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, "search by max ccd tempature", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-posang_min", 0, "search by min rotator position angle", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-posang_max", 0, "search by max rotator position angle", NAN); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-object", 0, "search by exposure object", NULL); - psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-solang_min", 0, "search by min solar angle", NAN); - psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-solang_max", 0, "search by max solar angle", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-alt_min", 0, "search by min", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-alt_max", 0, "search by max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-az_min", 0, "search by min", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-az_max", 0, "search by max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, "search by min ccd tempature", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, "search by max ccd tempature", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-posang_min", 0, "search by min rotator position angle", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-posang_max", 0, "search by max rotator position angle", NAN); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-object", 0, "search by exposure object", NULL); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-solang_min", 0, "search by min solar angle", NAN); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-solang_max", 0, "search by max solar angle", NAN); psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label", 0, "search by label", NULL); Index: trunk/ippTools/src/difftool.c =================================================================== --- trunk/ippTools/src/difftool.c (revision 17609) +++ trunk/ippTools/src/difftool.c (revision 17611) @@ -460,14 +460,14 @@ if (!diffSkyfileInsert(config->dbh, - (psS64)atoll(diff_id), - uri, - path_base, - bg, - bg_stdev, - dtime_diff, - hostname, - good_frac, - code - )) { + (psS64)atoll(diff_id), + uri, + path_base, + bg, + bg_stdev, + dtime_diff, + hostname, + good_frac, + code + )) { if (!psDBRollback(config->dbh)) { psError(PS_ERR_UNKNOWN, false, "database error"); Index: trunk/ippTools/src/flatcorr.c =================================================================== --- trunk/ippTools/src/flatcorr.c (revision 17609) +++ trunk/ippTools/src/flatcorr.c (revision 17611) @@ -197,8 +197,8 @@ if (pretend) { // negative simple so the default is true - for (int i = 0; i < output->n; i++) { - psMetadata *md = output->data[i]; - psMetadataConfigPrint (stdout, md); - } + for (int i = 0; i < output->n; i++) { + psMetadata *md = output->data[i]; + psMetadataConfigPrint (stdout, md); + } // if (!rawExpPrintObjects(stdout, output, !simple)) { // psError(PS_ERR_UNKNOWN, false, "failed to print array"); Index: trunk/ippTools/src/pxadminConfig.c =================================================================== --- trunk/ippTools/src/pxadminConfig.c (revision 17609) +++ trunk/ippTools/src/pxadminConfig.c (revision 17611) @@ -98,5 +98,5 @@ if (config->mode == PXADMIN_MODE_NONE) { - pxAdminShowDB (config, argv[0]); + pxAdminShowDB (config, argv[0]); fprintf (stderr, "admin mode not specified\n"); @@ -108,5 +108,5 @@ if ((N = psArgumentGet (argc, argv, "-help"))) { - pxAdminShowDB (config, argv[0]); + pxAdminShowDB (config, argv[0]); psArgumentHelp(arguments); psFree(arguments); @@ -116,5 +116,5 @@ if (! psArgumentParse(arguments, &argc, argv) || argc != 1) { - pxAdminShowDB (config, argv[0]); + pxAdminShowDB (config, argv[0]); psArgumentHelp(arguments); psFree(arguments); Index: trunk/ippTools/src/pxerrors.c =================================================================== --- trunk/ippTools/src/pxerrors.c (revision 17609) +++ trunk/ippTools/src/pxerrors.c (revision 17611) @@ -29,14 +29,14 @@ switch (err) { case PXTOOLS_ERR_SYS: - return PS_EXIT_SYS_ERROR; + return PS_EXIT_SYS_ERROR; case PXTOOLS_ERR_CONFIG: - return PS_EXIT_CONFIG_ERROR; + return PS_EXIT_CONFIG_ERROR; case PXTOOLS_ERR_PROG: - return PS_EXIT_PROG_ERROR; + return PS_EXIT_PROG_ERROR; case PXTOOLS_ERR_DATA: - return PS_EXIT_DATA_ERROR; + return PS_EXIT_DATA_ERROR; default: - return PS_EXIT_UNKNOWN_ERROR; - } + return PS_EXIT_UNKNOWN_ERROR; + } return PS_EXIT_UNKNOWN_ERROR; } Index: trunk/ippTools/src/pxinject.c =================================================================== --- trunk/ippTools/src/pxinject.c (revision 17609) +++ trunk/ippTools/src/pxinject.c (revision 17611) @@ -101,6 +101,6 @@ dvodb, tess_id, - end_stage, - label + end_stage, + label ) ) { Index: trunk/ippTools/src/pztool.c =================================================================== --- trunk/ippTools/src/pztool.c (revision 17609) +++ trunk/ippTools/src/pztool.c (revision 17611) @@ -495,5 +495,5 @@ tess_id, // tess_id end_stage, // end_stage - label + label ) ) { Index: trunk/ippTools/src/regtool.c =================================================================== --- trunk/ippTools/src/regtool.c (revision 17609) +++ trunk/ippTools/src/regtool.c (revision 17611) @@ -574,6 +574,6 @@ psFree(where); if (whereClause) { - psStringAppend(&query, " %s", whereClause); - psFree(whereClause); + psStringAppend(&query, " %s", whereClause); + psFree(whereClause); } } @@ -701,5 +701,5 @@ } psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(newExp); + psFree(newExp); return false; } @@ -712,5 +712,5 @@ } psError(PS_ERR_UNKNOWN, false, "failed to change newExp.state for exp_id: %s", exp_id); - psFree(newExp); + psFree(newExp); return false; } @@ -725,5 +725,5 @@ } - psFree(newExp); + psFree(newExp); return true; } @@ -736,5 +736,5 @@ (psS64)atoll(exp_id), workdir, - label, + label, reduction, NULL, // expgroup @@ -748,5 +748,5 @@ } psError(PS_ERR_UNKNOWN, false, "failed to queue chipPendingExp"); - psFree(newExp); + psFree(newExp); return false; } @@ -754,5 +754,5 @@ if (!psDBCommit(config->dbh)) { psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(newExp); + psFree(newExp); return false; } @@ -778,5 +778,5 @@ if (!config->where) { - config->where = psMetadataAlloc(); + config->where = psMetadataAlloc(); } Index: trunk/ippTools/src/regtoolConfig.c =================================================================== --- trunk/ippTools/src/regtoolConfig.c (revision 17609) +++ trunk/ippTools/src/regtoolConfig.c (revision 17611) @@ -30,5 +30,5 @@ #include "regtool.h" -#define ADD_OPT(TYPE,TARG,NAME,COMMENT,DEFAULT) psMetadataAdd##TYPE(TARG, PS_LIST_TAIL, NAME, 0, COMMENT, DEFAULT) +#define ADD_OPT(TYPE,TARG,NAME,COMMENT,DEFAULT) psMetadataAdd##TYPE(TARG, PS_LIST_TAIL, NAME, 0, COMMENT, DEFAULT) pxConfig *regtoolConfig(pxConfig *config, int argc, char **argv) @@ -61,64 +61,64 @@ // -addprocessedimfile psMetadata *addprocessedimfileArgs = psMetadataAlloc(); - ADD_OPT(Str, addprocessedimfileArgs, "-exp_id", "define exposure ID (required)", NULL); - ADD_OPT(Str, addprocessedimfileArgs, "-exp_name", "define the exp_name (required)", NULL); - ADD_OPT(Str, addprocessedimfileArgs, "-inst", "define the camera name (required)", NULL); - ADD_OPT(Str, addprocessedimfileArgs, "-telescope", "define the telescope name (required)", NULL); - ADD_OPT(Str, addprocessedimfileArgs, "-tmp_class_id", "define temp. class ID (required)", NULL); - ADD_OPT(Str, addprocessedimfileArgs, "-class_id", "define class ID (required)", NULL); - ADD_OPT(Str, addprocessedimfileArgs, "-uri", "define URI (required)", NULL); - ADD_OPT(Str, addprocessedimfileArgs, "-exp_type", "define exposure type", NULL); - ADD_OPT(Str, addprocessedimfileArgs, "-filelevel", "define filelevel", NULL); - ADD_OPT(Str, addprocessedimfileArgs, "-filter", "define filter ", NULL); - ADD_OPT(Str, addprocessedimfileArgs, "-comment", "define comment ", NULL); - ADD_OPT(F32, addprocessedimfileArgs, "-airmass", "define airmass", NAN); - ADD_OPT(F64, addprocessedimfileArgs, "-ra", "define RA", NAN); - ADD_OPT(F64, addprocessedimfileArgs, "-decl", "define DEC", NAN); - ADD_OPT(F32, addprocessedimfileArgs, "-exp_time", "define exposure time", NAN); - ADD_OPT(F32, addprocessedimfileArgs, "-sat_pixel_frac", "define fraction of saturated pixels", NAN); - ADD_OPT(F64, addprocessedimfileArgs, "-bg", "define exposue background", NAN); - ADD_OPT(F64, addprocessedimfileArgs, "-bg_stdev", "define exposue background stdev", NAN); - ADD_OPT(F64, addprocessedimfileArgs, "-bg_mean_stdev", "define exposue background mean stdev", NAN); - ADD_OPT(F64, addprocessedimfileArgs, "-alt", "define altitute", NAN); - ADD_OPT(F64, addprocessedimfileArgs, "-az", "define azimuth", NAN); - ADD_OPT(F32, addprocessedimfileArgs, "-ccd_temp", "define ccd tempature", NAN); - ADD_OPT(F64, addprocessedimfileArgs, "-posang", "define rotator position angle", NAN); - ADD_OPT(F32, addprocessedimfileArgs, "-m1_x", "define M1 X position", NAN); - ADD_OPT(F32, addprocessedimfileArgs, "-m1_y", "define M1 Y position", NAN); - ADD_OPT(F32, addprocessedimfileArgs, "-m1_z", "define M1 Z position", NAN); - ADD_OPT(F32, addprocessedimfileArgs, "-m1_tip", "define M1 TIP position", NAN); - ADD_OPT(F32, addprocessedimfileArgs, "-m1_tilt", "define M1 TILT position", NAN); - ADD_OPT(F32, addprocessedimfileArgs, "-m2_x", "define M2 X position", NAN); - ADD_OPT(F32, addprocessedimfileArgs, "-m2_y", "define M2 Y position", NAN); - ADD_OPT(F32, addprocessedimfileArgs, "-m2_z", "define M2 Z position", NAN); - ADD_OPT(F32, addprocessedimfileArgs, "-m2_tip", "define M2 TIP position", NAN); - ADD_OPT(F32, addprocessedimfileArgs, "-m2_tilt", "define M2 TILT position", NAN); - ADD_OPT(F32, addprocessedimfileArgs, "-env_temperature","define Environmental Temperature", NAN); - ADD_OPT(F32, addprocessedimfileArgs, "-env_humidity", "define Environmental Humidity", NAN); - ADD_OPT(F32, addprocessedimfileArgs, "-env_wind_speed", "define Environmental Wind Speed", NAN); - ADD_OPT(F32, addprocessedimfileArgs, "-env_wind_dir", "define Environmental Wind Direction", NAN); - ADD_OPT(F32, addprocessedimfileArgs, "-teltemp_m1", "define Telescope Temperature : M1", NAN); - ADD_OPT(F32, addprocessedimfileArgs, "-teltemp_m1cell", "define Telescope Temperature : M1 Cell", NAN); - ADD_OPT(F32, addprocessedimfileArgs, "-teltemp_m2", "define Telescope Temperature : M2", NAN); - ADD_OPT(F32, addprocessedimfileArgs, "-teltemp_spider", "define Telescope Temperature : Spider", NAN); - ADD_OPT(F32, addprocessedimfileArgs, "-teltemp_truss", "define Telescope Temperature : Truss", NAN); - ADD_OPT(F32, addprocessedimfileArgs, "-teltemp_extra", "define Telescope Temperature : Extra", NAN); - ADD_OPT(F32, addprocessedimfileArgs, "-pon_time", "define time to last Power On", NAN); - ADD_OPT(F64, addprocessedimfileArgs, "-user_1", "define user statistic (1)", NAN); - ADD_OPT(F64, addprocessedimfileArgs, "-user_2", "define user statistic (2)", NAN); - ADD_OPT(F64, addprocessedimfileArgs, "-user_3", "define user statistic (3)", NAN); - ADD_OPT(F64, addprocessedimfileArgs, "-user_4", "define user statistic (4)", NAN); - ADD_OPT(F64, addprocessedimfileArgs, "-user_5", "define user statistic (5)", NAN); - ADD_OPT(Str, addprocessedimfileArgs, "-object", "define exposure object", NULL); - ADD_OPT(Time, addprocessedimfileArgs, "-dateobs", "define observation time", NULL); - ADD_OPT(S16, addprocessedimfileArgs, "-code", "set fault code", 0); + ADD_OPT(Str, addprocessedimfileArgs, "-exp_id", "define exposure ID (required)", NULL); + ADD_OPT(Str, addprocessedimfileArgs, "-exp_name", "define the exp_name (required)", NULL); + ADD_OPT(Str, addprocessedimfileArgs, "-inst", "define the camera name (required)", NULL); + ADD_OPT(Str, addprocessedimfileArgs, "-telescope", "define the telescope name (required)", NULL); + ADD_OPT(Str, addprocessedimfileArgs, "-tmp_class_id", "define temp. class ID (required)", NULL); + ADD_OPT(Str, addprocessedimfileArgs, "-class_id", "define class ID (required)", NULL); + ADD_OPT(Str, addprocessedimfileArgs, "-uri", "define URI (required)", NULL); + ADD_OPT(Str, addprocessedimfileArgs, "-exp_type", "define exposure type", NULL); + ADD_OPT(Str, addprocessedimfileArgs, "-filelevel", "define filelevel", NULL); + ADD_OPT(Str, addprocessedimfileArgs, "-filter", "define filter ", NULL); + ADD_OPT(Str, addprocessedimfileArgs, "-comment", "define comment ", NULL); + ADD_OPT(F32, addprocessedimfileArgs, "-airmass", "define airmass", NAN); + ADD_OPT(F64, addprocessedimfileArgs, "-ra", "define RA", NAN); + ADD_OPT(F64, addprocessedimfileArgs, "-decl", "define DEC", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-exp_time", "define exposure time", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-sat_pixel_frac", "define fraction of saturated pixels", NAN); + ADD_OPT(F64, addprocessedimfileArgs, "-bg", "define exposue background", NAN); + ADD_OPT(F64, addprocessedimfileArgs, "-bg_stdev", "define exposue background stdev", NAN); + ADD_OPT(F64, addprocessedimfileArgs, "-bg_mean_stdev", "define exposue background mean stdev", NAN); + ADD_OPT(F64, addprocessedimfileArgs, "-alt", "define altitute", NAN); + ADD_OPT(F64, addprocessedimfileArgs, "-az", "define azimuth", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-ccd_temp", "define ccd tempature", NAN); + ADD_OPT(F64, addprocessedimfileArgs, "-posang", "define rotator position angle", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-m1_x", "define M1 X position", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-m1_y", "define M1 Y position", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-m1_z", "define M1 Z position", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-m1_tip", "define M1 TIP position", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-m1_tilt", "define M1 TILT position", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-m2_x", "define M2 X position", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-m2_y", "define M2 Y position", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-m2_z", "define M2 Z position", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-m2_tip", "define M2 TIP position", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-m2_tilt", "define M2 TILT position", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-env_temperature","define Environmental Temperature", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-env_humidity", "define Environmental Humidity", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-env_wind_speed", "define Environmental Wind Speed", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-env_wind_dir", "define Environmental Wind Direction", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-teltemp_m1", "define Telescope Temperature : M1", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-teltemp_m1cell", "define Telescope Temperature : M1 Cell", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-teltemp_m2", "define Telescope Temperature : M2", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-teltemp_spider", "define Telescope Temperature : Spider", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-teltemp_truss", "define Telescope Temperature : Truss", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-teltemp_extra", "define Telescope Temperature : Extra", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-pon_time", "define time to last Power On", NAN); + ADD_OPT(F64, addprocessedimfileArgs, "-user_1", "define user statistic (1)", NAN); + ADD_OPT(F64, addprocessedimfileArgs, "-user_2", "define user statistic (2)", NAN); + ADD_OPT(F64, addprocessedimfileArgs, "-user_3", "define user statistic (3)", NAN); + ADD_OPT(F64, addprocessedimfileArgs, "-user_4", "define user statistic (4)", NAN); + ADD_OPT(F64, addprocessedimfileArgs, "-user_5", "define user statistic (5)", NAN); + ADD_OPT(Str, addprocessedimfileArgs, "-object", "define exposure object", NULL); + ADD_OPT(Time, addprocessedimfileArgs, "-dateobs", "define observation time", NULL); + ADD_OPT(S16, addprocessedimfileArgs, "-code", "set fault code", 0); // -processedimfile psMetadata *processedimfileArgs = psMetadataAlloc(); - ADD_OPT(Str, processedimfileArgs, "-exp_id", "search by exposure ID", NULL); - ADD_OPT(Str, processedimfileArgs, "-class_id", "search by class ID", NULL); - ADD_OPT(U64, processedimfileArgs, "-limit", "limit result set to N items", 0); + ADD_OPT(Str, processedimfileArgs, "-exp_id", "search by exposure ID", NULL); + ADD_OPT(Str, processedimfileArgs, "-class_id", "search by class ID", NULL); + ADD_OPT(U64, processedimfileArgs, "-limit", "limit result set to N items", 0); ADD_OPT(Bool, processedimfileArgs, "-faulted", "only return imfiles with a fault status set", false); - ADD_OPT(Bool, processedimfileArgs, "-simple", "use the simple output format", false); + ADD_OPT(Bool, processedimfileArgs, "-simple", "use the simple output format", false); // -revertprocessedimfile