IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 28042


Ignore:
Timestamp:
May 19, 2010, 5:10:19 PM (16 years ago)
Author:
watersc1
Message:

final commit on this branch, I think

Location:
branches/czw_branch/20100427
Files:
2 added
14 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/czw_branch/20100427

  • branches/czw_branch/20100427/ippTools/share/magictool_definebyquery_select.sql

    r26387 r28042  
    3535JOIN camRun USING(cam_id)
    3636JOIN chipRun USING(chip_id)
     37JOIN rawExp USING(exp_id)
    3738LEFT JOIN
    3839    (SELECT magic_id, exp_id, label
    39         FROM magicRun 
     40        FROM magicRun
    4041        -- rerun hook %s
    4142    ) AS oldMagicRun

  • branches/czw_branch/20100427/ippTools/src/magictool.c

    r28017 r28042  
    132132    psMetadata *queryWhere = psMetadataAlloc(); // WHERE conditions for everything else
    133133    PXOPT_COPY_S64(config->args, queryWhere, "-exp_id", "exp_id", "==");
     134    PXOPT_COPY_STR(config->args, queryWhere, "-select_filter", "rawExp.filter", "==");
    134135
    135136    // Get list of exposures ready to magic

  • branches/czw_branch/20100427/ippTools/src/magictoolConfig.c

    r28017 r28042  
    5858    psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-exp_id", 0, "search exp_id", 0);
    5959    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-diff_label", 0, "select diff label", NULL);
     60    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_filter", 0, "select filter", NULL);
    6061    psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-available", 0, "process what's immediately available?", false);
    6162    psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-rerun", 0, "generate new run even if existing?", false);

  • branches/czw_branch/20100427/ippconfig

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • branches/czw_branch/20100427/ippconfig/gpc1/camera.config

    r28031 r28042  
    153153BURNTOOL.STATE.GOOD.UPDATE S16  13  # for upddate processing accept earlier version
    154154
    155 FOV                     F32     15000
     155FOV                     F32     15000   # Field of view of unvignetted region in FPA pixels.
    156156NPIX_INTERCHIP          S32     0

  • branches/czw_branch/20100427/ippconfig/simtest/camera.config

    r28017 r28042  
    7878
    7979PHOTCODE.RULE           STR     {DETECTOR}.{FILTER.ID}.{CHIP.NAME}      # Rule for generating photcode
    80 FOV                     F32     15000
    81 NPIX_INTERCHIP          S32     0

  • branches/czw_branch/20100427/ppImage/src/ppImageOptions.c

    r28017 r28042  
    110110    options->normClass       = NULL;    // per-class normalizations refer to this class
    111111
    112     // Mask stats options
    113     options->maskstat_static = 0;       // static masks
    114     options->maskstat_dynamic = 0;      // dynamic masks
    115     options->maskstat_magic = 0;        // magic masks
    116     options->maskstat_advisory = 0;     // advisory masks
    117 
    118112    return options;
    119113}

  • branches/czw_branch/20100427/ppSim

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • branches/czw_branch/20100427/ppSub/src/ppSubLoop.c

    r28017 r28042  
    146146    // Do Mask Stats
    147147    {
    148       printf("HEREHEREHERE\n");
    149148      pmFPAview *view = ppSubViewReadout(); // View to readout
    150149      if (!ppSubMaskStats(config, view,data->stats)) {

  • branches/czw_branch/20100427/psLib/src/imageops/psImageStats.c

    r27784 r28042  
    9797
    9898        psVectorMaskType *data = junkMask->data.PS_TYPE_VECTOR_MASK_DATA;
    99         psU8* imdata = junkData->data.U8;
    10099        for (int row = 0, nVect = 0; row < numRows; row++) {
    101100            for (int col = 0; col < numCols; col++, nVect++) {
    102101                data[nVect] = (mask->data.PS_TYPE_IMAGE_MASK_DATA[row][col] & maskVal);
    103                
    104                 if ((imdata[nVect] > 100000)||
    105                     (imdata[nVect] != imdata[nVect])||
    106                     (imdata[nVect] < -100000)) {
    107                   data[nVect] &= maskVal;
    108                 }
    109102            }
    110103        }

  • branches/czw_branch/20100427/psModules

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • branches/czw_branch/20100427/psphot

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • branches/czw_branch/20100427/pstamp/scripts/Makefile.am

    r28017 r28042  
    2323        detectability_respond.pl \
    2424        detect_query_read \
     25        detect_query_create \
    2526        detect_response_create \
    2627        dquery_finish.pl \

  • branches/czw_branch/20100427/pstamp/scripts/detect_query_create

    r28040 r28042  
    6161                    comment => 'site identifier (MPC observatory code)',
    6262                    value => undef
    63         }
     63        },
     64       { name =>  'STAGE',
     65                   writetype => TSTRING,
     66                   comment => 'processing stage to examine',
     67                   value => undef
     68       }
    6469];
    6570unless(defined($nostage)) {
Note: See TracChangeset for help on using the changeset viewer.