IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 34871


Ignore:
Timestamp:
Dec 22, 2012, 2:11:21 PM (14 years ago)
Author:
eugene
Message:

setastrom basically works; changes Xoff,Yoff to Xraw,Yraw

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

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20121219/Ohana/src/libautocode/def/measure-ps1-v4.d

    r34749 r34871  
    3030FIELD Yccd,           Y_CCD,        float,          Y coord on chip,               pixels
    3131
    32 FIELD Xoff,           X_OFF,        float,          X correction in chip coords,   pixels
    33 FIELD Yoff,           Y_OFF,        float,          Y correction in chip coords,   pixels
     32FIELD Xraw,           X_RAW,        float,          X coord before correction,     pixels
     33FIELD Yraw,           Y_RAW,        float,          Y coord before correction,     pixels
    3434
    3535# could these be packed into fewer bits?

  • branches/eam_branches/ipp-20121219/Ohana/src/libautocode/def/measure.d

    r34749 r34871  
    3030FIELD Yccd,           Y_CCD,        float,          Y coord on chip,                pixels
    3131
    32 FIELD Xoff,           X_OFF,        float,          X correction in chip coords,   pixels
    33 FIELD Yoff,           Y_OFF,        float,          Y correction in chip coords,   pixels
     32FIELD Xraw,           X_RAW,        float,          X coord before correction,     pixels
     33FIELD Yraw,           Y_RAW,        float,          Y coord before correction,     pixels
    3434
    3535# could these be packed into fewer bits?

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

    r34749 r34871  
    122122      MEAS_XCCD_ERR,
    123123      MEAS_YCCD_ERR,
    124       MEAS_XOFF,
    125       MEAS_YOFF,
     124      MEAS_XRAW,
     125      MEAS_YRAW,
    126126      MEAS_POS_SYS_ERR,
    127127      MEAS_XMOSAIC,

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

    r34749 r34871  
    443443# endif
    444444      break;
    445     case MEAS_XOFF: /* OK */
    446       value.Flt = measure[0].Xoff;
    447       break;
    448     case MEAS_YOFF: /* OK */
    449       value.Flt = measure[0].Yoff;
     445    case MEAS_XRAW: /* OK */
     446      value.Flt = measure[0].Xraw;
     447      break;
     448    case MEAS_YRAW: /* OK */
     449      value.Flt = measure[0].Yraw;
    450450      break;
    451451    case MEAS_XCCD_ERR: /* OK */

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

    r34749 r34871  
    217217  if (!strcasecmp (fieldName, "XCCD:ERR"))       ESCAPE (MEAS_XCCD_ERR,       MAG_NONE, OPIHI_FLT);
    218218  if (!strcasecmp (fieldName, "YCCD:ERR"))       ESCAPE (MEAS_YCCD_ERR,       MAG_NONE, OPIHI_FLT);
    219   if (!strcasecmp (fieldName, "XOFF"))           ESCAPE (MEAS_XOFF,           MAG_NONE, OPIHI_FLT);
    220   if (!strcasecmp (fieldName, "YOFF"))           ESCAPE (MEAS_YOFF,           MAG_NONE, OPIHI_FLT);
     219  if (!strcasecmp (fieldName, "XRAW"))           ESCAPE (MEAS_XRAW,           MAG_NONE, OPIHI_FLT);
     220  if (!strcasecmp (fieldName, "YRAW"))           ESCAPE (MEAS_YRAW,           MAG_NONE, OPIHI_FLT);
    221221  if (!strcasecmp (fieldName, "POS_SYS_ERR"))    ESCAPE (MEAS_POS_SYS_ERR,    MAG_NONE, OPIHI_FLT);
    222222  if (!strcasecmp (fieldName, "XMOSAIC"))        ESCAPE (MEAS_XMOSAIC,        MAG_NONE, OPIHI_FLT);

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

    r34749 r34871  
    161161 measure->Xccd      = NAN;
    162162 measure->Yccd      = NAN;
    163  measure->Xoff      = 0.0;
    164  measure->Yoff      = 0.0;
     163 measure->Xraw      = NAN;
     164 measure->Yraw      = NAN;
    165165
    166166 measure->Sky       = NAN;

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

    r34749 r34871  
    3131    out[i].Xccd       = in[i].Xccd;
    3232    out[i].Yccd       = in[i].Yccd;
    33     out[i].Xoff       = in[i].Xoff;
    34     out[i].Yoff       = in[i].Yoff;
     33    out[i].Xraw       = in[i].Xraw;
     34    out[i].Yraw       = in[i].Yraw;
    3535    out[i].Sky        = in[i].Sky;
    3636    out[i].dSky       = in[i].dSky;
    … …  
    9494    out[i].Xccd       = in[i].Xccd;
    9595    out[i].Yccd       = in[i].Yccd;
     96    out[i].Xraw       = in[i].Xraw;
     97    out[i].Yraw       = in[i].Yraw;
    9698    out[i].Sky        = in[i].Sky;
    9799    out[i].dSky       = in[i].dSky;

  • branches/eam_branches/ipp-20121219/Ohana/src/uniphot/Makefile

    r34868 r34871  
    2626setastrom_client: $(BIN)/setastrom_client.$(ARCH)
    2727
    28 install: $(DESTBIN)/uniphot $(DESTBIN)/setfwhm $(DESTBIN)/setphot $(DESTBIN)/setphot_client $(DESTBIN)/setposangle $(DESTBIN)/setposangle_client
     28install: $(DESTBIN)/uniphot $(DESTBIN)/setfwhm $(DESTBIN)/setphot $(DESTBIN)/setphot_client $(DESTBIN)/setposangle $(DESTBIN)/setposangle_client $(DESTBIN)/setastrom $(DESTBIN)/setastrom_client
    2929
    3030UNIPHOT = \

  • branches/eam_branches/ipp-20121219/Ohana/src/uniphot/src/astrom_correction.c

    r34868 r34871  
    9595
    9696    int sub = -1;
    97     if (extname[6] == '0') {
     97    if (extname[9] == '0') {
    9898      sub = 0;
    9999    }
    100     if (extname[6] == '1') {
     100    if (extname[9] == '1') {
    101101      sub = 1;
    102102    }
    … …  
    130130  *dX = 0.0;
    131131  *dY = 0.0;
     132
     133  // XXX need to include some limits on Minst?
    132134
    133135  spline = splineset[sub][0][chip];

  • branches/eam_branches/ipp-20121219/Ohana/src/uniphot/src/update_catalog_setastrom.c

    r34868 r34871  
    1010
    1111  time_t timeRef = ohana_date_to_sec("2011/05/11,00:00:00");
     12
     13  found = 0;
    1214
    1315  for (i = 0; i < catalog[0].Nmeasure; i++) {
Note: See TracChangeset for help on using the changeset viewer.