IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 28428


Ignore:
Timestamp:
Jun 22, 2010, 10:02:25 PM (16 years ago)
Author:
Paul Price
Message:

Make diffphot respect/propagate magic status. No 'destreaking' set up to run on diffphot yet; we just inherit the magic status of the parent diffRun.

Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/dbconfig/changes.txt

    r28375 r28428  
    17841784    quality SMALLINT NOT NULL,       -- bad quality flag
    17851785    software_ver VARCHAR(16),                       -- software version for run
     1786    magicked BIGINT NOT NULL DEFAULT 0, -- magic mask applied
    17861787    PRIMARY KEY(diff_phot_id, skycell_id),
    17871788    KEY(fault),

  • trunk/dbconfig/diffphot.md

    r28343 r28428  
    2121    quality          S16        0       # Key
    2222    software_ver     STR        16
     23    magicked         S64        0
    2324END

  • trunk/ippScripts/scripts/diffphot.pl

    r28362 r28428  
    7070# Get input components
    7171my $mdcParser = PS::IPP::Metadata::Config->new; # Parser for metadata config files
    72 my ($inputPath, $camera);                     # Input path and camera
    73 my $bothways;                                 # Diff was done both ways?
     72my $inputPath;                                  # Input path
     73my $camera;                                     # Camera name
     74my $bothways;                           # Diff was done both ways?
     75my $magicked;                           # Magic status
    7476{
    7577    my $command = "$diffphottool -input -diff_phot_id $diff_phot_id -skycell_id $skycell_id";
    … …  
    8991    $camera = $file->{camera};
    9092    $bothways = $file->{bothways};
     93    $magicked = $file->{magicked};
    9194}
    9295
    … …  
    252255    my $command = "$diffphottool -diff_phot_id $diff_phot_id -skycell_id $skycell_id";
    253256    $command .= " -done -path_base $outroot";
     257    $command .= " -magicked $magicked" if $magicked;
    254258    $command .= " -quality $quality" if defined $quality;
    255259    $command .= (" -dtime_script " . ((DateTime->now->mjd - $mjd_start) * 86400));

  • trunk/ippTools/share/diffphottool_advance.sql

    r28414 r28428  
    11SELECT
    2     diff_phot_id
     2    diff_phot_id,
     3    magicked
    34FROM diffPhotRun
    45JOIN diffSkyfile USING(diff_id)

  • trunk/ippTools/share/diffphottool_input.sql

    r28367 r28428  
    22    diffPhotRun.*,
    33    diffSkyfile.path_base,
     4    diffSkyfile.magicked,
    45    diffRun.bothways,
    56    rawExp.camera

  • trunk/ippTools/share/diffphottool_pending.sql

    r28367 r28428  
    99WHERE diffPhotSkyfile.skycell_id IS NULL
    1010    AND diffRun.state = 'full'
     11    AND diffSkyfile.magicked >= 0
    1112    AND diffSkyfile.fault = 0
    1213    AND diffSkyfile.quality = 0

  • trunk/ippTools/share/pubtool_definerun.sql

    r28411 r28428  
    5656        AND publishClient.active = 1
    5757        AND diffPhotRun.state IN ('full', 'cleaned', 'goto_cleaned')
    58         AND (diffRun.diff_mode = 4 OR publishClient.magicked = 0) -- diffPhotRun doesn't respect magic
     58        AND (diffPhotRun.magicked != 0 OR diffRun.diff_mode = 4 OR publishClient.magicked = 0)
    5959    -- WHERE hook %s
    6060    ) AS publishToDo

  • trunk/ippTools/share/pubtool_pending.sql

    r28411 r28428  
    7474        AND publishRun.state = 'new'
    7575        AND diffPhotRun.state IN ('full', 'cleaned', 'goto_cleaned')
    76         AND (diffRun.diff_mode = 4 OR publishClient.magicked = 0) -- diffPhotRun doesn't respect magic
     76        AND (diffPhotRun.magicked != 0 OR diffRun.diff_mode = 4 OR publishClient.magicked = 0)
    7777        -- WHERE hook %s
    7878) AS publishToDo

  • trunk/ippTools/share/pxadmin_create_tables.sql

    r28375 r28428  
    17551755    quality SMALLINT NOT NULL,       -- bad quality flag
    17561756    software_ver VARCHAR(16),                       -- software version
     1757    magicked BIGINT NOT NULL DEFAULT 0, -- magic mask applied
    17571758    PRIMARY KEY(diff_phot_id, skycell_id),
    17581759    KEY(fault),

  • trunk/ippTools/src/diffphottool.c

    r28412 r28428  
    371371    PXOPT_LOOKUP_STR(ver_ppstats, config->args, "-ver_ppstats", false, false);
    372372    PXOPT_LOOKUP_STR(ver_psphot, config->args, "-ver_psphot", false, false);
     373    PXOPT_LOOKUP_S64(magicked, config->args, "-magicked", false, false);
    373374
    374375    psString version = pxMergeCodeVersions(ver_pslib, ver_psmodules);
    … …  
    377378
    378379    if (!diffPhotSkyfileInsert(config->dbh, diff_phot_id, skycell_id, path_base, dtime_script, hostname,
    379                                fault, quality, version)) {
     380                               fault, quality, version, magicked)) {
    380381        psError(psErrorCodeLast(), false, "database error");
    381382        return false;

  • trunk/ippTools/src/diffphottoolConfig.c

    r28412 r28428  
    100100    psMetadataAddStr(doneArgs, PS_LIST_TAIL, "-ver_ppstats", 0, "define ppStats version", NULL);
    101101    psMetadataAddStr(doneArgs, PS_LIST_TAIL, "-ver_psphot", 0, "define psphot version", NULL);
     102    psMetadataAddS64(doneArgs, PS_LIST_TAIL, "-magicked", 0, "define magicked state", 0);
    102103
    103104    // -advance
Note: See TracChangeset for help on using the changeset viewer.