IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 38467


Ignore:
Timestamp:
Jun 12, 2015, 10:29:47 PM (11 years ago)
Author:
eugene
Message:

merge changes from EAM branch ipp-20150419

Location:
trunk/Ohana/src/addstar
Files:
1 deleted
23 edited
7 copied

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/addstar/Makefile

    r37807 r38467  
    2929loadICRF_client : $(BIN)/loadICRF_client.$(ARCH)
    3030loadwise     : $(BIN)/loadwise.$(ARCH)
     31loadtycho    : $(BIN)/loadtycho.$(ARCH)
    3132dumpskycells : $(BIN)/dumpskycells.$(ARCH)
    3233findskycell  : $(BIN)/findskycell.$(ARCH)
    … …  
    3536mkcmf        : $(BIN)/mkcmf.$(ARCH)
    3637
    37 all: addstar addstar_client sedstar load2mass loadstarpar loadstarpar_client loadICRF loadICRF_client skycells mkcmf loadwise loadsupercos dumpskycells findskycell
    38 
    39 INSTALL = addstar addstar_client sedstar load2mass loadstarpar loadstarpar_client loadICRF loadICRF_client skycells mkcmf loadwise loadsupercos dumpskycells findskycell
     38all: addstar addstar_client sedstar load2mass loadstarpar loadstarpar_client loadICRF loadICRF_client skycells mkcmf loadwise loadtycho loadsupercos dumpskycells findskycell
     39
     40INSTALL = addstar addstar_client sedstar load2mass loadstarpar loadstarpar_client loadICRF loadICRF_client skycells mkcmf loadwise loadtycho loadsupercos dumpskycells findskycell
    4041
    4142# I need to fix the client/server version of addstar now that I have dropped Stars
    … …  
    4950$(SRC)/SkyListForStars.$(ARCH).o \
    5051$(SRC)/SkyRegionUtils.$(ARCH).o \
    51 $(SRC)/SkyTableFromTychoIndex.$(ARCH).o \
    5252$(SRC)/addstar.$(ARCH).o \
    5353$(SRC)/addstar_create_ID.$(ARCH).o \
    … …  
    6565$(SRC)/find_subset.$(ARCH).o \
    6666$(SRC)/getgsc.$(ARCH).o \
    67 $(SRC)/gettycho.$(ARCH).o \
    6867$(SRC)/getusno.$(ARCH).o \
    6968$(SRC)/getusnob.$(ARCH).o \
    … …  
    7675$(SRC)/LoadData.$(ARCH).o \
    7776$(SRC)/LoadDataSDSS.$(ARCH).o \
     77$(SRC)/LoadDataUKIRT.$(ARCH).o \
    7878$(SRC)/LoadDataPMM.$(ARCH).o \
    7979$(SRC)/in_image.$(ARCH).o \
    … …  
    9090$(SRC)/ReadStarsTEXT.$(ARCH).o \
    9191$(SRC)/ReadStarsSDSS.$(ARCH).o \
     92$(SRC)/ReadStarsUKIRT.$(ARCH).o \
    9293$(SRC)/ReadXradFITS.$(ARCH).o \
    9394$(SRC)/FilterStars.$(ARCH).o \
    … …  
    125126$(SRC)/SkyListForStars.$(ARCH).o \
    126127$(SRC)/SkyRegionUtils.$(ARCH).o \
    127 $(SRC)/SkyTableFromTychoIndex.$(ARCH).o \
    128128$(SRC)/SocketOps.$(ARCH).o \
    129129$(SRC)/UpdateDatabase_Image.$(ARCH).o \
    … …  
    141141$(SRC)/find_subset.$(ARCH).o \
    142142$(SRC)/getgsc.$(ARCH).o \
    143 $(SRC)/gettycho.$(ARCH).o \
    144143$(SRC)/getusno.$(ARCH).o \
    145144$(SRC)/getusnob.$(ARCH).o \
    … …  
    174173$(SRC)/getusno.$(ARCH).o \
    175174$(SRC)/getusnob.$(ARCH).o \
    176 $(SRC)/gettycho.$(ARCH).o \
    177175$(SRC)/greference.$(ARCH).o \
    178176$(SRC)/in_image.$(ARCH).o \
    … …  
    186184$(SRC)/edge_check.$(ARCH).o \
    187185$(SRC)/opening_angle.$(ARCH).o \
    188 $(SRC)/SkyTableFromTychoIndex.$(ARCH).o \
    189186$(SRC)/ListenClients_Thread.$(ARCH).o \
    190187$(SRC)/NewImage_Thread.$(ARCH).o \
    … …  
    204201$(SRC)/LoadData.$(ARCH).o \
    205202$(SRC)/LoadDataSDSS.$(ARCH).o \
     203$(SRC)/LoadDataUKIRT.$(ARCH).o \
    206204$(SRC)/LoadDataPMM.$(ARCH).o \
    207205$(SRC)/grefstars.$(ARCH).o \
    … …  
    213211$(SRC)/ReadStarsTEXT.$(ARCH).o \
    214212$(SRC)/ReadStarsSDSS.$(ARCH).o \
     213$(SRC)/ReadStarsUKIRT.$(ARCH).o \
    215214$(SRC)/ImageIndex.$(ARCH).o \
    216215$(SRC)/UpdateImageIDs.$(ARCH).o \
    … …  
    323322$(SRC)/StarOps.$(ARCH).o \
    324323$(SRC)/find_matches_refstars.$(ARCH).o \
     324$(SRC)/build_links.$(ARCH).o \
     325$(SRC)/replace_match.$(ARCH).o \
     326$(SRC)/SetSignals.$(ARCH).o \
     327$(SRC)/update_coords.$(ARCH).o \
     328$(SRC)/SkyRegionUtils.$(ARCH).o \
     329$(SRC)/psps_ids.$(ARCH).o
     330
     331LOAD-TYCHO = \
     332$(SRC)/loadtycho.$(ARCH).o \
     333$(SRC)/loadtycho_rawdata.$(ARCH).o \
     334$(SRC)/loadtycho_ops.$(ARCH).o \
     335$(SRC)/args_loadtycho.$(ARCH).o \
     336$(SRC)/ConfigInit.$(ARCH).o \
     337$(SRC)/Shutdown.$(ARCH).o \
     338$(SRC)/find_matches_closest_refstars.$(ARCH).o \
    325339$(SRC)/build_links.$(ARCH).o \
    326340$(SRC)/replace_match.$(ARCH).o \
    … …  
    406420$(BIN)/load2mass.$(ARCH)      : $(LOAD-2MASS)
    407421$(BIN)/loadwise.$(ARCH)       : $(LOAD-WISE)
     422$(BIN)/loadtycho.$(ARCH)      : $(LOAD-TYCHO)
    408423$(BIN)/loadstarpar.$(ARCH)    : $(LOAD-STARPAR)
    409424$(BIN)/loadstarpar_client.$(ARCH) : $(LOAD-STARPAR-CLIENT)

  • trunk/Ohana/src/addstar/include/addstar.h

    r38441 r38467  
    7777
    7878enum {ADDSTAR_MODE_NONE, ADDSTAR_MODE_IMAGE, ADDSTAR_MODE_REFLIST, ADDSTAR_MODE_REFCAT, ADDSTAR_MODE_FAKEIMAGE, ADDSTAR_MODE_RESORT, ADDSTAR_MODE_CREATE_ID};
    79 enum {NONE, SIMPLE_CMP, SIMPLE_CMF, SIMPLE_MEF, MOSAIC_CMP, MOSAIC_CMF, MOSAIC_MEF, MOSAIC_PHU, SDSS_OBJ};
     79enum {NONE, SIMPLE_CMP, SIMPLE_CMF, SIMPLE_MEF, MOSAIC_CMP, MOSAIC_CMF, MOSAIC_MEF, MOSAIC_PHU, SDSS_OBJ, UKIRT_OBJ};
    8080/* note: MEF implies CMF */
    8181
    … …  
    221221Stars     *greference             PROTO((char *Refcat, SkyRegion *catstats, int photcode, unsigned int *nstars));
    222222Stars     *getgsc                 PROTO((SkyRegion *patch, unsigned int *NSTARS));
    223 Stars     *gettycho               PROTO((SkyRegion *catstats, int photcode, unsigned int *Nstars));
    224223Stars     *getusno                PROTO((SkyRegion *catstats, int photcode, unsigned int *Nstars));
    225224Stars     *getusnob               PROTO((SkyRegion *catstats, int photcode, unsigned int *Nstars));
    … …  
    332331
    333332
     333Stars *ReadStarsUKIRT (FILE *f, char *name, Header *header, Image *images, off_t *nimages, unsigned int *nstars);
     334int LoadDataUKIRT (FILE *f, char *file, Image **images, off_t *nimages, Stars **stars, unsigned int *Nstars, Header **headers, off_t *extsize, HeaderSet *headerSets, off_t NheaderSets);
     335
    334336/**
    335337    there is an inconsistency to be resolved: fixed structures (like Image)

  • trunk/Ohana/src/addstar/src/FilterStars.c

    r38153 r38467  
    4343    XY_to_RD (&stars[N].average.R, &stars[N].average.D, stars[N].measure.Xccd, stars[N].measure.Yccd, &image[0].coords);
    4444    stars[N].average.R = ohana_normalize_angle (stars[N].average.R);
     45    stars[N].measure.R = stars[N].average.R;
     46    stars[N].measure.D = stars[N].average.D;
    4547
    4648    stars[N].measure.photcode = image[0].photcode;

  • trunk/Ohana/src/addstar/src/GetFileMode.c

    r37054 r38467  
    2424    if (VERBOSE) fprintf (stderr, "found SDSS objects\n");
    2525    return SDSS_OBJ;
     26  }
     27
     28   
     29  // UKIRT files have TELESCOP = UKIRT and INSTRUME = WFCAM:
     30  char telescope[81], instrument[81];
     31  int have_TELESCOPE  = gfits_scan (header, "TELESCOP", "%s", 1, telescope);
     32  int have_INSTRUMENT = gfits_scan (header, "INSTRUME", "%s", 1, instrument);
     33  if (have_TELESCOPE && have_INSTRUMENT && !strcmp(telescope, "UKIRT") && !strcmp(instrument, "WFCAM")) {
     34    if (VERBOSE) fprintf (stderr, "found UKIRT data\n");
     35    return UKIRT_OBJ;
    2636  }
    2737

  • trunk/Ohana/src/addstar/src/LoadHeaders.c

    r27435 r38467  
    2424    if (i == 0) {
    2525      *mode = GetFileMode (headers[0]);
     26      // CMP mode has no binary table, just image header and text blocks
    2627      if ((*mode == SIMPLE_CMP) || (*mode == MOSAIC_CMP)) {
    2728        *Nheaders = i;

  • trunk/Ohana/src/addstar/src/LoadStars.c

    r37807 r38467  
    100100    }
    101101
     102    // if these are SDSS data, load with SDSS-specific wrapper
     103    if (headerSets[0].exttype && !strcmp (headerSets[0].exttype, "UKIRT_OBJ")) {
     104      LoadDataUKIRT (f, file[i], images, Nimages, &stars, Nstars, headers, extsize, headerSets, NheaderSets);
     105      continue;
     106    }
     107
    102108    LoadData (f, file[i], images, Nimages, &stars, Nstars, headers, extsize, headerSets, NheaderSets, options);
    103109

  • trunk/Ohana/src/addstar/src/MatchHeaders.c

    r37967 r38467  
    1818  mode = GetFileMode (headers[0]);
    1919
     20  // mosaic mef can be identified from the PHU
    2021  if (mode == MOSAIC_MEF) {
    2122    headerSets[Nimage].exthead     = strcreate ("PHU");
    … …  
    2627  }
    2728
     29  // sdss obj can be identified from the PHU
    2830  if (mode == SDSS_OBJ) {
    2931    // XXX these should have two headers (phu + table)
    … …  
    3840    return headerSets;
    3941  }
     42
     43  // check for ukirt mode
     44  // check if headers[1] is UKIRT_OBJ (and all others)
     45  if (Nheaders > 1) {
     46    int myMode = GetFileMode (headers[1]);
     47    if (myMode != UKIRT_OBJ) goto other_modes;
     48    for (i = 2; i < Nheaders; i++) {
     49      myMode = GetFileMode (headers[i]);
     50      if (myMode != UKIRT_OBJ) {
     51        fprintf (stderr, "inconsistent headers for UKIRT\n");
     52        exit (2);
     53      }
     54    }
     55
     56    // the 0th entry is an empty PHU
     57    extsize[0][0] = headers[0][0].datasize + gfits_data_size (headers[0]);
     58
     59    for (i = 1; i < Nheaders; i++) {
     60      extsize[0][i] = headers[i][0].datasize + gfits_data_size (headers[i]);
     61
     62      gfits_scan (headers[i], ExtnameKeyword, "%s", 1, extname);
     63      headerSets[Nimage].exttype = strcreate ("UKIRT_OBJ");
     64      headerSets[Nimage].extdata = strcreate (extname);
     65      headerSets[Nimage].exthead = strcreate (extname);
     66      headerSets[Nimage].extxrad = NULL;
     67      headerSets[Nimage].extnum_data = i;
     68      headerSets[Nimage].extnum_head = i;
     69      headerSets[Nimage].extnum_xrad = -1;
     70      Nimage ++;
     71    }
     72    *nimage = Nimage;
     73    return headerSets;
     74  }
     75
     76other_modes:
    4077
    4178  // now examine the headers, count the table entries, find corresponding headers
    … …  
    71108    if (!strcmp (exttype, "PS1_DV4")) goto keep;
    72109    if (!strcmp (exttype, "PS1_DV5")) goto keep;
     110
    73111    continue;
    74112

  • trunk/Ohana/src/addstar/src/ReadStarsSDSS.c

    r37807 r38467  
    155155      stars[N].average.dD        = NAN;
    156156
     157      stars[N].measure.R         = stars[N].average.R;
     158      stars[N].measure.D         = stars[N].average.D;
    157159      stars[N].measure.Xccd      = colc[N];
    158160      stars[N].measure.Yccd      = rowc[N];

  • trunk/Ohana/src/addstar/src/SEDfit.c

    r38441 r38467  
    152152
    153153    for (j = 0; j < Nsec; j++) {
    154       dvo_secfilt_init (&outcat[0].secfilt[Nave*Nsec+j]);
     154      dvo_secfilt_init (&outcat[0].secfilt[Nave*Nsec+j], SECFILT_RESET_ALL);
    155155    }
    156156

  • trunk/Ohana/src/addstar/src/UpdateImageIDs.c

    r38441 r38467  
    2020    dvo_image_create (&db, GetZeroPoint());
    2121    ImageIndexFileInit ();
    22   isEmpty = TRUE;
     22    isEmpty = TRUE;
    2323  } else {
    2424    /* position to start of file */

  • trunk/Ohana/src/addstar/src/find_matches.c

    r38441 r38467  
    154154
    155155      // the following measure elements cannot be set until here:
    156       catalog[0].measure[Nmeas].R        = stars[N].average.R;
    157       catalog[0].measure[Nmeas].D        = stars[N].average.D;
    158156      catalog[0].measure[Nmeas].dbFlags  = 0;
    159157      catalog[0].measure[Nmeas].averef   = n; // this must be an absolute sequence number, if partial average is loaded
    … …  
    266264
    267265    for (j = 0; j < Nsecfilt; j++) {
    268       dvo_secfilt_init (&catalog[0].secfilt[Nave*Nsecfilt+j]);
     266      dvo_secfilt_init (&catalog[0].secfilt[Nave*Nsecfilt+j], SECFILT_RESET_ALL);
    269267    }
    270268
    … …  
    274272
    275273      // the following measure elements cannot be set until here:
    276       catalog[0].measure[Nmeas].R               = stars[i].average.R;
    277       catalog[0].measure[Nmeas].D               = stars[i].average.D;
    278       catalog[0].measure[Nmeas].dbFlags         = 0;
    279       catalog[0].measure[Nmeas].averef          = Nave; // XXX EAM : must be absolute Nave if partial read
     274      catalog[0].measure[Nmeas].dbFlags   = 0;
     275      catalog[0].measure[Nmeas].averef    = Nave; // XXX EAM : must be absolute Nave if partial read
    280276      catalog[0].measure[Nmeas].objID     = catalog[0].average[Nave].objID;
    281277      catalog[0].measure[Nmeas].catID     = catalog[0].catID;

  • trunk/Ohana/src/addstar/src/find_matches_closest.c

    r38441 r38467  
    189189
    190190    // measure now carries R,D (not dR,dD)
    191     // note that ReadStarsFITS does not set measure.R,D and average.R,D
    192     catalog[0].measure[Nmeas].R        = stars[N].average.R;
    193     catalog[0].measure[Nmeas].D        = stars[N].average.D;
    194191    catalog[0].measure[Nmeas].dbFlags  = 0;
    195192    catalog[0].measure[Nmeas].averef   = n;
    … …  
    300297
    301298    for (j = 0; j < Nsecfilt; j++) {
    302       dvo_secfilt_init (&catalog[0].secfilt[Nave*Nsecfilt+j]);
     299      dvo_secfilt_init (&catalog[0].secfilt[Nave*Nsecfilt+j], SECFILT_RESET_ALL);
    303300    }
    304301
    … …  
    309306
    310307      // the following measure elements cannot be set until here:
    311       catalog[0].measure[Nmeas].R        = stars[i].average.R;
    312       catalog[0].measure[Nmeas].D        = stars[i].average.D;
    313308      catalog[0].measure[Nmeas].dbFlags  = 0;
    314309      catalog[0].measure[Nmeas].averef   = Nave;

  • trunk/Ohana/src/addstar/src/find_matches_closest_refstars.c

    r38441 r38467  
    11# include "addstar.h"
     2
     3/* differences with find_matches_closest():
     4 * accepts Stars **stars (vs Stars *stars)
     5 * NREFSTAR_GROUP vs NSTAR_GROUP
     6 * does not update lensing fields
     7 * allows option to replace existing entries
     8 * allows multiple photcodes
     9
     10 */
    211
    312int find_matches_closest_refstars (SkyRegion *region, Stars **stars, unsigned int NstarsIn, Catalog *catalog, AddstarClientOptions options) {
    … …  
    1322  int Nsecfilt;
    1423
    15   if ((NREFSTAR_GROUP != 1) && (NREFSTAR_GROUP != 3)) {
    16     fprintf (stderr, "ERROR: NREFSTAR_GROUP NOT SET!\n");
    17     exit (1);
     24  switch (NREFSTAR_GROUP) {
     25    case 1:
     26    case 3:
     27    case 4:
     28    case 6:
     29      break;
     30    default:
     31      fprintf (stderr, "ERROR: NREFSTAR_GROUP NOT SET!\n");
     32      exit (1);
    1833  }
    1934
    … …  
    123138      j++;
    124139      continue;
     140    }
     141
     142    if (stars[N1[i]][0].found != -1) {
     143        /* this star has already been assigned to an object in this or another catalog */
     144        i++;
     145        continue;
    125146    }
    126147
    … …  
    173194    catalog[0].measure[Nmeas]          = stars[N][0].measure;
    174195
    175     /** *** dR,dD now in arcsec *** **/
    176     catalog[0].measure[Nmeas].R        = stars[N][0].average.R;
    177     catalog[0].measure[Nmeas].D        = stars[N][0].average.D;
    178196    catalog[0].measure[Nmeas].dbFlags  = 0;
    179197    catalog[0].measure[Nmeas].averef   = n;
    … …  
    201219    // we can choose to accept the proper-motion and parallax from the reference catalog
    202220    if (ACCEPT_MOTION) {
     221      catalog[0].average[n].dR         = stars[N][0].average.dR;
     222      catalog[0].average[n].dD         = stars[N][0].average.dD;
    203223      catalog[0].average[n].uR         = stars[N][0].average.uR;
    204224      catalog[0].average[n].uD         = stars[N][0].average.uD;
    … …  
    207227      catalog[0].average[n].P          = stars[N][0].average.P;
    208228      catalog[0].average[n].dP         = stars[N][0].average.dP;
     229      catalog[0].average[n].Tmean      = stars[N][0].average.Tmean;
    209230    }
    210231
    … …  
    273294      catalog[0].average[Nave].P           = stars[N][0].average.P;
    274295      catalog[0].average[Nave].dP          = stars[N][0].average.dP;
     296      catalog[0].average[Nave].Tmean       = stars[N][0].average.Tmean;
    275297    }
    276298
    … …  
    278300
    279301    for (j = 0; j < Nsecfilt; j++) {
    280       dvo_secfilt_init (&catalog[0].secfilt[Nave*Nsecfilt+j]);
     302      dvo_secfilt_init (&catalog[0].secfilt[Nave*Nsecfilt+j], SECFILT_RESET_ALL);
    281303    }
    282304
    … …  
    285307
    286308      catalog[0].measure[Nmeas]          = stars[N][0].measure;
    287 
    288       catalog[0].measure[Nmeas].R       = catalog[0].average[Nave].R;
    289       catalog[0].measure[Nmeas].D       = catalog[0].average[Nave].D;
    290309      catalog[0].measure[Nmeas].dbFlags  = 0;
    291310      catalog[0].measure[Nmeas].averef   = Nave;
    … …  
    311330  // XXX allow for unsorted output?
    312331  catalog[0].measure = sort_measure (catalog[0].average, Nave, catalog[0].measure, Nmeas, next_meas);
     332  catalog[0].sorted = TRUE;
    313333
    314334  /* note stars which have been found in this catalog */

  • trunk/Ohana/src/addstar/src/find_matches_refstars.c

    r38441 r38467  
    138138
    139139      /** measure now stores R,D **/
    140       catalog[0].measure[Nmeas].R        = stars[N][0].average.R;
    141       catalog[0].measure[Nmeas].D        = stars[N][0].average.D;
    142140      catalog[0].measure[Nmeas].dbFlags  = 0;
    143141      catalog[0].measure[Nmeas].averef   = n;
    … …  
    252250
    253251    for (j = 0; j < Nsecfilt; j++) {
    254       dvo_secfilt_init (&catalog[0].secfilt[Nave*Nsecfilt+j]);
     252      dvo_secfilt_init (&catalog[0].secfilt[Nave*Nsecfilt+j], SECFILT_RESET_ALL);
    255253    }
    256254
    … …  
    259257
    260258      catalog[0].measure[Nmeas]          = stars[N][0].measure;
    261 
    262       catalog[0].measure[Nmeas].R        = stars[N][0].average.R;
    263       catalog[0].measure[Nmeas].D        = stars[N][0].average.D;
    264259
    265260      catalog[0].measure[Nmeas].t        = (stars[N][0].measure.t == 0) ? TIMEREF : stars[N][0].measure.t;      /** careful : time_t vs e_time **/

  • trunk/Ohana/src/addstar/src/find_matches_starpar.c

    r38441 r38467  
    182182
    183183    for (j = 0; j < Nsecfilt; j++) {
    184       dvo_secfilt_init (&catalog[0].secfilt[Nave*Nsecfilt+j]);
     184      dvo_secfilt_init (&catalog[0].secfilt[Nave*Nsecfilt+j], SECFILT_RESET_ALL);
    185185    }
    186186

  • trunk/Ohana/src/addstar/src/getgsc.c

    r27435 r38467  
    7979      if (stars[Nstars].average.D > UserPatch.Dmax) continue;
    8080
     81      stars[Nstars].measure.R = stars[Nstars].average.R;
     82      stars[Nstars].measure.D = stars[Nstars].average.D;
     83
    8184      fparse (&stars[Nstars].measure.M, 3, &buffer[Nbyte]);
    8285      stars[Nstars].measure.dM        = NAN;

  • trunk/Ohana/src/addstar/src/getusno.c

    r27435 r38467  
    114114      stars[Nusno].average.R     = buf[0]/360000.0;
    115115      stars[Nusno].average.D     = buf[1]/360000.0 - 90.0;
     116      stars[Nusno].measure.R     = stars[Nusno].average.R;
     117      stars[Nusno].measure.D     = stars[Nusno].average.D;
    116118      stars[Nusno].measure.dM    = NAN;
    117119

  • trunk/Ohana/src/addstar/src/getusnob.c

    r27435 r38467  
    143143      stars[Nusno].average.dP  = 0;
    144144
     145      stars[Nusno].measure.R   = stars[Nusno].average.R;
     146      stars[Nusno].measure.D   = stars[Nusno].average.D;
     147
    145148      /* USNO magnitude errors are reported as a fixed 0.3 mag */
    146149      stars[Nusno].measure.dM  = 0.3;

  • trunk/Ohana/src/addstar/src/greference.c

    r27435 r38467  
    2424  }
    2525
    26   /* get stars from the USNO B catalog for the given region */
     26  /* get stars from the Tycho catalog for the given region */
    2727  if (!strcasecmp (Refcat, "TYCHO")) {
    28     stars = gettycho (region, photcode, &Nstars);
     28    // stars = gettycho2 (region, photcode, &Nstars);
     29    fprintf (stderr, "Tycho load via addstar is deprecated: use loadtycho\n");
     30    exit (2);
     31  }
     32
     33  /* get stars from the Tycho catalog for the given region (old ingest) */
     34  if (!strcasecmp (Refcat, "TYCHO_OLD")) {
     35    // stars = gettycho (region, photcode, &Nstars);
     36    fprintf (stderr, "Tycho load via addstar is deprecated: use loadtycho\n");
     37    exit (2);
    2938  }
    3039

  • trunk/Ohana/src/addstar/src/grefstars.c

    r27435 r38467  
    2424    InitStar (&stars[N]);
    2525
    26     dparse (&stars[N].average.R,  1, line);
    27     dparse (&stars[N].average.D,  2, line);
     26    int status = sscanf (line, "%lf %lf %f %f %x",
     27                     &stars[N].average.R,  &stars[N].average.D, 
     28                     &stars[N].measure.M, &stars[N].measure.dM,
     29                     &stars[N].measure.photFlags);
     30    if ((status != 4) && (status != 5)) {
     31      fprintf (stderr, "error reading line: %s\n", line);
     32      N --;
     33      continue;
     34    }
    2835    stars[N].average.R = ohana_normalize_angle (stars[N].average.R);
    2936
    30     fparse (&stars[N].measure.M,  3, line);
    31     fparse (&stars[N].measure.dM, 4, line);
     37    stars[N].measure.R = stars[N].average.R;
     38    stars[N].measure.D = stars[N].average.D;
    3239
    3340    stars[N].measure.photcode = photcode;

  • trunk/Ohana/src/addstar/src/load2mass_catalog.c

    r38441 r38467  
    2929
    3030    for (j = 0; j < Nsec; j++) {
    31       dvo_secfilt_init (&catalog[0].secfilt[Nave*Nsec+j]);
     31      dvo_secfilt_init (&catalog[0].secfilt[Nave*Nsec+j], SECFILT_RESET_ALL);
    3232    }
    3333

  • trunk/Ohana/src/addstar/src/loadsupercos_rawdata.c

    r38441 r38467  
    7373        tstars[i].average.D = sstars[i].dec;
    7474
     75        tstars[i].measure.R = sstars[i].ra;
     76        tstars[i].measure.D = sstars[i].dec;
     77
    7578        int Ni = imlist[sstars[i].plateID];
    7679        if (Ni == -1) abort();

  • trunk/Ohana/src/addstar/src/loadwise_rawdata.c

    r38441 r38467  
    1212int loadwise_rawdata (SkyList *skytable, char *filename, AddstarClientOptions options) {
    1313 
    14   int i, j, verbose;
     14  int i, j, k, verbose;
    1515  int Nstars, NSTARS, Ntstars, NTSTARS;
    1616  int Nbyte, Nextra, offset;
    … …  
    140140        offset = tstars[j].offset;
    141141
    142         ALLOCATE (stars[Nstars+0], Stars, 1);
    143         ALLOCATE (stars[Nstars+1], Stars, 1);
    144         ALLOCATE (stars[Nstars+2], Stars, 1);
    145         ALLOCATE (stars[Nstars+3], Stars, 1);
    146 
    147         InitStar (stars[Nstars+0]);
    148         InitStar (stars[Nstars+1]);
    149         InitStar (stars[Nstars+2]);
    150         InitStar (stars[Nstars+3]);
    151 
    152         stars[Nstars+0][0].average.R = tstars[j].R;
    153         stars[Nstars+0][0].average.D = tstars[j].D;
    154         stars[Nstars+1][0].average.R = tstars[j].R;
    155         stars[Nstars+1][0].average.D = tstars[j].D;
    156         stars[Nstars+2][0].average.R = tstars[j].R;
    157         stars[Nstars+2][0].average.D = tstars[j].D;
    158         stars[Nstars+3][0].average.R = tstars[j].R;
    159         stars[Nstars+3][0].average.D = tstars[j].D;
     142        for (k = 0; k < 4; k++) {
     143          ALLOCATE (stars[Nstars + k], Stars, 1);
     144          InitStar (stars[Nstars + k]);
     145          stars[Nstars+k][0].average.R = tstars[j].R;
     146          stars[Nstars+k][0].average.D = tstars[j].D;
     147          stars[Nstars+k][0].measure.R = tstars[j].R;
     148          stars[Nstars+k][0].measure.D = tstars[j].D;
     149        }         
    160150       
    161151        switch (MODE) {
Note: See TracChangeset for help on using the changeset viewer.