IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Sep 12, 2005, 3:04:48 PM (21 years ago)
Author:
eugene
Message:

substantial work to enable mode and format selections for DVO:image and DVO:secfilt

Location:
trunk/Ohana/src/relphot/src
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/relphot/src/ConfigInit.c

    r4865 r5014  
    2222  GetConfig (config, "IMAGE_SCATTER",          "%lf", 0, &IMAGE_SCATTER);
    2323  GetConfig (config, "IMAGE_OFFSET",           "%lf", 0, &IMAGE_OFFSET);
    24 
    25   IMAGE_SCATTER *= 1000;
    26   IMAGE_OFFSET *= 1000;
    2724
    2825  GetConfig (config, "STAR_CHISQ",             "%lf", 0, &STAR_CHISQ);

  • trunk/Ohana/src/relphot/src/ImageOps.c

    r4865 r5014  
    145145
    146146  if (image[i].code & IMAGE_BAD)  return (NO_MAG); 
    147   value = 0.001*image[i].Mcal;
     147  value = image[i].Mcal_PS;
    148148  return (value);
    149149}
    … …  
    217217   
    218218    liststats (list, dlist, N, &stats);
    219     image[i].Mcal  = 1000.0*stats.mean;
    220     image[i].dMcal = 1000.0*stats.sigma;
     219    image[i].Mcal_PS  = stats.mean;
     220    image[i].dMcal_PS = stats.sigma;
    221221    image[i].Xm    = 100.0*log10(stats.chisq);
    222222  }
    … …  
    249249  for (i = N = 0; i < Nimage; i++) {
    250250    if (image[i].code & IMAGE_BAD) continue;
    251     mlist[N] = fabs (image[i].Mcal);
    252     slist[N] = image[i].dMcal;
     251    mlist[N] = fabs (image[i].Mcal_PS);
     252    slist[N] = image[i].dMcal_PS;
    253253    dlist[N] = 1;
    254254    N++;
    … …  
    260260  liststats (slist, dlist, N, &stats);
    261261  MaxScatter = MAX (IMAGE_SCATTER, 2*stats.median);
    262   fprintf (stderr, "Mrel: %f, dMrel: %f, Max Scatter: %f, Max Offset: %f\n", 0.001*MedOffset, 0.001*stats.median, 0.001*MaxScatter, 0.001*MaxOffset);
     262  fprintf (stderr, "Mrel: %f, dMrel: %f, Max Scatter: %f, Max Offset: %f\n", MedOffset, stats.median, MaxScatter, MaxOffset);
    263263 
    264264  Nmark = 0;
    … …  
    266266    mark = FALSE;
    267267    image[i].code &= ~ID_IMAGE_POOR;
    268     mark = (image[i].dMcal > MaxScatter) || (fabs(image[i].Mcal - MedOffset) > MaxOffset);
     268    mark = (image[i].dMcal_PS > MaxScatter) || (fabs(image[i].Mcal_PS - MedOffset) > MaxOffset);
    269269    if (mark) {
    270270      Nmark ++;
    … …  
    296296  /**** dMcal vs airmass ****/
    297297  for (i = 0; i < Nimage; i++) {
    298     Mlist[i] = 0.001*image[i].Mcal;
    299     dlist[i] = 0.001*image[i].dMcal;
    300     xlist[i] = 0.001*image[i].secz;
     298    Mlist[i] = image[i].Mcal_PS;
     299    dlist[i] = image[i].dMcal_PS;
     300    xlist[i] = image[i].secz_PS;
    301301  }
    302302
    … …  
    316316  bzero (Mlist, NBIN*sizeof(double));
    317317  for (i = 0; i < Nimage; i++) {
    318     bin = 0.001*image[i].dMcal / 0.0025;
     318    bin = image[i].dMcal_PS / 0.0025;
    319319    bin = MAX (0, MIN (NBIN - 1, bin));
    320320    Mlist[bin] += 1.0;
    … …  
    413413    if (image[i].code & IMAGE_BAD)  continue;
    414414
    415     list[n] = 0.001*image[i].Mcal;
     415    list[n] = image[i].Mcal_PS;
    416416    dlist[n] = 1;
    417417    n++;
    … …  
    441441    if (image[i].code & IMAGE_BAD)  continue;
    442442
    443     list[n] = 0.001*image[i].dMcal;
     443    list[n] = image[i].dMcal_PS;
    444444    dlist[n] = 1;
    445445    n++;

  • trunk/Ohana/src/relphot/src/MosaicOps.c

    r4865 r5014  
    6969    mosaic[Nmosaic].Xm    = 0.0;
    7070    mosaic[Nmosaic].code  = image[i].code;
    71     mosaic[Nmosaic].secz  = image[i].secz;
     71    mosaic[Nmosaic].secz  = image[i].secz_PS;
    7272
    7373    /* add image to mosaic image list */
    … …  
    134134      Dmin = MIN (Dmin, D);
    135135      Dmax = MAX (Dmax, D);
    136       Mcal += 0.001*image[m].Mcal;
    137       dMcal += 0.001*image[m].dMcal;
     136      Mcal += image[m].Mcal_PS;
     137      dMcal += image[m].dMcal_PS;
    138138      Xm += image[m].Xm;
    139139      /* we are using mosaic.Mcal, not image.Mcal. reset image.Mcal */
    140       image[m].Mcal = 0.0;
    141       image[m].dMcal = image[m].Xm = NO_MAG;
     140      image[m].Mcal_PS = 0.0;
     141      image[m].dMcal_PS = image[m].Xm = NO_MAG;
    142142    }
    143143    dS /= Nimlist[i];
    … …  
    179179    for (j = 0; j < Nimlist[i]; j++) {
    180180      im = imlist[i][j];
    181       image[im].Mcal = 1000.0*mosaic[i].Mcal;
    182       image[im].dMcal = 1000.0*mosaic[i].dMcal;
     181      image[im].Mcal_PS = mosaic[i].Mcal;
     182      image[im].dMcal_PS = mosaic[i].dMcal;
    183183      image[im].Xm = mosaic[i].Xm;
    184184      image[im].code |= (mosaic[i].code & ID_IMAGE_FEW);
    … …  
    405405  for (i = 0; i < Nmosaic; i++) {
    406406    if (mosaic[i].code & IMAGE_BAD) continue;
    407     list[n] = 0.001*mosaic[i].Mcal;
     407    list[n] = mosaic[i].Mcal;
    408408    dlist[n] = 1;
    409409    n++;
    … …  
    432432
    433433    if (mosaic[i].code & IMAGE_BAD) continue;
    434     list[n] = 0.001*mosaic[i].dMcal;
     434    list[n] = mosaic[i].dMcal;
    435435    dlist[n] = 1;
    436436    n++;
    … …  
    538538  liststats (slist, dlist, N, &stats);
    539539  MaxScatter = MAX (IMAGE_SCATTER, 2*stats.median);
    540   fprintf (stderr, "Mrel: %f, dMrel: %f, Max Scatter: %f, Max Offset: %f\n", 0.001*MedOffset, 0.001*stats.median, 0.001*MaxScatter, 0.001*MaxOffset);
     540  fprintf (stderr, "Mrel: %f, dMrel: %f, Max Scatter: %f, Max Offset: %f\n", MedOffset, stats.median, MaxScatter, MaxOffset);
    541541 
    542542  Nmark = 0;
    … …  
    618618
    619619  for (i = 0; i < Nmosaic; i++) {
    620     Mlist[i] = 0.001*mosaic[i].Mcal;
    621     dlist[i] = 0.001*mosaic[i].dMcal;
    622     xlist[i] = 0.001*mosaic[i].secz;
     620    Mlist[i] = mosaic[i].Mcal;
     621    dlist[i] = mosaic[i].dMcal;
     622    xlist[i] = mosaic[i].secz;
    623623  }
    624624
    … …  
    640640  bzero (Mlist, NBIN*sizeof(double));
    641641  for (i = 0; i < Nmosaic; i++) {
    642     bin = 0.001*mosaic[i].dMcal / 0.0025;
     642    bin = mosaic[i].dMcal / 0.0025;
    643643    bin = MAX (0, MIN (NBIN - 1, bin));
    644644    Mlist[bin] += 1.0;

  • trunk/Ohana/src/relphot/src/find_images.c

    r4864 r5014  
    104104        if (RESET) {
    105105          assignMcal (&image[nimage], (double *) NULL, -1);
    106           image[nimage].dMcal = NO_MAG;
     106          image[nimage].dMcal_PS = NO_MAG;
    107107          image[nimage].code &= ~ID_IMAGE_POOR;
    108108        }

  • trunk/Ohana/src/relphot/src/gcatalog.c

    r4828 r5014  
    55  char mode;
    66
    7   /* no autodetect for CATMODE yet */
    8   strcpy (catalog[0].catmode, CATMODE);
    9 
    107  if (FINAL) {
    118    mode = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
    … …  
    1310    mode = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
    1411  }   
     12
     13  /* CATMODE and CATFORMAT determined from catalog */
    1514
    1615  if (!load_catalog (catalog, mode, VERBOSE)) {

  • trunk/Ohana/src/relphot/src/wcatalog.c

    r4828 r5014  
    33void wcatalog (Catalog *catalog) {
    44 
    5   /* set catalog format (elixir, loneos, etc) */
    6   if (!strcmp (CATFORMAT, "INTERNAL")) {
    7     sprintf (catalog[0].average_format, "DVO_AVERAGE");
    8     sprintf (catalog[0].measure_format, "DVO_MEASURE");
    9   } else {
    10     sprintf (catalog[0].average_format, "DVO_AVERAGE_%s", CATFORMAT);
    11     sprintf (catalog[0].measure_format, "DVO_MEASURE_%s", CATFORMAT);
    12   }
     5  /* CATMODE and CATFORMAT determined from catalog */
    136
    147  if (!save_catalog (catalog, VERBOSE)) {
Note: See TracChangeset for help on using the changeset viewer.