IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jun 27, 2018, 3:31:55 PM (8 years ago)
Author:
eugene
Message:

merge changes from trunk

Location:
branches/czw_branch/20170908
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/czw_branch/20170908

  • branches/czw_branch/20170908/ppTranslate/src/ppMops.h

    r40049 r40483  
    1111                     PM_SOURCE_MODE_CR_LIMIT | PM_SOURCE_MODE_SKY_FAILURE | PM_SOURCE_MODE_DEFECT) // Flags to exclude
    1212//#define SOURCE_MASK2 (PM_SOURCE_MODE2_DIFF_WITH_DOUBLE | PM_SOURCE_MODE2_ON_SPIKE | PM_SOURCE_MODE2_ON_STARCORE | PM_SOURCE_MODE2_ON_BURNTOOL | PM_SOURCE_MODE2_ON_CONVPOOR) // Flags2 to exclude
    13 
    14 #define SOURCE_MASK2 (PM_SOURCE_MODE2_DIFF_WITH_DOUBLE | PM_SOURCE_MODE2_ON_BURNTOOL | PM_SOURCE_MODE2_ON_STARCORE | \
    15                       PM_SOURCE_MODE2_ON_SPIKE)
     13#define SOURCE_MASK2 (PM_SOURCE_MODE2_ON_STARCORE) //Flags2 to exclude
    1614
    1715#define PS1_DV_FORMAT "PS1_DV%d"
    … …  
    6866  psString fpashutoutc;               // FPA shutoutc
    6967  psString fpashutcutc;               // FPA shutcutc
     68  psString refcat;                    // Reference catalog used
    7069} ppMopsDetections;
    7170

  • branches/czw_branch/20170908/ppTranslate/src/ppMopsGetSkyChipPsfVersion.c

    r34472 r40483  
    1717    psFree(headerSkyChip);
    1818    return 3;
     19  } else if (strcmp(version, "PS1_DV4") == 0) {
     20    psFree(headerSkyChip);
     21    return 4;
     22  } else if (strcmp(version, "PS1_DV5") == 0) {
     23    psFree(headerSkyChip);
     24    return 5;
    1925  }
    2026  psWarning("Unsupported EXTTYPE in SkyChip.psf table: [%s]", version);

  • branches/czw_branch/20170908/ppTranslate/src/ppMopsRead.c

    r40058 r40483  
    107107    det->fpashutoutc = psMemIncrRefCounter(psMetadataLookupStr(NULL, header, "FPA.SHUTOUTC"));
    108108    det->fpashutcutc = psMemIncrRefCounter(psMetadataLookupStr(NULL, header, "FPA.SHUTCUTC"));
     109    det->refcat = psMemIncrRefCounter(psMetadataLookupStr(NULL, header, "PSREFCAT"));
    109110    psFree(header);
    110111
    … …  
    242243
    243244    //MEH -- diff params, may need skyChipPsfVersion
    244     psVector *npos = psMetadataLookupVector(NULL, table, "DIFF_NPOS");
     245    // -- unclear for npos, remove for now
     246    //psVector *npos = psMetadataLookupVector(NULL, table, "DIFF_NPOS");
    245247    psVector *fpos = psMetadataLookupVector(NULL, table, "DIFF_FRATIO");
    246248    psVector *rbad = psMetadataLookupVector(NULL, table, "DIFF_NRATIO_BAD");
    … …  
    270272        }
    271273
    272         // add diff params to discard -- needs to be in config.. -- WSdiff only?
     274        // MEH -- add diff params to discard -- needs to be in config.. -- WSdiff only?
    273275        // -- needs to be finite to test but unclear if should reject (probably)
    274276        // -- using Napoli 2013 to start with
    … …  
    278280        // DIFF_NRATIO_MASK>0.4
    279281        // DIFF_NRATIO_ALL>0.3
    280         // -- unclear about npos still --
     282        // -- unclear about npos still -- so remove from check
    281283        //if (npos->data.S32[row]<=3 ||
    282284        if (!isfinite(fpos->data.F32[row]) || !isfinite(rbad->data.F32[row]) || !isfinite(rmask->data.F32[row]) || !isfinite(rall->data.F32[row])) {
    283            psTrace("ppMops.read", 10, "Discarding row %ld from input %d because of NAN diff params: 3, 0.6, 0.4, 0.4, 0.3: %d %g %f %f %f ", row, i, npos->data.S32[row],fpos->data.F32[row],rbad->data.F32[row],rmask->data.F32[row],rall->data.F32[row]);
     285           //psTrace("ppMops.read", 10, "Discarding row %ld from input %d because of NAN diff params: 3, 0.6, 0.4, 0.4, 0.3: %d %g %f %f %f ", row, i, npos->data.S32[row],fpos->data.F32[row],rbad->data.F32[row],rmask->data.F32[row],rall->data.F32[row]);
     286          psTrace("ppMops.read", 10, "Discarding row %ld from input %d because of NAN diff params: 3, 0.6, 0.4, 0.4, 0.3:  %g %f %f %f ", row, i, fpos->data.F32[row],rbad->data.F32[row],rmask->data.F32[row],rall->data.F32[row]);
    284287          det->mask->data.U8[row] = 0xFF;
    285288          continue;
    286289        }
    287290        if (fpos->data.F32[row]<=0.6 || rbad->data.F32[row]<=0.4 || rmask->data.F32[row]<=0.4 || rall->data.F32[row]<=0.3) {
    288           psTrace("ppMops.read", 10, "Discarding row %ld from input %d because of diff params: 3, 0.6, 0.4, 0.4, 0.3: %d %g %f %f %f ",
    289                   row, i, npos->data.S32[row], fpos->data.F32[row], rbad->data.F32[row], rmask->data.F32[row], rall->data.F32[row]);
     291          //psTrace("ppMops.read", 10, "Discarding row %ld from input %d because of diff params: 3, 0.6, 0.4, 0.4, 0.3: %d %g %f %f %f ", row, i, npos->data.S32[row], fpos->data.F32[row], rbad->data.F32[row], rmask->data.F32[row], rall->data.F32[row]);
     292          psTrace("ppMops.read", 10, "Discarding row %ld from input %d because of diff params: 3, 0.6, 0.4, 0.4, 0.3: %g %f %f %f ", row, i, fpos->data.F32[row], rbad->data.F32[row], rmask->data.F32[row], rall->data.F32[row]);
    290293          det->mask->data.U8[row] = 0xFF;
    291294          continue;

  • branches/czw_branch/20170908/ppTranslate/src/ppMopsWrite.c

    r38729 r40483  
    104104  psMetadataAddStr(header, PS_LIST_TAIL, "FPA.SHUTOUTC", 0, "Time of exposure open (CHIP mod)", det->fpashutoutc);
    105105  psMetadataAddStr(header, PS_LIST_TAIL, "FPA.SHUTCUTC", 0, "Time of exposure close (RAW)", det->fpashutcutc);
     106  psMetadataAddStr(header, PS_LIST_TAIL, "PSREFCAT", 0, "Reference catalog used", det->refcat);
    106107
    107108  //field in header that tells about the CMF version
Note: See TracChangeset for help on using the changeset viewer.