IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Feb 16, 2014, 7:17:55 AM (12 years ago)
Author:
eugene
Message:

working on building relphot parallel

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

Legend:

Unmodified
Added
Removed

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

    r36490 r36518  
    103103$(SRC)/ImageMetadata.$(ARCH).o \
    104104$(SRC)/ImageOps.$(ARCH).o               \
     105$(SRC)/RegionHostTable.$(ARCH).o                \
    105106$(SRC)/match_image.$(ARCH).o            \
    106107$(SRC)/db_utils.$(ARCH).o               \

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

    r36516 r36518  
    434434  short          dYccd;
    435435  short          dRsys;
     436  char           myDet;
    436437} MeasureTiny;
    437438
    … …  
    843844void dvo_measureT_init (MeasureTiny *measure);
    844845
     846void InitRegionHosts (RegionHostInfo *hosts, int Nhosts, int NHOSTS);
     847void FreeRegionHosts (RegionHostInfo *hosts, int Nhosts);
     848void FreeRegionHostTable (RegionHostTable *table);
     849RegionHostTable *RegionHostTableLoad (char *catdir, char *rootname);
     850
    845851# endif // DVO_H

  • branches/eam_branches/ipp-20140206/Ohana/src/libdvo/src/RegionHostTable.c

    r36516 r36518  
    7575    int ID;
    7676    char tmphost[1024];
    77     char tmppath[1024];
    7877    char line[1024];
    7978
    … …  
    8786    if (line[i] == 0) continue;
    8887
     88    double Rmin, Rmax, Dmin, Dmax;
    8989    status = sscanf (line, "%d %1023s %lf %lf %lf %lf", &ID, tmphost, &Rmin, &Rmax, &Dmin, &Dmax);
    9090    if (status != 6) {

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

    r35416 r36518  
    242242 measure->dYccd     = 0;
    243243 measure->dRsys     = 0;
     244 measure->myDet     = FALSE;
    244245}
    245246

  • branches/eam_branches/ipp-20140206/Ohana/src/relphot/Makefile

    r35416 r36518  
    4747$(SRC)/relphot_images.$(ARCH).o  \
    4848$(SRC)/relphot_objects.$(ARCH).o         \
     49$(SRC)/relphot_parallel_regions.$(ARCH).o \
     50$(SRC)/relphot_parallel_images.$(ARCH).o \
    4951$(SRC)/select_images.$(ARCH).o   \
     52$(SRC)/assign_images.$(ARCH).o   \
     53$(SRC)/launch_region_hosts.$(ARCH).o     \
     54$(SRC)/ImageTable.$(ARCH).o      \
     55$(SRC)/ImageMagIO.$(ARCH).o      \
     56$(SRC)/share_image_mags.$(ARCH).o        \
     57$(SRC)/share_mean_mags.$(ARCH).o         \
     58$(SRC)/MeanMagIO.$(ARCH).o       \
     59$(SRC)/indexCatalog.$(ARCH).o    \
    5060$(SRC)/client_logger.$(ARCH).o   \
    5161$(SRC)/setExclusions.$(ARCH).o   \

  • branches/eam_branches/ipp-20140206/Ohana/src/relphot/include/relphot.h

    r36516 r36518  
    119119  unsigned int catID;
    120120} MeanMag;
     121
     122typedef struct {
     123  float Mcal;
     124  float dMcal;
     125  float dMagSys;
     126  float Xm;
     127  int nFitPhotom;
     128  int flags;
     129  unsigned int imageID;
     130  short ubercalDist;
     131} ImageMag;
    121132
    122133typedef struct {
    … …  
    439450int init_synthetic_mags ();
    440451int add_synthetic_mags (AverageTiny *average, SecFilt *secfilt, MeasureTiny *measure, off_t *Nmeasure, off_t *Nm);
     452
     453int relphot_parallel_regions ();
     454
     455int assign_images (FITS_DB *db, RegionHostTable *regionHosts);
     456int select_images_hostregion (RegionHostTable *hosts, Image *image, off_t Nimage);
     457int find_host_for_coords (RegionHostTable *regionHosts, double R, double d);
     458
     459int launch_region_hosts (RegionHostTable *regionHosts);
     460int strextend (char *input, char *format,...);
     461
     462Image *ImageTableLoad(char *filename, off_t *nimage);
     463int ImageTableSave (char *filename, Image *images, off_t Nimages);
     464
     465int indexCatalogs (Catalog *catalog, int Ncatalog);
     466int catID_and_objID_to_seq (int catID, int objID, int *catSeq, off_t *objSeq);
     467
     468int share_mean_mags (Catalog *catalog, int Ncatalog, RegionHostTable *regionHosts, int nloop);
     469int slurp_mean_mags (Catalog *catalog, int Ncatalog, RegionHostTable *regionHosts, int nloop);
     470int check_sync_file (char *hostname, int nloop);
     471int clear_sync_file (char *hostname);
     472int update_sync_file (char *hostname, int nloop);
     473int set_mean_mags (MeanMag *meanmags, Average *average, SecFilt *secfilt, int Nsec);
     474MeanMag *merge_mean_mags (MeanMag *target, int *ntarget, MeanMag *source, int Nsource);
     475
     476MeanMag *MeanMagLoad(char *filename, off_t *nmeanmags);
     477int MeanMagSave(char *filename, MeanMag *meanmags, off_t Nmeanmags);
     478
     479int share_image_mags (RegionHostTable *regionHosts, int nloop);
     480int slurp_image_mags (RegionHostTable *regionHosts, int nloop);
     481int check_imsync_file (char *hostname, int nloop);
     482int update_imsync_file (char *hostname, int nloop);
     483int clear_imsync_file (char *hostname);
     484int set_image_mags (ImageMag *image_mags, Image *image);
     485ImageMag *merge_image_mags (ImageMag *target, int *ntarget, ImageMag *source, int Nsource);
     486
     487ImageMag *ImageMagLoad(char *filename, off_t *nimage_mags);
     488int ImageMagSave(char *filename, ImageMag *image_mags, off_t Nimage_mags);

  • branches/eam_branches/ipp-20140206/Ohana/src/relphot/src/ImageMagIO.c

    r36517 r36518  
    6565  GET_COLUMN (flags,             "FLAGS",            int);
    6666  GET_COLUMN (ubercalDist,       "UDIST",            int);
     67  GET_COLUMN (imageID,           "ID",               int);
    6768
    6869  ALLOCATE (image_mags, ImageMag, Nrow);
    … …  
    7576    image_mag[i].flags                     = flags      [i];
    7677    image_mag[i].ubercalDist               = ubercalDist[i];
     78    image_mag[i].imageID                   = imageID    [i];
    7779  }
    7880  fprintf (stderr, "loaded data for %lld images\n", (long long) Nrow);
    … …  
    8587  free (flags      );
    8688  free (ubercalDist);
     89  free (imageID    );
    8790
    8891  *nimage_mag = Nrow;
    … …  
    97100  }
    98101
    99 int ImageMagsSave(char *filename, ImageMags *image_mags, off_t Nimage_mags) {
     102int ImageMagSave(char *filename, ImageMag *image_mags, off_t Nimage_mags) {
    100103
    101104  int i;
    … …  
    119122  gfits_define_bintable_column (&theader, "E", "FLAGS",          "analysis flags", "unitless", 1.0, 0.0);
    120123  gfits_define_bintable_column (&theader, "E", "UDIST",          "distance to ubercal images", "images", 1.0, 0.0);
     124  gfits_define_bintable_column (&theader, "E", "ID",             "image ID", "unitless", 1.0, 0.0);
    121125
    122126  // generate the output array that carries the data
    … …  
    130134  int   *flags       ;
    131135  int   *ubercalDist ;
     136  int   *imageID     ;
    132137
    133138  // create intermediate storage arrays
    … …  
    139144  ALLOCATE (flags       ,           int,          Nimage_mags);
    140145  ALLOCATE (ubercalDist ,           int,          Nimage_mags);
     146  ALLOCATE (imageID     ,           int,          Nimage_mags);
    141147
    142148  // assign the storage arrays
    … …  
    149155    flags      [i]   = image_mag[i].flags      ;
    150156    ubercalDist[i]   = image_mag[i].ubercalDist;
     157    imageID    [i]   = image_mag[i].imageID    ;
    151158  }
    152159
    … …  
    159166  gfits_set_bintable_column (&theader, &ftable, "FLAGS",          flags      ,         Nimage_mags);
    160167  gfits_set_bintable_column (&theader, &ftable, "UDIST",          ubercalDist,         Nimage_mags);
     168  gfits_set_bintable_column (&theader, &ftable, "ID",             imageID    ,         Nimage_mags);
    161169
    162170  free (Mcal       );
    … …  
    167175  free (flags      );
    168176  free (ubercalDist);
     177  free (imageID    );
    169178
    170179  FILE *f = fopen (filename, "w");

  • branches/eam_branches/ipp-20140206/Ohana/src/relphot/src/MeanMagIO.c

    r36516 r36518  
    9494  }
    9595
    96 int MeanMagsSave(char *filename, MeanMags *meanmags, off_t Nmeanmags) {
     96int MeanMagSave(char *filename, MeanMag *meanmags, off_t Nmeanmags) {
    9797
    9898  int i;

  • branches/eam_branches/ipp-20140206/Ohana/src/relphot/src/indexCatalog.c

    r36517 r36518  
    44static int **objIDseq = NULL;
    55
    6 int indexCatalogs (catalog, Ncatalog) {
     6int indexCatalogs (Catalog *catalog, int Ncatalog) {
    77
    88  // find the max value of catID
    … …  
    4242}
    4343
    44 int catID_and_objID_to_seq (int catID, int objID, *catSeq, *objSeq) {
     44int catID_and_objID_to_seq (int catID, int objID, int *catSeq, off_t *objSeq) {
    4545
    4646  int cat = catIDseq[catID];

  • branches/eam_branches/ipp-20140206/Ohana/src/relphot/src/share_mean_mags.c

    r36517 r36518  
    7676
    7777  for (i = 0; i < Nmeanmags; i++) {
    78     objID = meanmags[i].objID;
    79     catID = meanmags[i].catID;
     78    int objID = meanmags[i].objID;
     79    int catID = meanmags[i].catID;
    8080
    8181    // set the mean mag
     82    int catSeq;
     83    off_t objSeq;
    8284    if (!catID_and_objID_to_seq (catID, objID, &catSeq, &objSeq)) {
    8385        // XXX what should I do if this does not match?
Note: See TracChangeset for help on using the changeset viewer.