IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Mar 7, 2005, 10:21:59 PM (21 years ago)
Author:
eugene
Message:

added mosaic astrometry functions

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/opihi/dvo/photometry.c

    r2598 r3393  
    268268  }
    269269
    270   image = LoadImages (&Nimage);
    271   if (Nimage == 0) {
    272     return (FALSE);
    273   }
     270  if ((image = LoadImages (&Nimage)) == NULL) return (FALSE);
     271  BuildChipMatch (image, Nimage);
    274272  image_subset (image, Nimage, &subset, &Nsubset, graphsky, RegionSelect, tzero, (double) tend - tzero, TimeSelect);
    275 
    276273  sort_image_subset (image, subset, Nsubset);
    277274  return (TRUE);
    … …  
    282279  if (image != NULL) free (image);
    283280  if (subset != NULL) free (subset);
     281  image = NULL;
     282  subset = NULL;
    284283  return;
    285284}
    … …  
    487486
    488487    /* assign value */
     488    value = 0;
    489489    switch (param) {
    490490    case MEAS_MAG: /* magnitudes are already determined above */
    … …  
    531531      dec = average[0].D - measure[i].dD / 360000.0;
    532532      m = match_image_subset (image, subset, Nsubset, measure[i].t, measure[i].source);
    533       if (m == -1) {
    534         value = 0.0;
    535         break;
    536       }
     533      if (m == -1) break;
     534      if (!FindMosaicForImage (image, Nimage, m)) break;
    537535      RD_to_XY (&x, &y, ra, dec, &image[m].coords);
    538536      value = x;
    … …  
    542540      dec = average[0].D - measure[i].dD / 360000.0;
    543541      m = match_image_subset (image, subset, Nsubset, measure[i].t, measure[i].source);
    544       if (m == -1) {
    545         value = 0.0;
    546         break;
    547       }
     542      if (m == -1) break;
     543      if (!FindMosaicForImage (image, Nimage, m)) break;
    548544      RD_to_XY (&x, &y, ra, dec, &image[m].coords);
    549545      value = y;
    … …  
    553549      dec = average[0].D - measure[i].dD / 360000.0;
    554550      m = match_image_subset (image, subset, Nsubset, measure[i].t, measure[i].source);
    555       if (m == -1) {
    556         value = 0.0;
    557         break;
    558       }
     551      if (m == -1) break;
     552      /* this should use the mosaic assoicated with the image */
     553      /* the solution here depends on image.coords having crref1,2 set to match the boresite center */
     554      /* XXX set the mosaic.coords to have a unity WRP transformation in which x,y = ra,dec */
    559555      mosaic.crval1 = image[m].coords.crval1;
    560556      mosaic.crval2 = image[m].coords.crval2;
    … …  
    566562      dec = average[0].D - measure[i].dD / 360000.0;
    567563      m = match_image_subset (image, subset, Nsubset, measure[i].t, measure[i].source);
    568       if (m == -1) {
    569         value = 0.0;
    570         break;
    571       }
     564      if (m == -1) break;
     565      /* same comments as above */
    572566      mosaic.crval1 = image[m].coords.crval1;
    573567      mosaic.crval2 = image[m].coords.crval2;
    … …  
    10081002      TESTMEASURE (measure[j]);
    10091003      SETMAG(M2, measure[j], mode[1]);
    1010       if (use_first)
    1011         n = i;
    1012       else
    1013         n = j;
     1004      n = (use_first) ? i : j;
     1005
    10141006      /* assign value */
     1007      value = 0;
    10151008      switch (param) {
    10161009      case MEAS_MAG: /* magnitudes are already determined above */
    … …  
    10571050      dec = average[0].D - measure[n].dD / 360000.0;
    10581051      m = match_image_subset (image, subset, Nsubset, measure[n].t, measure[n].source);
    1059       if (m == -1) {
    1060         value = 0.0;
    1061         break;
    1062       }
     1052      if (m == -1) break;
     1053      if (!FindMosaicForImage (image, Nimage, m)) break;
    10631054      RD_to_XY (&x, &y, ra, dec, &image[m].coords);
    10641055      value = x;
    … …  
    10681059      dec = average[0].D - measure[n].dD / 360000.0;
    10691060      m = match_image_subset (image, subset, Nsubset, measure[n].t, measure[n].source);
    1070       if (m == -1) {
    1071         value = 0.0;
    1072         break;
    1073       }
     1061      if (m == -1) break;
     1062      if (!FindMosaicForImage (image, Nimage, m)) break;
    10741063      RD_to_XY (&x, &y, ra, dec, &image[m].coords);
    10751064      value = y;
    … …  
    10791068      dec = average[0].D - measure[n].dD / 360000.0;
    10801069      m = match_image_subset (image, subset, Nsubset, measure[n].t, measure[n].source);
    1081       if (m == -1) {
    1082         value = 0.0;
    1083         break;
    1084       }
     1070      if (m == -1) break;
    10851071      mosaic.crval1 = image[m].coords.crval1;
    10861072      mosaic.crval2 = image[m].coords.crval2;
    … …  
    10921078      dec = average[0].D - measure[n].dD / 360000.0;
    10931079      m = match_image_subset (image, subset, Nsubset, measure[n].t, measure[n].source);
    1094       if (m == -1) {
    1095         value = 0.0;
    1096         break;
    1097       }
     1080      if (m == -1) break;
    10981081      mosaic.crval1 = image[m].coords.crval1;
    10991082      mosaic.crval2 = image[m].coords.crval2;
Note: See TracChangeset for help on using the changeset viewer.