IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 37571


Ignore:
Timestamp:
Nov 9, 2014, 8:24:47 AM (12 years ago)
Author:
eugene
Message:

moved BuildChipMatch into LoadImagesDVO, and added the loading of the astrom offset table

Location:
branches/eam_branches/ipp-20140904/Ohana/src/opihi/dvo
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20140904/Ohana/src/opihi/dvo/avmatch.c

    r37435 r37571  
    152152  int needMeasure = dbFieldNeedMeasure (fields, Nfields);
    153153  int needLensobj = dbFieldNeedLensobj (fields, Nfields);
    154   int needStarpar = dbFieldNeedStarpar (fields, Nfields);
     154  int needStarpar = dbFieldNeedStarpar (fields, Nfields, TRUE);
    155155
    156156  /* create output storage vectors */

  • branches/eam_branches/ipp-20140904/Ohana/src/opihi/dvo/gimages.c

    r37386 r37571  
    8585  if ((image = LoadImagesDVO (&Nimage)) == NULL) return (FALSE);
    8686  image_subset (image, Nimage, &subset, &Nsubset, selection, tzero, trange, TimeSelect);
    87   BuildChipMatch (image, Nimage);
     87  // BuildChipMatch (image, Nimage);
    8888
    8989  int DistortImage = wordhash ("-DIS");

  • branches/eam_branches/ipp-20140904/Ohana/src/opihi/dvo/images.c

    r37570 r37571  
    131131  /* it is not an error for the database not to have any images */
    132132  if ((image = LoadImagesDVO (&Nimage)) == NULL) return (TRUE);
    133   BuildChipMatch (image, Nimage);
    134 
    135   // XXX push this and BuildChipMatch into LoadImagesDVO?
    136   char mapfile[DVO_MAX_PATH];
    137   char *catdir = dvo_get_catdir ();
    138   snprintf (mapfile, DVO_MAX_PATH, "%s/AstroMap.fits", catdir);
    139   AstromOffsetTable *table = AstromOffsetMapLoad (mapfile, FALSE);
    140 
    141   // assign images.coords.offsetMap -> table->map[i]
    142   if (table) {
    143     AstromOffsetTableMatchChips (image, Nimage, table);
    144   }
     133  // BuildChipMatch (image, Nimage);
    145134
    146135  if (SOLO_MOSAIC && photcode) {

  • branches/eam_branches/ipp-20140904/Ohana/src/opihi/dvo/imdata.c

    r37378 r37571  
    8787  if ((image = LoadImagesDVO (&Nimage)) == NULL) return (FALSE);
    8888  image_subset (image, Nimage, &subset, &Nsubset, selection, tzero, trange, TimeSelect);
    89   BuildChipMatch (image, Nimage);
     89  // BuildChipMatch (image, Nimage);
    9090  GetTimeFormat (&TimeReference, &TimeFormat);
    9191

  • branches/eam_branches/ipp-20140904/Ohana/src/opihi/dvo/imdense.c

    r37378 r37571  
    2222
    2323  if ((image = LoadImagesDVO (&Nimage)) == NULL) return (FALSE);
    24   BuildChipMatch (image, Nimage);
     24  // BuildChipMatch (image, Nimage);
    2525
    2626  Rmin = graphmode.coords.crval1 - 182.0;

  • branches/eam_branches/ipp-20140904/Ohana/src/opihi/dvo/imextract.c

    r37049 r37571  
    9090
    9191  if ((image = LoadImagesDVO (&Nimage)) == NULL) goto escape;
    92   BuildChipMatch (image, Nimage);
     92  // BuildChipMatch (image, Nimage);
    9393  dbExtractImagesInit ();
    9494

  • branches/eam_branches/ipp-20140904/Ohana/src/opihi/dvo/imlist.c

    r37378 r37571  
    8383  if ((image = LoadImagesDVO (&Nimage)) == NULL) return (FALSE);
    8484  image_subset (image, Nimage, &subset, &Nsubset, selection, tzero, trange, TimeSelect);
    85   BuildChipMatch (image, Nimage);
     85  // BuildChipMatch (image, Nimage);
    8686
    8787  GetTimeFormat (&TimeReference, &TimeFormat);

  • branches/eam_branches/ipp-20140904/Ohana/src/opihi/dvo/imstats.c

    r37378 r37571  
    3131
    3232  if ((image = LoadImagesDVO (&Nimage)) == NULL) return (FALSE);
    33   BuildChipMatch (image, Nimage);
     33  // BuildChipMatch (image, Nimage);
    3434
    3535  /* assign vector values */

  • branches/eam_branches/ipp-20140904/Ohana/src/opihi/dvo/mmatch.c

    r35416 r37571  
    233233  ALLOCATE (index, off_t, Nelem);
    234234
     235  // int needLensing = dbFieldNeedLensing (fields, Nfields);
     236  int needStarpar = dbFieldNeedStarpar (fields, Nfields, FALSE);
     237
    235238  // grab data from all selected sky regions
    236239  Signal = signal (SIGINT, handle_interrupt);
    … …  
    246249    catalog.filename = HOST_ID ? hostfile : skylist[0].filename[i];
    247250    catalog.catflags = LOAD_AVES | LOAD_SECF | LOAD_MEAS;
     251    catalog.catflags |= needStarpar ? LOAD_STARPAR : SKIP_STARPAR;
    248252    catalog.Nsecfilt = Nsecfilt;
    249253
    … …  
    282286        // extract the relevant values for this measurement
    283287        dbExtractMeasuresInitMeas (); // reset counters for saved fields  (costs very little
     288
     289        Average *average = &catalog.average[Ncat];
     290
     291        int Nstarpar = average->starparOffset;
     292        StarPar *starpar = needStarpar ? &catalog.starpar[Nstarpar] : NULL;
     293
     294        // int Nlensing = average->lensobjOffset;
     295        // Lensobj *lensobj = needLensobj ? &catalog.lensobj[m] : NULL;
     296
     297        int Nsec = Ncat*Nsecfilt;
     298        SecFilt *secfilt = &catalog.secfilt[Nsec];
     299
    284300        for (n = 0; n < Nfields; n++) {
    285           values[n] = dbExtractMeasures (&catalog.average[Ncat], &catalog.secfilt[Ncat*Nsecfilt], &catalog.measure[m], &fields[n]);
     301          values[n] = dbExtractMeasures (average, secfilt, &catalog.measure[m], NULL, starpar, &fields[n]);
    286302        }
    287303

  • branches/eam_branches/ipp-20140904/Ohana/src/opihi/dvo/mmextract.c

    r35263 r37571  
    174174  }
    175175
     176  // int needLensing = dbFieldNeedLensing (fields, Nfields);
     177  int needStarpar = dbFieldNeedStarpar (fields, Nfields, FALSE);
     178
    176179  // grab data from all selected sky regions
    177180  Signal = signal (SIGINT, handle_interrupt);
    … …  
    213216        // extract the relevant values for this measurement
    214217        dbExtractMeasuresInitMeas (); // reset counters for saved fields
     218
     219        Average *average = &catalog.average[j];
     220
     221        int Nstarpar = average->starparOffset;
     222        StarPar *starpar = needStarpar ? &catalog.starpar[Nstarpar] : NULL;
     223
     224        // int Nlensing = average->lensobjOffset;
     225        // Lensobj *lensobj = needLensobj ? &catalog.lensobj[m] : NULL;
     226
     227        int Nsec = j*Nsecfilt;
     228        SecFilt *secfilt = &catalog.secfilt[Nsec];
     229
    215230        for (n = 0; n < Nfields; n++) {
    216231          // values needs to be a pointer to a type with FLT and INT (with a union, we would save a bit of memory...)
    217           values[n] = dbExtractMeasures (&catalog.average[j], &catalog.secfilt[j*Nsecfilt], &catalog.measure[m], &fields[n]);
     232          values[n] = dbExtractMeasures (average, secfilt, &catalog.measure[m], NULL, starpar, &fields[n]);
    218233        }
    219234        // fprintf (stderr, "object: ave: %f, cat: %f, averef %d\n", fields[n].name, values[2], values[3], catalog.measure[m].averef);

  • branches/eam_branches/ipp-20140904/Ohana/src/opihi/dvo/skycoverage.c

    r37531 r37571  
    219219      return (FALSE);
    220220  }
    221   BuildChipMatch (image, Nimage);
     221  // BuildChipMatch (image, Nimage);
    222222
    223223  V = (float *)buf[0].matrix.buffer;

  • branches/eam_branches/ipp-20140904/Ohana/src/opihi/dvo/subpix.c

    r37378 r37571  
    115115  /* load all images, extract those touching Ra, Dec */
    116116  if ((image = LoadImagesDVO (&Nimage)) == NULL) return (FALSE);
    117   BuildChipMatch (image, Nimage);
     117  // BuildChipMatch (image, Nimage);
    118118
    119119  for (i = 0; i < Nimage; i++) {
Note: See TracChangeset for help on using the changeset viewer.