IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 37417


Ignore:
Timestamp:
Sep 19, 2014, 5:47:19 PM (12 years ago)
Author:
eugene
Message:

loadstarpar and loadstarpar_client build, but not tested

Location:
branches/eam_branches/ipp-20140904/Ohana/src/addstar
Files:
1 added
15 edited
1 moved

Legend:

Unmodified
Added
Removed

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

    r37402 r37417  
    2525load2mass    : $(BIN)/load2mass.$(ARCH)
    2626loadstarpar  : $(BIN)/loadstarpar.$(ARCH)
     27loadstarpar_client : $(BIN)/loadstarpar_client.$(ARCH)
    2728loadwise     : $(BIN)/loadwise.$(ARCH)
    2829dumpskycells : $(BIN)/dumpskycells.$(ARCH)
    … …  
    3233mkcmf        : $(BIN)/mkcmf.$(ARCH)
    3334
    34 all: addstar addstar_client sedstar load2mass loadstarpar skycells mkcmf loadwise loadsupercos dumpskycells findskycell
    35 
    36 INSTALL = addstar addstar_client sedstar load2mass loadstarpar skycells mkcmf loadwise loadsupercos dumpskycells findskycell
     35all: addstar addstar_client sedstar load2mass loadstarpar loadstarpar_client skycells mkcmf loadwise loadsupercos dumpskycells findskycell
     36
     37INSTALL = addstar addstar_client sedstar load2mass loadstarpar loadstarpar_client skycells mkcmf loadwise loadsupercos dumpskycells findskycell
    3738
    3839# I need to fix the client/server version of addstar now that I have dropped Stars
    … …  
    244245LOAD-STARPAR = \
    245246$(SRC)/loadstarpar.$(ARCH).o \
    246 $(SRC)/loadstarpar_rawdata.$(ARCH).o \
     247$(SRC)/ConfigInit.$(ARCH).o \
     248$(SRC)/SetSignals.$(ARCH).o \
     249$(SRC)/Shutdown.$(ARCH).o \
     250$(SRC)/SkyRegionUtils.$(ARCH).o \
     251$(SRC)/args_loadstarpar.$(ARCH).o \
     252$(SRC)/coord_transforms.$(ARCH).o \
     253$(SRC)/find_matches_starpar.$(ARCH).o \
    247254$(SRC)/loadstarpar_catalog.$(ARCH).o \
     255$(SRC)/loadstarpar_io.$(ARCH).o \
     256$(SRC)/loadstarpar_make_subset.$(ARCH).o \
    248257$(SRC)/loadstarpar_readstars.$(ARCH).o \
     258$(SRC)/loadstarpar_remote_hosts.$(ARCH).o \
     259$(SRC)/loadstarpar_save_remote.$(ARCH).o \
     260$(SRC)/loadstarpar_table.$(ARCH).o \
     261$(SRC)/psps_ids.$(ARCH).o
     262
     263LOAD-STARPAR-CLIENT = \
     264$(SRC)/loadstarpar_client.$(ARCH).o \
     265$(SRC)/ConfigInit.$(ARCH).o \
     266$(SRC)/SetSignals.$(ARCH).o \
     267$(SRC)/Shutdown.$(ARCH).o \
     268$(SRC)/SkyRegionUtils.$(ARCH).o \
     269$(SRC)/args_loadstarpar.$(ARCH).o \
     270$(SRC)/coord_transforms.$(ARCH).o \
     271$(SRC)/find_matches_starpar.$(ARCH).o \
     272$(SRC)/loadstarpar_catalog.$(ARCH).o \
     273$(SRC)/loadstarpar_io.$(ARCH).o \
    249274$(SRC)/loadstarpar_make_subset.$(ARCH).o \
     275$(SRC)/loadstarpar_readstars.$(ARCH).o \
     276$(SRC)/loadstarpar_remote_hosts.$(ARCH).o \
    250277$(SRC)/loadstarpar_save_remote.$(ARCH).o \
    251 $(SRC)/loadstarpar_io.$(ARCH).o \
    252 $(SRC)/loadstarpar_remote_hosts.$(ARCH).o \
    253 $(SRC)/find_matches_refstars.$(ARCH).o \
    254 $(SRC)/args_loadstarpar.$(ARCH).o \
    255 $(SRC)/replace_match.$(ARCH).o \
    256 $(SRC)/update_coords.$(ARCH).o \
    257 $(SRC)/SkyRegionUtils.$(ARCH).o \
    258 $(SRC)/StarOps.$(ARCH).o \
    259 $(SRC)/ConfigInit.$(ARCH).o \
    260 $(SRC)/Shutdown.$(ARCH).o \
    261 $(SRC)/SetSignals.$(ARCH).o \
     278$(SRC)/loadstarpar_table.$(ARCH).o \
    262279$(SRC)/psps_ids.$(ARCH).o
    263280
    … …  
    330347$(SRC)/Shutdown.$(ARCH).o
    331348
    332 $(ADDSTARC)       : $(INC)/addstar.h
    333 $(ADDSTARD)       : $(INC)/addstar.h
    334 $(ADDSTART)       : $(INC)/addstar.h
    335 $(ADDSTAR)        : $(INC)/addstar.h
    336 $(ADDSTAR_CLIENT) : $(INC)/addstar.h
    337 $(SKYCELLS)       : $(INC)/addstar.h
    338 $(DUMPSKYCELLS)   : $(INC)/addstar.h
    339 $(FINDSKYCELL)    : $(INC)/addstar.h
    340 $(LOAD-2MASS)     : $(INC)/addstar.h $(INC)/2mass.h
    341 $(LOAD-WISE)      : $(INC)/addstar.h $(INC)/WISE.h
    342 $(MKCMF)          : $(INC)/mkcmf.h
     349$(ADDSTARC)            : $(INC)/addstar.h
     350$(ADDSTARD)            : $(INC)/addstar.h
     351$(ADDSTART)            : $(INC)/addstar.h
     352$(ADDSTAR)             : $(INC)/addstar.h
     353$(ADDSTAR_CLIENT)      : $(INC)/addstar.h
     354$(SKYCELLS)            : $(INC)/addstar.h
     355$(DUMPSKYCELLS)        : $(INC)/addstar.h
     356$(FINDSKYCELL)         : $(INC)/addstar.h
     357$(LOAD-2MASS)          : $(INC)/addstar.h $(INC)/2mass.h
     358$(LOAD-STARPAR)        : $(INC)/addstar.h $(INC)/loadstarpar.h
     359$(LOAD-STARPAR-CLIENT) : $(INC)/addstar.h $(INC)/loadstarpar.h
     360$(LOAD-WISE)           : $(INC)/addstar.h $(INC)/WISE.h
     361$(MKCMF)               : $(INC)/mkcmf.h
    343362
    344363$(BIN)/addstar.$(ARCH)        : $(ADDSTAR)
    … …  
    351370$(BIN)/load2mass.$(ARCH)      : $(LOAD-2MASS)
    352371$(BIN)/loadwise.$(ARCH)       : $(LOAD-WISE)
     372$(BIN)/loadstarpar.$(ARCH)    : $(LOAD-STARPAR)
     373$(BIN)/loadstarpar_client.$(ARCH) : $(LOAD-STARPAR-CLIENT)
    353374$(BIN)/loadsupercos.$(ARCH)   : $(LOAD-SUPERCOS)
    354375$(BIN)/skycells.$(ARCH)       : $(SKYCELLS)

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

    r37395 r37417  
    3131# define dCOS(A)   ((double) cos ((double)RAD_DEG*A))
    3232# define dSIN(A)   ((double) sin ((double)RAD_DEG*A))
     33
     34# define myAbortF(FORMAT,...) { fprintf (stderr, FORMAT, __VA_ARGS__); abort(); }
    3335
    3436typedef struct {

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

    r37395 r37417  
    77} StarPar_Stars;
    88
    9 int   HOST_ID
     9int   HOST_ID;
    1010char *HOSTDIR;
    1111char *CPT_FILE;
    1212char *INPUT;
     13
     14AddstarClientOptions args_loadstarpar (int argc, char **argv, AddstarClientOptions options);
     15AddstarClientOptions args_loadstarpar_client (int argc, char **argv, AddstarClientOptions options);
     16
     17int loadstarpar_table (SkyList *skylistInput, HostTable *hosts, char *filename, AddstarClientOptions *options);
     18
     19StarPar_Stars *loadstarpar_make_subset (StarPar_Stars *stars, int Nstars, int start, SkyRegion *region, int *nsubset);
     20
     21int loadstarpar_save_remote (StarPar_Stars *stars, int Nstars, HostTable *hosts, SkyRegion *region, char *fullname, AddstarClientOptions *options);
     22
     23int save_remote_host (HostInfo *host);
     24
     25int init_remote_hosts ();
     26int find_empty_slot ();
     27int harvest_all ();
     28int harvest_host ();
     29
     30int loadstarpar_catalog (StarPar_Stars *stars, int Nstars, SkyRegion *region, char *filename, AddstarClientOptions *options);
     31
     32int galactic_to_celestial (double *R, double *D, double l, double b);
     33
     34int find_matches_starpar (SkyRegion *region, StarPar_Stars *stars, int Nstars, Catalog *catalog, AddstarClientOptions *options);
     35
     36int loadstarpar_save_stars (char *filename, StarPar_Stars *stars, int Nstars);
     37StarPar_Stars *loadstarpar_load_stars (char *filename, int *nstars);
     38
     39StarPar_Stars *loadstarpar_readstars (char *filename, int *nstars);
     40
     41int loadstarpar_sortStars (StarPar_Stars *stars, int Nstars);

  • branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/args_loadstarpar.c

    r37395 r37417  
    11# include "addstar.h"
    2 # include "WISE.h"
     2# include "loadstarpar.h"
    33
    44static void help (void);
     5static void help_client (void);
    56
    67AddstarClientOptions args_loadstarpar (int argc, char **argv, AddstarClientOptions options) {
    … …  
    1314    help ();
    1415  }
    15 
    16   // a global used by find_matches_refstars.c
    17   NREFSTAR_GROUP = X;
    18 
    19   /*** check for command line options ***/
    2016
    2117  /* basic mode: image, list, refcat */
    … …  
    5147  if ((N = get_argument (argc, argv, "-v"))) {
    5248    VERBOSE = TRUE;
    53     remove_argument (N, &argc, argv);
    54   }
    55 
    56   /* load the prelim data dump */
    57   ALLSKY = TRUE;
    58   if ((N = get_argument (argc, argv, "-prelim"))) {
    59     ALLSKY = FALSE;
    6049    remove_argument (N, &argc, argv);
    6150  }

  • branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/build_links.c

    r37334 r37417  
    11# include "addstar.h"
    2 
    3 # define myAbortF(FORMAT,...) { fprintf (stderr, FORMAT, __VA_ARGS__); abort(); }
    42
    53/*

  • branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/find_matches_starpar.c

    r37395 r37417  
    33
    44// we find matching stars by (R,D).  we add the starpar to the array of starpars with appropriate links. 
    5 int find_matches_starpar (SkyRegion *region, StarPar_Stars *stars, int Nstars, Catalog *catalog, AddstarClientOptions options) {
     5int find_matches_starpar (SkyRegion *region, StarPar_Stars *stars, int Nstars, Catalog *catalog, AddstarClientOptions *options) {
    66 
    7   off_t i, j, n, N, J, Jmin, status, Nstars;
     7  off_t i, j, n, N, J, Jmin;
    88  double RADIUS, RADIUS2, Rmin;
    99  double *X1, *Y1, *X2, *Y2;
    … …  
    4848  /* build spatial index (RA sort) referencing input array sequence */
    4949  for (i = 0; i < Nstars; i++) {
    50     status = RD_to_XY (&X1[i], &Y1[i], stars[i].R, stars[i].D, &tcoords);
     50    RD_to_XY (&X1[i], &Y1[i], stars[i].R, stars[i].D, &tcoords);
    5151    N1[i] = i;
    5252  }
    … …  
    6262
    6363  /* choose a radius for matches */
    64   RADIUS = options.radius; /* provided by config */
     64  RADIUS = options->radius; /* provided by config */
    6565  RADIUS2 = RADIUS*RADIUS;
    6666
    … …  
    153153# if (0)
    154154  /** incorporate unmatched image stars? **/
    155   for (i = 0; (i < Nstars) && !options.only_match; i++) {
     155  for (i = 0; (i < Nstars) && !options->only_match; i++) {
    156156
    157157    // skip already matched stars
    … …  
    206206
    207207  /* note stars which have been found in this catalog */
    208   for (i = 0; i < NstarsIn; i++) {
     208  for (i = 0; i < Nstars; i++) {
    209209    if (stars[i].found > -1) {
    210210      stars[i].found = -2;
    … …  
    217217  catalog[0].Nstarpar  = Nstarpar;
    218218  catalog[0].Nsecf_mem = Nave*Nsecfilt;
    219   if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nstarpar, Nlens: "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT", ("OFF_T_FMT" matches)\n",  Nstars,  Nave, Nmatch);
     219  if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nstarpar: %d "OFF_T_FMT" "OFF_T_FMT" ("OFF_T_FMT" matches)\n",  Nstars, Nave, Nstarpar, Nmatch);
    220220
    221221  free (X1);

  • branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/loadstarpar.c

    r37395 r37417  
    11# include "addstar.h"
    2 # include "WISE.h"
     2# include "loadstarpar.h"
    33
    44/* This is the DVO program to upload Greg Green's stellar parametersq into a DVO database.
    … …  
    99
    1010   USAGE: loadstarpar -D CATDIR (catdir) (file.fits) [...more files]
    11  */
     11*/
    1212
    1313int main (int argc, char **argv) {
    … …  
    3535
    3636  for (i = 1; i < argc; i++) {
    37       fprintf (stderr, "loading %s\n", argv[i]);
    38       loadstarpar_rawdata (skylist, hosts, argv[i], options);
     37    fprintf (stderr, "loading %s\n", argv[i]);
     38    loadstarpar_table (skylist, hosts, argv[i], &options);
    3939  }
    4040  exit (0);
    4141} 
    42 

  • branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/loadstarpar_catalog.c

    r37395 r37417  
    22# include "loadstarpar.h"
    33
    4 int loadstarpar_catalog (StarPar_Stars *stars, int Nstars, SkyRegion *region, char *filename) {
     4int loadstarpar_catalog (StarPar_Stars *stars, int Nstars, SkyRegion *region, char *filename, AddstarClientOptions *options) {
    55
    66  Catalog catalog;

  • branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/loadstarpar_client.c

    r37402 r37417  
    44int main (int argc, char **argv) {
    55
    6   int i;
    76  AddstarClientOptions options;
    87
    … …  
    1312  // client is called with a pointer to the file to be loaded
    1413
     14  SkyTable *sky = SkyTableLoadOptimal (CATDIR, SKY_TABLE, GSCFILE, FALSE, SKY_DEPTH, VERBOSE);
     15  SkyTableSetFilenames (sky, CATDIR, "cpt");
     16 
     17  SkyList *skylist = SkyRegionByCPT (sky, CPT_FILE);
     18
     19  int Nstars;
    1520  StarPar_Stars *stars = loadstarpar_load_stars (INPUT, &Nstars);
    1621
    17   loadstarpar_catalog (stars, Nstars, region, CPT_FILE);
     22  loadstarpar_catalog (stars, Nstars, skylist->regions[0], CPT_FILE, &options);
    1823
    1924  free (stars);

  • branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/loadstarpar_io.c

    r37395 r37417  
    3030  gfits_define_bintable_column (&theader, "D", "GLON",     "", "degree", 1.0, 0.0);
    3131  gfits_define_bintable_column (&theader, "D", "GLAT",     "", "degree", 1.0, 0.0);
    32   gfits_define_bintable_column (&theader, "E", "Ebv",      "", 1.0, 0.0);
    33   gfits_define_bintable_column (&theader, "E", "dEbv",     "", 1.0, 0.0);
    34   gfits_define_bintable_column (&theader, "E", "DistMag",  "", 1.0, 0.0);
    35   gfits_define_bintable_column (&theader, "E", "dDistMag", "", 1.0, 0.0);
    36   gfits_define_bintable_column (&theader, "E", "M_r",      "", 1.0, 0.0);
    37   gfits_define_bintable_column (&theader, "E", "dM_r",     "", 1.0, 0.0);
    38   gfits_define_bintable_column (&theader, "E", "FeH",      "", 1.0, 0.0);
    39   gfits_define_bintable_column (&theader, "E", "dFeH",     "", 1.0, 0.0);
    40   gfits_define_bintable_column (&theader, "J", "averef",   "", 1.0, FT_BZERO_INT32);
    41   gfits_define_bintable_column (&theader, "J", "objID",    "", 1.0, FT_BZERO_INT32);
    42   gfits_define_bintable_column (&theader, "J", "catID",    "", 1.0, FT_BZERO_INT32);
     32  gfits_define_bintable_column (&theader, "E", "Ebv",      "", "", 1.0, 0.0);
     33  gfits_define_bintable_column (&theader, "E", "dEbv",     "", "", 1.0, 0.0);
     34  gfits_define_bintable_column (&theader, "E", "DistMag",  "", "", 1.0, 0.0);
     35  gfits_define_bintable_column (&theader, "E", "dDistMag", "", "", 1.0, 0.0);
     36  gfits_define_bintable_column (&theader, "E", "M_r",      "", "", 1.0, 0.0);
     37  gfits_define_bintable_column (&theader, "E", "dM_r",     "", "", 1.0, 0.0);
     38  gfits_define_bintable_column (&theader, "E", "FeH",      "", "", 1.0, 0.0);
     39  gfits_define_bintable_column (&theader, "E", "dFeH",     "", "", 1.0, 0.0);
     40  gfits_define_bintable_column (&theader, "J", "averef",   "", "", 1.0, FT_BZERO_INT32);
     41  gfits_define_bintable_column (&theader, "J", "objID",    "", "", 1.0, FT_BZERO_INT32);
     42  gfits_define_bintable_column (&theader, "J", "catID",    "", "", 1.0, FT_BZERO_INT32);
    4343
     44  int i;
    4445  double       *ra       = NULL; ALLOCATE (ra      , double      , Nstars); for (i = 0; i < Nstars; i++) ra      [i] = stars[i].R               ;
    4546  double       *dec      = NULL; ALLOCATE (dec     , double      , Nstars); for (i = 0; i < Nstars; i++) dec     [i] = stars[i].D               ;
    … …  
    8283  gfits_free_header (&theader);
    8384  gfits_free_table (&ftable);
     85
     86  return TRUE;
    8487}
    8588
    … …  
    131134  if (!gfits_fread_ftable_data (f, &ftable, FALSE)) goto escape;
    132135 
    133   GET_COLUMN_NEW(ra      , "RA"        ,   double);
    134   GET_COLUMN_NEW(dec     , "DEC"       ,   double);
    135   GET_COLUMN_NEW(glon    , "GLON"      ,   double);
    136   GET_COLUMN_NEW(glat    , "GLAT"      ,   double);
    137   GET_COLUMN_NEW(Ebv     , "Ebv"       ,   float);
    138   GET_COLUMN_NEW(dEbv    , "dEbv"      ,   float);
    139   GET_COLUMN_NEW(DistMag , "DistMag"   ,   float);
    140   GET_COLUMN_NEW(dDistMag, "dDistMag"  ,   float);
    141   GET_COLUMN_NEW(M_r     , "M_r"       ,   float);
    142   GET_COLUMN_NEW(dM_r    , "dM_r"      ,   float);
    143   GET_COLUMN_NEW(FeH     , "FeH"       ,   float);
    144   GET_COLUMN_NEW(dFeH    , "dFeH"      ,   float);
    145   GET_COLUMN_NEW(averef  , "averef"    ,   unsigned int);
    146   GET_COLUMN_NEW(objID   , "objID"     ,   unsigned int);
    147   GET_COLUMN_NEW(catID   , "catID"     ,   unsigned int);
     136  GET_COLUMN(ra      , "RA"        ,   double);
     137  GET_COLUMN(dec     , "DEC"       ,   double);
     138  GET_COLUMN(glon    , "GLON"      ,   double);
     139  GET_COLUMN(glat    , "GLAT"      ,   double);
     140  GET_COLUMN(Ebv     , "Ebv"       ,   float);
     141  GET_COLUMN(dEbv    , "dEbv"      ,   float);
     142  GET_COLUMN(DistMag , "DistMag"   ,   float);
     143  GET_COLUMN(dDistMag, "dDistMag"  ,   float);
     144  GET_COLUMN(M_r     , "M_r"       ,   float);
     145  GET_COLUMN(dM_r    , "dM_r"      ,   float);
     146  GET_COLUMN(FeH     , "FeH"       ,   float);
     147  GET_COLUMN(dFeH    , "dFeH"      ,   float);
     148  GET_COLUMN(averef  , "averef"    ,   unsigned int);
     149  GET_COLUMN(objID   , "objID"     ,   unsigned int);
     150  GET_COLUMN(catID   , "catID"     ,   unsigned int);
    148151
    149152  gfits_free_header (&theader);
    … …  
    152155  gfits_free_matrix (&matrix);
    153156
    154   ALLOCATE (StarPar_Stars, stars, Nrow);
     157  ALLOCATE (stars, StarPar_Stars, Nrow);
    155158
    156159  for (i = 0; i < Nrow; i++) {

  • branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/loadstarpar_make_subset.c

    r37395 r37417  
    77StarPar_Stars *loadstarpar_make_subset (StarPar_Stars *stars, int Nstars, int start, SkyRegion *region, int *nsubset) {
    88
     9  int i;
     10
    911  StarPar_Stars *subset = NULL;
    1012
    … …  
    1214  int Nsubset = 0;
    1315  int NSUBSET = 3000;
    14   ALLOCATE (subset, StarPar_Stars *, NSUBSET);
     16  ALLOCATE (subset, StarPar_Stars, NSUBSET);
    1517
    1618  // find the rest of the stars in this output region
    … …  
    3133         
    3234    subset[Nsubset] = stars[i];
    33     Nsubset ++
     35    Nsubset ++;
    3436
    3537    CHECK_REALLOCATE (subset, StarPar_Stars, NSUBSET, Nsubset, 10000);

  • branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/loadstarpar_readstars.c

    r37395 r37417  
    99
    1010  // read in the full FITS files ('cause I don't have a partial read option)
    11   f = fopen (filename, "r");
     11  FILE *f = fopen (filename, "r");
    1212  if (f == NULL) Shutdown ("can't read stellar parameter file: %s", filename);
     13
     14  int i, Ncol;
     15  off_t Nrow;
    1316
    1417  Header header;
    … …  
    7982  int NstarsIn = matrix.Naxis[2];
    8083
    81   Rmin = 360.0;
    82   Rmax = 360.0;
    83   Dmin = 360.0;
    84   Dmax = 360.0;
     84  double Rmin = +360.0;
     85  double Rmax = -360.0;
     86  double Dmin = +360.0;
     87  double Dmax = -360.0;
    8588
    8689  int Nstars = 0;
    … …  
    9699    if (lnZ[i] < -15.0) continue;
    97100
    98     galactic_to_celestial (&R, &D, glat[i], glon[i]);
     101    double R, D;
     102    galactic_to_celestial (&R, &D, glon[i], glat[i]);
    99103
    100104    Rmin = MIN (Rmin, R);
    … …  
    106110    float dDistMag = 0.5*(errImage[i*20 + 5*1 + 3] - errImage[i*20 + 5*1 + 1]);
    107111    float dFeH     = 0.5*(errImage[i*20 + 5*2 + 3] - errImage[i*20 + 5*2 + 1]);
    108     float dMr      = 0.5*(errImage[i*20 + 5*3 + 3] - errImage[i*20 + 5*3 + 1]);
     112    float dM_r     = 0.5*(errImage[i*20 + 5*3 + 3] - errImage[i*20 + 5*3 + 1]);
    109113
    110114    stars[Nstars].R = R;
    111115    stars[Nstars].D = D;
    112116
    113     stars[Nstars].starpar.galLon = l;
    114     stars[Nstars].starpar.galLat = b;
     117    stars[Nstars].starpar.galLon = glon[i];
     118    stars[Nstars].starpar.galLat = glat[i];
    115119
    116120    stars[Nstars].starpar.Ebv      = Ebv[i]    ;
    … …  
    133137  return (stars);
    134138}
     139
     140int loadstarpar_sortStars (StarPar_Stars *stars, int Nstars) {
     141
     142# define SWAPFUNC(A,B){ StarPar_Stars temp = stars[A]; stars[A] = stars[B]; stars[B] = temp; }
     143# define COMPARE(A,B)(stars[A].R < stars[B].R)
     144
     145  OHANA_SORT (Nstars, COMPARE, SWAPFUNC);
     146
     147# undef SWAPFUNC
     148# undef COMPARE
     149 
     150  return TRUE;
     151}
     152

  • branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/loadstarpar_remote_hosts.c

    r37395 r37417  
    11# include "addstar.h"
    22# include "loadstarpar.h"
     3# include <sys/types.h>
     4# include <sys/wait.h>
     5
     6# define DEBUG 1
    37
    48// we are running N parallel remote jobs on the remote hosts.  In the usual remote
    … …  
    1923    hosts[i] = NULL;
    2024  }
     25  return TRUE;
    2126}
    2227
    2328int find_empty_slot () {
    2429
     30  int i;
    2531  for (i = 0; i < Nhosts; i++) {
    2632    if (hosts[i] == NULL) return i;
    … …  
    3137int harvest_all () {
    3238
    33   slot = -1;
     39  int slot = -1;
    3440
    3541  while (slot != -2) {
    … …  
    4450int save_remote_host (HostInfo *host) {
    4551
     52  int i;
    4653  for (i = 0; i < Nhosts; i++) {
    4754    if (hosts[i] == NULL) {
    … …  
    124131  free (host->hostname);
    125132  free (host->pathname);
    126   FreeIOBuffer (host->stdout);
    127   FreeIOBuffer (host->stderr);
     133  FreeIOBuffer (&host->stdout);
     134  FreeIOBuffer (&host->stderr);
    128135  free (host);
    129136

  • branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/loadstarpar_save_remote.c

    r37402 r37417  
    11# include "addstar.h"
    22# include "loadstarpar.h"
     3# define DEBUG 1
    34
    4 int loadstarpar_save_remote (StarPar_Stars *stars, int Nstars, HostTable *hosts, SkyRegion *region, char *fullname) {
     5int strextend (char *input, char *format,...) {
     6
     7  char tmpextra[1024], tmpline[1024];
     8  va_list argp;
     9
     10  va_start (argp, format);
     11  vsnprintf (tmpextra, 1024, format, argp);
     12  snprintf (tmpline, 1024, "%s %s", input, tmpextra);
     13  strcpy (input, tmpline);
     14
     15  return TRUE;
     16}
     17
     18int loadstarpar_save_remote (StarPar_Stars *stars, int Nstars, HostTable *hosts, SkyRegion *region, char *fullname, AddstarClientOptions *options) {
    519
    620  char uniquer[12];
    … …  
    1125  // if this region is a parallel thing, save and launch remote
    1226  if (!region->hostID) {
    13     loadstarpar_catalog (stars, Nstars, region, fullname);
     27    loadstarpar_catalog (stars, Nstars, region, fullname, options);
    1428  } else {
    1529    int N = hosts->index[region->hostID];
    16     HostInfo *hostMach = hosts->hosts[N];
     30    HostInfo *hostMach = &hosts->hosts[N];
    1731
    1832    // save to a unique filename
    … …  
    3549    // allocate a host for this job
    3650    HostInfo *host = NULL;
    37     ALLOCATE (HostInfo, host, 1);
     51    ALLOCATE (host, HostInfo, 1);
    3852
    3953    // we want to run this job on the host described by hostMach.  copy
    … …  
    4256    host->hostname = strcreate (hostMach->hostname);
    4357    host->pathname = strcreate (hostMach->pathname);
    44     InitIOBuffer (host->stdout, 1000);
    45     InitIOBuffer (host->stderr, 1000);
     58    InitIOBuffer (&host->stdout, 1000);
     59    InitIOBuffer (&host->stderr, 1000);
    4660
    4761    // got a valid slot, so launch a new host

  • branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/loadstarpar_table.c

    r37402 r37417  
    66  myAssert (!strcmp(type, #TYPE), "wrong column type");
    77
    8 int loadstarpar_foobar (SkyList *skylistInput, HostTable *hosts, char *filename, AddstarClientOptions options) {
     8int loadstarpar_table (SkyList *skylistInput, HostTable *hosts, char *filename, AddstarClientOptions *options) {
    99 
    10   SkyRegion *region;
     10  int i, Nstars;
    1111
    1212  StarPar_Stars *stars = loadstarpar_readstars (filename, &Nstars);
    … …  
    2727
    2828    // identify the relevant catalog
    29     skylist = SkyRegionByPoint_List (skylistInput, -1, stars[i].R, stars[i].D);
     29    SkyList *skylist = SkyRegionByPoint_List (skylistInput, -1, stars[i].R, stars[i].D);
    3030    if (skylist[0].Nregions == 0) {
    3131      SkyListFree (skylist);
    3232      continue;
    3333    }
    34     region = skylist[0].regions[0];
     34    SkyRegion *region = skylist[0].regions[0];
    3535
    3636    // select stars matching this region
     37    int Nsubset;
    3738    StarPar_Stars *subset = loadstarpar_make_subset (stars, Nstars, i, region, &Nsubset);
    3839
    3940    // In parallel mode, write out the subset to a disk file.  Block until a remote host
    4041    // is available.  In serial mode, just match against the appropriate region and save
    41     loadstarpar_save_remote (subset, Nsubset, hosts, region, skylist[0].filename[0]);
     42    loadstarpar_save_remote (subset, Nsubset, hosts, region, skylist[0].filename[0], options);
    4243  }
    4344

  • branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/resort_catalog.c

    r37402 r37417  
    44void resort_catalog_measure (Catalog *catalog);
    55void resort_catalog_lensing (Catalog *catalog);
     6void resort_catalog_starpar (Catalog *catalog);
    67
    78void resort_catalog_old (Catalog *catalog) {
    … …  
    339340
    340341  off_t Naverage, Nstarpar;
    341   Starpar *starpar;
     342  StarPar *starpar;
    342343  Average *average;
    343344  off_t i, j, N, currentAve;
    … …  
    345346  off_t *starparSeq = NULL;
    346347  off_t *averageSeq = NULL;
    347   Starpar *starparTMP = NULL;
     348  StarPar *starparTMP = NULL;
    348349
    349350  // struct timeval start, stop;
    … …  
    410411
    411412  // copy the starpar entries in the sorted order
    412   ALLOCATE (starparTMP, Starpar, Nstarpar);
     413  ALLOCATE (starparTMP, StarPar, Nstarpar);
    413414  for (i = 0; i < Nstarpar; i++) {
    414415    j = starparSeq[i];
Note: See TracChangeset for help on using the changeset viewer.