IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 20608


Ignore:
Timestamp:
Nov 9, 2008, 1:51:39 PM (18 years ago)
Author:
Paul Price
Message:

Change to run a subset of a camera seems to work, based on a simtest and a manual run through with one of two rawImfiles with ignored = 1. Merging pap_branch_20081109; no conflicts.

Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/dbconfig/changes.txt

    r20397 r20608  
    683683ALTER TABLE flatcorrChipLink ADD COLUMN include tinyint after chip_id;
    684684ALTER TABLE flatcorrCamLink ADD COLUMN include tinyint after cam_id;
     685
     686ALTER TABLE rawImfile ADD COLUMN ignored TINYINT AFTER moon_phase;
     687

  • trunk/dbconfig/tasks.md

    r20310 r20608  
    1 # $Id: tasks.md,v 1.157 2008-10-22 02:39:15 bills Exp $
     1# $Id: tasks.md,v 1.158 2008-11-09 23:51:01 price Exp $
    22
    33# this table records all exposure ID ever seen from the summit
    … …  
    235235    moon_alt    F32         0.0
    236236    moon_phase  F32         0.0
     237    ignored     BOOL        FALSE
    237238    hostname    STR         64
    238239    fault       S16         0       # Key NOT NULL

  • trunk/ippTools/share/chiptool_completely_processed_exp.sql

    r18447 r20608  
    1313    end_stage
    1414FROM
    15     (SELECT 
     15    (SELECT
    1616        chipRun.*,
    1717        rawImfile.class_id as rawimfile_class_id,
    … …  
    1919    FROM chipRun
    2020    JOIN rawImfile
    21         USING(exp_id)
     21        ON chipRun.exp_id = rawImfile.exp_id
     22        AND rawImfile.ignored = 0
    2223    LEFT JOIN chipProcessedImfile
    2324        ON chipRun.chip_id = chipProcessedImfile.chip_id

  • trunk/ippTools/share/chiptool_pendingimfile.sql

    r19492 r20608  
    1212    USING(exp_id)
    1313JOIN rawImfile
    14     USING(exp_id)
     14    ON rawExp.exp_id = rawImfile.exp_id
     15    AND rawImfile.ignored = 0
    1516LEFT JOIN chipProcessedImfile
    1617    ON chipRun.chip_id = chipProcessedImfile.chip_id

  • trunk/ippTools/share/faketool_completely_processed_exp.sql

    r19092 r20608  
    1313    epoch
    1414FROM
    15     (SELECT 
     15    (SELECT
    1616        fakeRun.*,
    1717        rawImfile.class_id as rawimfile_class_id,
    … …  
    2525        USING(exp_id)
    2626    JOIN rawImfile
    27         USING(exp_id)
     27        ON rawImfile.exp_id = rawExp.exp_id
     28        AND rawImfile.ignored = 0
    2829    LEFT JOIN fakeProcessedImfile
    2930        ON fakeRun.fake_id = fakeProcessedImfile.fake_id

  • trunk/ippTools/share/pxadmin_create_tables.sql

    r20397 r20608  
    234234    moon_alt FLOAT,
    235235    moon_phase FLOAT,
     236    ignored TINYINT DEFAULT 0,
    236237    hostname VARCHAR(64),
    237238    fault SMALLINT NOT NULL,
    … …  
    10811082        det_type VARCHAR(64),
    10821083        dvodb VARCHAR(64),
    1083         camera VARCHAR(64),
    1084         telescope VARCHAR(64),
    1085         epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     1084        camera VARCHAR(64),
     1085        telescope VARCHAR(64),
     1086        epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
    10861087        filter VARCHAR(64),
    10871088        state VARCHAR(64),
    … …  
    11001101        corr_id BIGINT,
    11011102        chip_id BIGINT,
    1102         include TINYINT,
     1103        include TINYINT,
    11031104        PRIMARY KEY(corr_id, chip_id),
    11041105        FOREIGN KEY (corr_id)  REFERENCES  flatcorrRun(corr_id),
    … …  
    11101111        chip_id BIGINT,
    11111112        cam_id BIGINT,
    1112         include TINYINT,
     1113        include TINYINT,
    11131114        PRIMARY KEY(corr_id, cam_id),
    11141115        FOREIGN KEY (corr_id)  REFERENCES  flatcorrRun(corr_id),

  • trunk/ippTools/share/regtool_pendingexp.sql

    r20441 r20608  
    3939        newExp.state = 'run'
    4040        AND rawExp.exp_id IS NULL
     41        AND rawImfile.ignored = 0
    4142-- where hook %s
    4243    GROUP BY

  • trunk/ippTools/share/regtool_processedimfile.sql

    r14038 r20608  
    77JOIN newExp
    88    USING(exp_id)
    9 -- bogus conditional so there is a where clause to append to
    10 WHERE rawImfile.exp_id is NOT NULL
     9WHERE rawImfile.ignored = 0

  • trunk/ippTools/share/warptool_imfile.sql

    r19092 r20608  
    1919JOIN rawImfile -- is there any reason not to refer back to rawimfiles?
    2020    ON chipProcessedImfile.exp_id = rawImfile.exp_id
    21     AND chipProcessedImfile.class_id = rawImfile.class_id
     21    AND chipProcessedImfile.class_id = rawImfile.class_id
     22    AND rawImfile.ignored = 0
    2223WHERE
    2324    warpRun.state = 'new'

  • trunk/ippTools/src/regtool.c

    r20103 r20608  
    231231    PXOPT_LOOKUP_F32(moon_alt,   config->args, "-moon_alt",   false, false);
    232232    PXOPT_LOOKUP_F32(moon_phase, config->args, "-moon_phase", false, false);
     233    PXOPT_LOOKUP_BOOL(ignored, config->args, "-ignore", false);
    233234    PXOPT_LOOKUP_TIME(dateobs, config->args, "-dateobs", false, false);
    234235    PXOPT_LOOKUP_STR(hostname, config->args, "-hostname", false, false);
    … …  
    290291        user_5,
    291292        object,
    292         sun_angle,
    293         sun_alt,
    294         moon_angle,
    295         moon_alt,
    296         moon_phase,
     293        sun_angle,
     294        sun_alt,
     295        moon_angle,
     296        moon_alt,
     297        moon_phase,
     298        ignored,
    297299        hostname,
    298300        code,
    … …  
    404406    if (!query) {
    405407        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
    406         psFree(where);
     408        psFree(where);
    407409        return false;
    408410    }
    … …  
    443445    if (!pxSetFaultCode(config->dbh, "rawImfile", where, code)) {
    444446        psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag");
    445         psFree (where);
     447        psFree (where);
    446448        return false;
    447449    }
    … …  
    750752        user_5,
    751753        object,
    752         sun_angle,
    753         sun_alt,
    754         moon_angle,
    755         moon_alt,
    756         moon_phase,
     754        sun_angle,
     755        sun_alt,
     756        moon_angle,
     757        moon_alt,
     758        moon_phase,
    757759        hostname,
    758760        code,
    … …  
    954956    if (!query) {
    955957        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
    956         psFree(where);
     958        psFree(where);
    957959        return false;
    958960    }
    … …  
    961963        psString whereClause = psDBGenerateWhereConditionSQL(where, "rawExp");
    962964        psStringAppend(&query, " AND %s", whereClause);
    963         psFree(where);
     965        psFree(where);
    964966        psFree(whereClause);
    965967    }
    … …  
    993995    if (!pxSetFaultCode(config->dbh, "rawExp", where, code)) {
    994996        psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag");
    995         psFree(where);
     997        psFree(where);
    996998        return false;
    997999    }

  • trunk/ippTools/src/regtoolConfig.c

    r20103 r20608  
    119119    ADD_OPT(F32,  addprocessedimfileArgs, "-moon_alt",       "define moon altitude (neg = below horizon)", NAN);
    120120    ADD_OPT(F32,  addprocessedimfileArgs, "-moon_phase",     "define moon phase (0.0 = new)",   NAN);
     121    ADD_OPT(Bool, addprocessedimfileArgs, "-ignore",         "ignore this imfile?", false);
    121122    ADD_OPT(Time, addprocessedimfileArgs, "-dateobs",        "define observation time",         NULL);
    122123    ADD_OPT(Str,  addprocessedimfileArgs, "-hostname",       "define host name",                NULL);
    … …  
    159160    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-filelevel",        0,        "define the data partitioning level of this file (required)", NULL);
    160161
    161     ADD_OPT(F32,  addprocessedexpArgs, "-longitude",        "specify the observatory longitude (NOTE: not saved in db)", 0.0);
    162     ADD_OPT(F32,  addprocessedexpArgs, "-latitude",         "specify the observatory latitude (NOTE: not saved in db)", 0.0);
     162    ADD_OPT(F32,  addprocessedexpArgs, "-longitude",        "specify the observatory longitude (NOTE: not saved in db)", 0.0);
     163    ADD_OPT(F32,  addprocessedexpArgs, "-latitude",         "specify the observatory latitude (NOTE: not saved in db)", 0.0);
    163164
    164165    ADD_OPT(Time, addprocessedexpArgs, "-dateobs",          "define observation time", NULL);
Note: See TracChangeset for help on using the changeset viewer.