IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 37110


Ignore:
Timestamp:
Jul 24, 2014, 11:11:58 AM (12 years ago)
Author:
eugene
Message:

splitting stack det ID into stack primary and stack best references; fix issue with tess table

Location:
branches/eam_branches/ipp-20140717/Ohana/src/libdvo
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20140717/Ohana/src/libdvo/include/dvo.h

    r37101 r37110  
    128128  ID_MEAS_BLEND_MEAS     = 0x00000100,  // detection is within radius of multiple objects
    129129  ID_MEAS_BLEND_OBJ      = 0x00000200,  // multiple detections within radius of object
    130   ID_MEAS_UNDEF_3        = 0x00000400,  // unused
     130  ID_MEAS_WARP_USED      = 0x00000400,  // measurement used to find mean warp photometry
    131131  ID_MEAS_UNDEF_4        = 0x00000800,  // unused
    132132  ID_MEAS_BLEND_MEAS_X   = 0x00001000,  // detection is within radius of multiple objects across catalogs                   

  • branches/eam_branches/ipp-20140717/Ohana/src/libdvo/include/dvodb.h

    r37035 r37110  
    5454  MAG_OPTION_NPHOT, // Nused
    5555  MAG_OPTION_UC_DIST,
    56   MAG_OPTION_STACK_DET_ID,
    5756  MAG_OPTION_FLAGS,
    5857} dvoMagOptionType;
     58
     59//  MAG_OPTION_STACK_PRIMARY_OFF,
     60//  MAG_OPTION_STACK_BEST_OFF,
    5961
    6062typedef enum {

  • branches/eam_branches/ipp-20140717/Ohana/src/libdvo/src/TessellationTable.c

    r37101 r37110  
    560560    int yi = y / tess[myTess].tree->dY[zone][band];
    561561
    562     xi = MAX(MIN(xi, tess[myTess].NX_SUB - 1.0), 0);
    563     yi = MAX(MIN(yi, tess[myTess].NY_SUB - 1.0), 0);
     562    xi = MAX(MIN(xi, tess[myTess].tree->NX_SUB - 1.0), 0);
     563    yi = MAX(MIN(yi, tess[myTess].tree->NY_SUB - 1.0), 0);
    564564
    565565    int N = xi + tess[myTess].tree->NX_SUB * yi;

  • branches/eam_branches/ipp-20140717/Ohana/src/libdvo/src/dbExtractAverages.c

    r37093 r37110  
    306306          value.Flt = PhotUCdist (field->photcode, average, secfilt);
    307307          break;
    308         case MAG_OPTION_STACK_DET_ID:
    309           value.Int = PhotStackID (field->photcode, average, secfilt);
    310           break;
     308        // XX case MAG_OPTION_STACK_DET_ID:
     309        // XX   value.Int = PhotStackID (field->photcode, average, secfilt);
     310        // XX   break;
    311311        case MAG_OPTION_FLAGS: {
    312312          int Nsec = GetPhotcodeNsec (field->photcode->code);

  • branches/eam_branches/ipp-20140717/Ohana/src/libdvo/src/dbExtractMeasures.c

    r37035 r37110  
    248248        case MAG_OPTION_NPHOT:
    249249        case MAG_OPTION_UC_DIST:
    250         case MAG_OPTION_STACK_DET_ID:
    251250        case MAG_OPTION_FLAGS:
    252251        case MAG_OPTION_NONE:

  • branches/eam_branches/ipp-20140717/Ohana/src/libdvo/src/dbFields.c

    r37035 r37110  
    7878  if (!strcasecmp (string, "nphot"))        return (MAG_OPTION_NPHOT);
    7979  if (!strcasecmp (string, "uc_dist"))      return (MAG_OPTION_UC_DIST);
    80   if (!strcasecmp (string, "stack_det_id")) return (MAG_OPTION_STACK_DET_ID);
    8180  if (!strcasecmp (string, "flags"))        return (MAG_OPTION_FLAGS);
    8281
    … …  
    145144  if (!strcasecmp (string, "max"))         return (MAG_MAX);
    146145  if (!strcasecmp (string, "ucdist"))      return (MAG_UC_DIST);
    147   if (!strcasecmp (string, "stackDetectID")) return (MAG_STACK_DET_ID);
    148146  if (!strcasecmp (string, "fluxpsf"))     return (MAG_FLUX_PSF);
    149147  if (!strcasecmp (string, "fluxpsferr"))  return (MAG_FLUX_PSF_ERR);
    … …  
    296294
    297295  switch (field->magOption) {
    298     case MAG_OPTION_STACK_DET_ID:
    299296    case MAG_OPTION_NCODE:
    300297    case MAG_OPTION_NPHOT:

  • branches/eam_branches/ipp-20140717/Ohana/src/libdvo/src/dvo_catalog.c

    r37085 r37110  
    197197  secfilt->dFapStk     = NAN;
    198198
    199   secfilt->stackDetectID = 0;
     199  secfilt->stackPrmryOff = -1;
     200  secfilt->stackBestOff  = -1;
    200201
    201202  secfilt->MpsfWrp     = NAN;

  • branches/eam_branches/ipp-20140717/Ohana/src/libdvo/src/dvo_convert_PS1_V4.c

    r37035 r37110  
    251251    out[i].Mstdev        = in[i].Mstdev;     
    252252    out[i].ubercalDist   = in[i].ubercalDist;     
    253     out[i].stackDetectID = in[i].stackDetectID;     
     253    out[i].stackPrmryOff = in[i].stackPrmryOff;     
     254    out[i].stackBestOff  = in[i].stackBestOff;     
    254255 }
    255256  return (out);
    … …  
    281282    out[i].Mstdev        = in[i].Mstdev;     
    282283    out[i].ubercalDist   = in[i].ubercalDist;     
    283     out[i].stackDetectID = in[i].stackDetectID;
     284    out[i].stackPrmryOff = in[i].stackPrmryOff;     
     285    out[i].stackBestOff  = in[i].stackBestOff;     
    284286  }
    285287  return (out);

  • branches/eam_branches/ipp-20140717/Ohana/src/libdvo/src/dvo_convert_PS1_V5.c

    r37035 r37110  
    319319    out[i].dFapStk       = in[i].dFapStk;
    320320
    321     out[i].stackDetectID = in[i].stackDetectID;     
     321    out[i].stackPrmryOff = in[i].stackPrmryOff;     
     322    out[i].stackBestOff  = in[i].stackBestOff;     
    322323
    323324    out[i].MpsfWrp       = in[i].MpsfWrp;
    … …  
    387388    out[i].dFapStk       = in[i].dFapStk;
    388389
    389     out[i].stackDetectID = in[i].stackDetectID;     
     390    out[i].stackPrmryOff = in[i].stackPrmryOff;     
     391    out[i].stackBestOff  = in[i].stackBestOff;     
    390392
    391393    out[i].MpsfWrp       = in[i].MpsfWrp;

  • branches/eam_branches/ipp-20140717/Ohana/src/libdvo/src/dvo_photcode_ops.c

    r37093 r37110  
    863863}
    864864
    865 unsigned int PhotStackID (PhotCode *code, Average *average, SecFilt *secfilt) {
    866 
    867   int Ns;
    868   unsigned int ID;
    869 
    870   if (code == NULL) return 0;
    871 
    872   Ns = photcodes[0].hashNsec[code[0].code];
    873   ID = (Ns == -1) ? 0 : secfilt[Ns].stackDetectID;
    874   return (ID);
    875 }
     865// XX unsigned int PhotStackID (PhotCode *code, Average *average, SecFilt *secfilt) {
     866// XX
     867// XX   int Ns;
     868// XX   unsigned int ID;
     869// XX
     870// XX   if (code == NULL) return 0;
     871// XX
     872// XX   Ns = photcodes[0].hashNsec[code[0].code];
     873// XX   ID = (Ns == -1) ? 0 : secfilt[Ns].stackDetectID;
     874// XX   return (ID);
     875// XX }
    876876
    877877// Xm is now (2014.07.03) stored as the chisq except in dvo formats which use as short
Note: See TracChangeset for help on using the changeset viewer.