IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 37601


Ignore:
Timestamp:
Nov 14, 2014, 8:39:23 PM (12 years ago)
Author:
eugene
Message:

add X,Y and R,D offset fields to mextract; add galaxy model functions

Location:
branches/eam_branches/ipp-20140904/Ohana/src/libdvo
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20140904/Ohana/src/libdvo/Makefile

    r37451 r37601  
    4949$(SRC)/version.$(ARCH).o         \
    5050$(SRC)/coordops.$(ARCH).o        \
     51$(SRC)/galaxy_model.$(ARCH).o    \
    5152$(SRC)/dvosorts.$(ARCH).o        \
    5253$(SRC)/dvo_photcode_ops.$(ARCH).o \

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

    r37598 r37601  
    10381038int RegionHostFindNeighbors (RegionHostTable *table, int Nhost);
    10391039
     1040// galaxy_model:
     1041int TransformProperMotion_radians (double *uR, double *uD, double uL, double uB, double Rrad, double Drad, CoordTransform *transform);
     1042int TransformProperMotion (double *uR, double *uD, double uL, double uB, double R, double D, CoordTransform *transform);
     1043int SolarMotionModel_radians (double *uL_sol, double *uB_sol, double Lrad, double Brad, double distance);
     1044int SolarMotionModel (double *uL_sol, double *uB_sol, double L, double B, double distance);
     1045int GalaxyMotionModel_radians (double *uL_gal, double *uB_gal, double Lrad, double Brad);
     1046int GalaxyMotionModel (double *uL_gal, double *uB_gal, double L, double B);
     1047int InitGalaxyModel (char *version);
     1048
    10401049# define LENSFIELD(NAME) float LensValue_##NAME (PhotCode *code, Lensobj *lensobj);
    10411050

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

    r37563 r37601  
    173173      MEAS_XFIX,
    174174      MEAS_YFIX,
     175      MEAS_XOFF_KH,
     176      MEAS_YOFF_KH,
     177      MEAS_XOFF_DCR,
     178      MEAS_YOFF_DCR,
     179      MEAS_ROFF_GAL,
     180      MEAS_DOFF_GAL,
    175181      MEAS_POS_SYS_ERR,
    176182      MEAS_XFIELD,

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

    r37563 r37601  
    557557# endif
    558558      break;
    559     case MEAS_XFIX: /* OK */
    560       value.Flt = measure[0].Xfix;
    561       break;
    562     case MEAS_YFIX: /* OK */
    563       value.Flt = measure[0].Yfix;
    564       break;
    565     case MEAS_XCCD_ERR: /* OK */
    566       value.Flt = FromShortPixels(measure[0].dXccd);
    567       break;
    568     case MEAS_YCCD_ERR: /* OK */
    569       value.Flt = FromShortPixels(measure[0].dYccd);
    570       break;
    571     case MEAS_POS_SYS_ERR: /* OK */
    572       value.Flt = FromShortPixels(measure[0].dRsys);
    573       break;
     559    case MEAS_XFIX: { value.Flt = measure[0].Xfix; break; }
     560    case MEAS_YFIX: { value.Flt = measure[0].Yfix; break; }
     561    case MEAS_XCCD_ERR: { value.Flt = FromShortPixels(measure[0].dXccd); break; }
     562    case MEAS_YCCD_ERR: { value.Flt = FromShortPixels(measure[0].dYccd); break; }
     563    case MEAS_POS_SYS_ERR: { value.Flt = FromShortPixels(measure[0].dRsys); }
     564
     565    case MEAS_XOFF_KH:  { value.Flt = measure[0].XoffKH;  break; }
     566    case MEAS_YOFF_KH:  { value.Flt = measure[0].YoffKH;  break; }
     567    case MEAS_XOFF_DCR: { value.Flt = measure[0].XoffDCR; break; }
     568    case MEAS_YOFF_DCR: { value.Flt = measure[0].YoffDCR; break; }
     569    case MEAS_ROFF_GAL: { value.Flt = measure[0].RoffGAL; break; }
     570    case MEAS_DOFF_GAL: { value.Flt = measure[0].DoffGAL; break; }
    574571
    575572    case MEAS_XFIELD: /* offset relative to exposure center in ra,dec space */

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

    r37563 r37601  
    474474  if (!strcasecmp (fieldName, "XFIX"))           ESCAPE (MEAS_XFIX,           OPIHI_FLT);
    475475  if (!strcasecmp (fieldName, "YFIX"))           ESCAPE (MEAS_YFIX,           OPIHI_FLT);
     476  if (!strcasecmp (fieldName, "XOFF_KH"))        ESCAPE (MEAS_XOFF_KH,        OPIHI_FLT);
     477  if (!strcasecmp (fieldName, "YOFF_KH"))        ESCAPE (MEAS_YOFF_KH,        OPIHI_FLT);
     478  if (!strcasecmp (fieldName, "XOFF_DCR"))       ESCAPE (MEAS_XOFF_DCR,       OPIHI_FLT);
     479  if (!strcasecmp (fieldName, "YOFF_DCR"))       ESCAPE (MEAS_YOFF_DCR,       OPIHI_FLT);
     480  if (!strcasecmp (fieldName, "ROFF_GAL"))       ESCAPE (MEAS_ROFF_GAL,       OPIHI_FLT);
     481  if (!strcasecmp (fieldName, "DOFF_GAL"))       ESCAPE (MEAS_DOFF_GAL,       OPIHI_FLT);
    476482  if (!strcasecmp (fieldName, "POS_SYS_ERR"))    ESCAPE (MEAS_POS_SYS_ERR,    OPIHI_FLT);
    477483  if (!strcasecmp (fieldName, "XFIELD"))         ESCAPE (MEAS_XFIELD,         OPIHI_FLT);

  • branches/eam_branches/ipp-20140904/Ohana/src/libdvo/src/dvo_tiny_values.c

    r37035 r37601  
    2020  measureT[0].dM         = measure[0].dM;
    2121  measureT[0].airmass    = measure[0].airmass;
     22  measureT[0].RoffGAL    = measure[0].RoffGAL;
     23  measureT[0].DoffGAL    = measure[0].DoffGAL;
    2224  measureT[0].Xccd       = measure[0].Xccd;
    2325  measureT[0].Yccd       = measure[0].Yccd;
Note: See TracChangeset for help on using the changeset viewer.