IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 25299 for trunk/ippTools/src


Ignore:
Timestamp:
Sep 8, 2009, 5:32:55 PM (17 years ago)
Author:
watersc1
Message:

Merge my branch back into the trunk. This includes:

ipp_cleanup.pl : and associated edits to allow cleanup to work
burntool : updated to newest version, ipp_apply_burntool.pl modified to use persist=t options
ppImageBurntoolMask.c : masks region burntool identifies
psastro : allow selection of wcs header format
addtool : splits addstar step off from the camera stage

Location:
trunk
Files:
7 edited
5 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/ippTools/src/Makefile.am

    r24512 r25299  
    11bin_PROGRAMS = \
     2        addtool \
    23        caltool \
    34        camtool \
    … …  
    2829
    2930pkginclude_HEADERS = \
     31        pxadd.h \
    3032        pxadmin.h \
    3133        pxcam.h \
    … …  
    4244
    4345noinst_HEADERS = \
     46        addtool.h \
    4447        caltool.h \
    4548        camtool.h \
    … …  
    6871libpxtools_la_LDFLAGS   = -release $(PACKAGE_VERSION)
    6972libpxtools_la_SOURCES   = \
     73        pxadd.c \
    7074        pxcam.c \
    7175        pxchip.c \
    … …  
    96100    pstamptool.c \
    97101    pstamptoolConfig.c
     102
     103addtool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
     104addtool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
     105addtool_SOURCES = \
     106    addtool.c \
     107    addtoolConfig.c
    98108
    99109caltool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)

  • trunk/ippTools/src/camtool.c

    r24681 r25299  
    656656        return false;
    657657    }
     658
     659    if (!pxaddQueueByCamID(config,
     660                           pendingRow->cam_id,
     661                           pendingRow->workdir,
     662                           pendingRow->label,
     663                           pendingRow->reduction,
     664                           pendingRow->dvodb
     665    )) {
     666        // rollback
     667        if (!psDBRollback(config->dbh)) {
     668            psError(PS_ERR_UNKNOWN, false, "database error");
     669        }
     670        psError(PS_ERR_UNKNOWN, false, "failed to queue new addRun");
     671        psFree(pendingRow);
     672        return false;
     673    }
     674
    658675    psFree(pendingRow);
    659676

  • trunk/ippTools/src/dettoolConfig.c

    r24866 r25299  
    7070    psMetadataAddF64(definebytagArgs, PS_LIST_TAIL, "-sun_angle_min",  0,            "define min solar angle", NAN);
    7171    psMetadataAddF64(definebytagArgs, PS_LIST_TAIL, "-sun_angle_max",  0,            "define max solar angle", NAN);
     72
    7273
    7374    psMetadataAddTime(definebytagArgs, PS_LIST_TAIL, "-registered",  0,            "time detrend run was registered", now);
    … …  
    138139    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-comment",                0,          "search by comment field (LIKE comparison)", NULL);
    139140
     141
     142    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_moon_angle_min",  0,          "define min moon angle", NAN);
     143    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_moon_angle_max",  0,          "define max moon angle", NAN);
     144    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_moon_alt_min",  0,            "define min moon alt", NAN);
     145    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_moon_alt_max",  0,            "define max moon alt", NAN);
     146    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_moon_phase_min",  0,          "define min moon phase", NAN);
     147    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_moon_phase_max",  0,          "define max moon phase", NAN);
     148    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-comment",                0,          "search by comment field (LIKE comparison)", NULL);
     149
    140150    psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-pretend",  0,            "print the exposures that would be included in the detrend run and exit", false);
    141151    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-reduction",  0,            "define reduction class for processing", NULL);

  • trunk/ippTools/src/pxtools.h

    r24733 r25299  
    3737#include "pxtoolsErrorCodes.h"
    3838
     39#include "pxadd.h"
    3940#include "pxcam.h"
    4041#include "pxchip.h"

  • trunk/ippTools/src/regtool.c

    r24866 r25299  
    331331    PXOPT_LOOKUP_BOOL(faulted, config->args, "-faulted", false);
    332332    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
     333    PXOPT_LOOKUP_BOOL(ordered_by_date, config->args, "-ordered_by_date", false);
    333334
    334335    psString query = pxDataGet("regtool_processedimfile.sql");
    … …  
    352353        // don't list faulted rows
    353354        psStringAppend(&query, " %s", "AND rawImfile.fault = 0");
     355    }
     356
     357    // add the ORDER BY statement if desired
     358    if (ordered_by_date) {
     359        psStringAppend(&query, " ORDER BY dateobs");
    354360    }
    355361
    … …  
    923929    PXOPT_COPY_F64(config->args,   where,  "-posang_max", "posang", "<");
    924930    PXOPT_COPY_STR(config->args,   where,  "-object", "object", "==");
    925     PXOPT_COPY_F32(config->args,   where,  "-sun_angle_min", "sun_angle", ">=");
    926     PXOPT_COPY_F32(config->args,   where,  "-sun_angle_max", "sun_angle", "<");
     931    PXOPT_COPY_F32(config->args,   where,  "-solang_min", "solang", ">=");
     932    PXOPT_COPY_F32(config->args,   where,  "-solang_max", "solang", "<");
    927933
    928934    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);

  • trunk/ippTools/src/warptool.c

    r24956 r25299  
    234234    PXOPT_COPY_F64(config->args,   where, "-posang_max",         "rawExp.posang",         "<");
    235235    PXOPT_COPY_STR(config->args,   where, "-object",             "rawExp.object",         "==");
    236     PXOPT_COPY_F32(config->args,   where, "-sun_angle_min",      "rawExp.sun_angle",      ">=");
    237     PXOPT_COPY_F32(config->args,   where, "-sun_angle_max",      "rawExp.sun_angle",      "<");
     236    PXOPT_COPY_F32(config->args,   where, "-solang_min",         "rawExp.solang",         ">=");
     237    PXOPT_COPY_F32(config->args,   where, "-solang_max",         "rawExp.solang",         "<");
    238238    PXOPT_COPY_STR(config->args,   where, "-reduction",          "fakeRun.reduction",     "==");
    239239    pxAddLabelSearchArgs (config,  where, "-label",             "fakeRun.label",         "==");
Note: See TracChangeset for help on using the changeset viewer.