IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 36616


Ignore:
Timestamp:
Mar 29, 2014, 10:09:08 AM (12 years ago)
Author:
eugene
Message:

free excess memory in relastro & relphot; handle 0,360 boundary in relastro

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

Legend:

Unmodified
Added
Removed

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

    r36574 r36616  
    485485int assign_images (FITS_DB *db, RegionHostTable *regionHosts);
    486486int select_images_hostregion (RegionHostTable *regionHosts, Image *image, off_t Nimage);
    487 int calculate_image_bounds (Image *image, double *rmin, double *rmax, double *dmin, double *dmax);
     487int calculate_image_bounds (Image *image, double *rmin, double *rmax, double *dmin, double *dmax, double Rmid);
    488488int calculate_host_image_bounds (RegionHostTable *regionHosts);
    489489int find_host_for_coords (RegionHostTable *regionHosts, double Rc, double Dc);

  • branches/eam_branches/ipp-20140206/Ohana/src/relastro/src/ImagePosIO.c

    r36574 r36616  
    120120  free (nFitAstrom);
    121121  free (flags     );
     122
     123  gfits_free_header (&header);
     124  gfits_free_matrix (&matrix);
     125  gfits_free_header (&theader);
     126  gfits_free_table  (&ftable);
    122127
    123128  *nimage_pos = Nrow;

  • branches/eam_branches/ipp-20140206/Ohana/src/relastro/src/MeanPosIO.c

    r36564 r36616  
    7676  free (objID);
    7777  free (catID);
     78
     79  // free FITS table pieces...
     80  gfits_free_header (&header);
     81  gfits_free_matrix (&matrix);
     82  gfits_free_header (&theader);
     83  gfits_free_table  (&ftable);
    7884
    7985  *nmeanpos = Nrow;

  • branches/eam_branches/ipp-20140206/Ohana/src/relastro/src/assign_images.c

    r36611 r36616  
    131131    RegionHostInfo *host = &regionHosts->hosts[i];
    132132
     133    // image bounds are defined for a range centered on the image center thus, an image
     134    // with center 0.5 will have chips bounds ranging from ~ -1.5 to +2.5 or so, while an
     135    // image with center 359.5 will have chips bounds ranging from ~ 357.5 to 361.5 or so
    133136    double Rmin, Rmax, Dmin, Dmax;
    134     calculate_image_bounds (&image[j], &Rmin, &Rmax, &Dmin, &Dmax);
     137    calculate_image_bounds (&image[j], &Rmin, &Rmax, &Dmin, &Dmax, Rc);
    135138
    136139    host->RminCat = MIN(Rmin, host->RminCat);
    … …  
    165168double Yf[] = {0.0, 0.0, 1.0, 1.0};
    166169
    167 int calculate_image_bounds (Image *image, double *rmin, double *rmax, double *dmin, double *dmax) {
     170int calculate_image_bounds (Image *image, double *rmin, double *rmax, double *dmin, double *dmax, double Rmid) {
    168171
    169172  int n;
    … …  
    180183    Yc = Yf[n]*image->NY;
    181184    XY_to_RD (&Rc, &Dc, Xc, Yc, &image->coords);
    182     Rc = ohana_normalize_angle_to_midpoint (Rc, 180.0);
     185    Rc = ohana_normalize_angle_to_midpoint (Rc, Rmid);
    183186     
    184187    Rmin = MIN (Rmin, Rc);

  • branches/eam_branches/ipp-20140206/Ohana/src/relastro/src/share_images_pos.c

    r36578 r36616  
    3131  char *iposfile = make_filename (CATDIR, hostname, REGION_HOST_ID, "imagepos.fits");
    3232  ImagePosSave (iposfile, image_pos, Nimage_pos);
     33  free (image_pos);
    3334  free (iposfile);
    3435
    … …  
    8081    images[seq].flags      = image_pos[i].flags     ;
    8182  }
     83  free (image_pos);
    8284
    8385  fprintf (stderr, "DONE grabbing image mags from other hosts\n");

  • branches/eam_branches/ipp-20140206/Ohana/src/relastro/src/share_mean_pos.c

    r36578 r36616  
    4646  char *posfile = make_filename (CATDIR, hostname, REGION_HOST_ID, "meanpos.fits");
    4747  MeanPosSave (posfile, meanpos, Nmeanpos);
     48  free (meanpos);
    4849  free (posfile);
    4950
    … …  
    9798    catalog[catSeq].average[objSeq].D = meanpos[i].D;
    9899  }
     100  free (meanpos);
    99101
    100102  fprintf (stderr, "DONE grabbing mean object pos from other hosts...\n");

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

    r36545 r36616  
    8282  free (objID);
    8383  free (catID);
     84
     85  // free FITS table pieces...
    8486
    8587  *nmeanmags = Nrow;

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

    r36612 r36616  
    3636
    3737  // once we have read this table, we should remove it for repeat runs
    38   unlink (IMAGE_TABLE); // XXX a bit risky, add some protection?
     38  // unlink (IMAGE_TABLE); // XXX a bit risky, add some protection?
    3939
    4040  // XXX need to deal with mosaic vs image...

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

    r36578 r36616  
    3131  char *imagfile = make_filename (CATDIR, hostname, REGION_HOST_ID, "imagemags.fits");
    3232  ImageMagSave (imagfile, image_mags, Nimage_mags);
     33  free (image_mags);
    3334  free (imagfile);
    3435
    … …  
    8182    images[seq].ubercalDist = image_mags[i].ubercalDist;
    8283  }
     84  free (image_mags);
    8385
    8486  fprintf (stderr, "DONE grabbing image mags from other hosts\n");

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

    r36578 r36616  
    5353  char *magsfile = make_filename (CATDIR, hostname, REGION_HOST_ID, "meanmags.fits");
    5454  MeanMagSave (magsfile, meanmags, Nmeanmags);
     55  free (meanmags);
    5556  free (magsfile);
    5657
    … …  
    111112    catalog[catSeq].secfilt[objSeq*Nsecfilt + Nsec].M = meanmags[i].M;
    112113  }
     114  free (meanmags);
    113115
    114116  fprintf (stderr, "DONE grabbing mean object mags from other hosts...\n");
Note: See TracChangeset for help on using the changeset viewer.