IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 38268


Ignore:
Timestamp:
May 13, 2015, 11:28:45 AM (11 years ago)
Author:
eugene
Message:

added loadtycho; now setting measure.R,D and using that in find_matches_*

Location:
branches/eam_branches/ipp-20150419/Ohana/src/addstar
Files:
5 added
17 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20150419/Ohana/src/addstar/Makefile

    r38184 r38268  
    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 \
    … …  
    127126$(SRC)/SkyListForStars.$(ARCH).o \
    128127$(SRC)/SkyRegionUtils.$(ARCH).o \
    129 $(SRC)/SkyTableFromTychoIndex.$(ARCH).o \
    130128$(SRC)/SocketOps.$(ARCH).o \
    131129$(SRC)/UpdateDatabase_Image.$(ARCH).o \
    … …  
    143141$(SRC)/find_subset.$(ARCH).o \
    144142$(SRC)/getgsc.$(ARCH).o \
    145 $(SRC)/gettycho.$(ARCH).o \
    146143$(SRC)/getusno.$(ARCH).o \
    147144$(SRC)/getusnob.$(ARCH).o \
    … …  
    176173$(SRC)/getusno.$(ARCH).o \
    177174$(SRC)/getusnob.$(ARCH).o \
    178 $(SRC)/gettycho.$(ARCH).o \
    179175$(SRC)/greference.$(ARCH).o \
    180176$(SRC)/in_image.$(ARCH).o \
    … …  
    188184$(SRC)/edge_check.$(ARCH).o \
    189185$(SRC)/opening_angle.$(ARCH).o \
    190 $(SRC)/SkyTableFromTychoIndex.$(ARCH).o \
    191186$(SRC)/ListenClients_Thread.$(ARCH).o \
    192187$(SRC)/NewImage_Thread.$(ARCH).o \
    … …  
    334329$(SRC)/psps_ids.$(ARCH).o
    335330
     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 \
     339$(SRC)/build_links.$(ARCH).o \
     340$(SRC)/replace_match.$(ARCH).o \
     341$(SRC)/SetSignals.$(ARCH).o \
     342$(SRC)/update_coords.$(ARCH).o \
     343$(SRC)/SkyRegionUtils.$(ARCH).o \
     344$(SRC)/psps_ids.$(ARCH).o
     345
    336346LOAD-SUPERCOS = \
    337347$(SRC)/loadsupercos.$(ARCH).o \
    … …  
    410420$(BIN)/load2mass.$(ARCH)      : $(LOAD-2MASS)
    411421$(BIN)/loadwise.$(ARCH)       : $(LOAD-WISE)
     422$(BIN)/loadtycho.$(ARCH)      : $(LOAD-TYCHO)
    412423$(BIN)/loadstarpar.$(ARCH)    : $(LOAD-STARPAR)
    413424$(BIN)/loadstarpar_client.$(ARCH) : $(LOAD-STARPAR-CLIENT)

  • branches/eam_branches/ipp-20150419/Ohana/src/addstar/include/addstar.h

    r38184 r38268  
    220220Stars     *greference             PROTO((char *Refcat, SkyRegion *catstats, int photcode, unsigned int *nstars));
    221221Stars     *getgsc                 PROTO((SkyRegion *patch, unsigned int *NSTARS));
    222 Stars     *gettycho               PROTO((SkyRegion *catstats, int photcode, unsigned int *Nstars));
    223222Stars     *getusno                PROTO((SkyRegion *catstats, int photcode, unsigned int *Nstars));
    224223Stars     *getusnob               PROTO((SkyRegion *catstats, int photcode, unsigned int *Nstars));

  • branches/eam_branches/ipp-20150419/Ohana/src/addstar/src/FilterStars.c

    r38153 r38268  
    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;

  • branches/eam_branches/ipp-20150419/Ohana/src/addstar/src/ReadStarsSDSS.c

    r37807 r38268  
    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];

  • branches/eam_branches/ipp-20150419/Ohana/src/addstar/src/ReadStarsUKIRT.c

    r38184 r38268  
    169169    stars[i].average.dD        = NAN;
    170170
     171    stars[i].measure.R         = stars[i].average.R;
     172    stars[i].measure.D         = stars[i].average.D;
    171173    stars[i].measure.Xccd      = X_coordinate[i];
    172174    stars[i].measure.Yccd      = Y_coordinate[i];

  • branches/eam_branches/ipp-20150419/Ohana/src/addstar/src/find_matches.c

    r37807 r38268  
    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
    … …  
    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;

  • branches/eam_branches/ipp-20150419/Ohana/src/addstar/src/find_matches_closest.c

    r37807 r38268  
    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;
    … …  
    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;

  • branches/eam_branches/ipp-20150419/Ohana/src/addstar/src/find_matches_closest_refstars.c

    r37807 r38268  
    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
    … …  
    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 */

  • branches/eam_branches/ipp-20150419/Ohana/src/addstar/src/find_matches_refstars.c

    r37807 r38268  
    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;
    … …  
    260258      catalog[0].measure[Nmeas]          = stars[N][0].measure;
    261259
    262       catalog[0].measure[Nmeas].R        = stars[N][0].average.R;
    263       catalog[0].measure[Nmeas].D        = stars[N][0].average.D;
    264 
    265260      catalog[0].measure[Nmeas].t        = (stars[N][0].measure.t == 0) ? TIMEREF : stars[N][0].measure.t;      /** careful : time_t vs e_time **/
    266261      catalog[0].measure[Nmeas].t_msec   = (stars[N][0].measure.t == 0) ?       0 : stars[N][0].measure.t_msec; /** careful : time_t vs e_time **/

  • branches/eam_branches/ipp-20150419/Ohana/src/addstar/src/getgsc.c

    r27435 r38268  
    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;

  • branches/eam_branches/ipp-20150419/Ohana/src/addstar/src/gettycho.c

    r27435 r38268  
    101101        stars[Ntycho].measure.t   = TychoEpoch;
    102102
     103        stars[Ntycho].measure.R = stars[Ntycho].average.R;
     104        stars[Ntycho].measure.D = stars[Ntycho].average.D;
     105
    103106        /* one pass of addstar does either r or b */
    104107        if (photcode == TYCHO_B) {

  • branches/eam_branches/ipp-20150419/Ohana/src/addstar/src/getusno.c

    r27435 r38268  
    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

  • branches/eam_branches/ipp-20150419/Ohana/src/addstar/src/getusnob.c

    r27435 r38268  
    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;

  • branches/eam_branches/ipp-20150419/Ohana/src/addstar/src/greference.c

    r27435 r38268  
    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

  • branches/eam_branches/ipp-20150419/Ohana/src/addstar/src/grefstars.c

    r27435 r38268  
    3131    fparse (&stars[N].measure.dM, 4, line);
    3232
     33    stars[N].measure.R = stars[N].average.R;
     34    stars[N].measure.D = stars[N].average.D;
     35
    3336    stars[N].measure.photcode = photcode;
    3437

  • branches/eam_branches/ipp-20150419/Ohana/src/addstar/src/loadsupercos_rawdata.c

    r33653 r38268  
    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();

  • branches/eam_branches/ipp-20150419/Ohana/src/addstar/src/loadwise_rawdata.c

    r38062 r38268  
    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.