IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Mar 8, 2007, 12:21:18 PM (19 years ago)
Author:
eugene
Message:

complete merge from branch dvo-mods-2007-02

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

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/relphot/include/relphot.h

    r10506 r12332  
    8484
    8585PhotCode      *photcode;
    86 int            PhotPrimary;
    8786int            PhotNsec;
    8887int            PhotSec;

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

    r7080 r12332  
    55  double ZERO_POINT;
    66  char  *config, *file;
    7   char   PhotCodeFile[256];
     7  char CatdirPhotcodeFile[256];
     8  char MasterPhotcodeFile[256];
    89
    910  /*** load configuration info ***/
    … …  
    3233  ScanConfig (config, "CATMODE",                "%s",  0, CATMODE);
    3334  ScanConfig (config, "CATFORMAT",              "%s",  0, CATFORMAT);
     35  ScanConfig (config, "PHOTCODE_FILE",          "%s",  0, MasterPhotcodeFile);
     36
    3437  sprintf (ImageCat, "%s/Images.dat", CATDIR);
    3538
    … …  
    4144  }
    4245
    43   GetConfig (config, "PHOTCODE_FILE",          "%s",  0, PhotCodeFile);
    4446  GetConfig (config, "ZERO_PT",                "%lf", 0, &ZERO_POINT);
    4547
    … …  
    5254  if (*CATFORMAT == 0) strcpy (CATFORMAT, "ELIXIR");
    5355
    54   if (!LoadPhotcodes (PhotCodeFile)) {
    55     fprintf (stderr, "error loading photcodes\n");
     56  /* XXX this does not yet write out the master photcode table */
     57  sprintf (CatdirPhotcodeFile, "%s/Photcodes.dat", CATDIR);
     58  if (!LoadPhotcodes (CatdirPhotcodeFile, MasterPhotcodeFile)) {
     59    fprintf (stderr, "error loading photcode table %s or master file %s\n", CatdirPhotcodeFile, MasterPhotcodeFile);
    5660    exit (1);
    5761  }

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

    r9633 r12332  
    282282      Msys = PhotSys (&catalog[c].measure[m], &catalog[c].average[n], &catalog[c].secfilt[n*PhotNsec]);
    283283      list[N] = Msys - Mrel - Mcal - Mmos;
    284       dlist[N] = MAX (catalog[c].measure[m].dM_PS, MIN_ERROR);
     284      dlist[N] = MAX (catalog[c].measure[m].dM, MIN_ERROR);
    285285      N++;
    286286    }
    … …  
    447447  for (i = 0; i < Nimage; i++) {
    448448    image = getimage (imlist[i]);
    449     pname = GetPhotcodeNamebyCode (image[0].source);
     449    pname = GetPhotcodeNamebyCode (image[0].photcode);
    450450
    451451    /* this is kind of bogus... */

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

    r9633 r12332  
    7575  for (i = 0; i < Ncatalog; i++) {
    7676    for (j = 0; j < catalog[i].Nmeasure; j++) {
    77       ecode = GetPhotcodeEquivCodebyCode (catalog[i].measure[j].source);
     77      ecode = GetPhotcodeEquivCodebyCode (catalog[i].measure[j].photcode);
    7878      if (photcode[0].code != ecode) continue;
    7979      matchImage (catalog, j, i);
    … …  
    8282}
    8383
     84/* XXX convert this to use the values of measure->Xccd,Yccd */
     85/* XXX need to apply the conversion for ELIXIR and LONEOS formats */
    8486void matchImage (Catalog *catalog, int meas, int cat) {
    8587
    … …  
    9193  measure = &catalog[cat].measure[meas];
    9294  for (i = 0; i < Nimage; i++) {
    93     if (image[0].source == -1) continue;
    94     if (measure[0].source != image[i].source) continue;
     95    if (image[0].photcode == -1) continue;
     96    if (measure[0].photcode != image[i].photcode) continue;
    9597    if (measure[0].t < start[i]) continue;
    9698    if (measure[0].t > stop[i]) continue;
    … …  
    100102
    101103      /* identify the ccd on the basis of the photcode name */
    102       pname = GetPhotcodeNamebyCode (image[i].source);
     104      pname = GetPhotcodeNamebyCode (image[i].photcode);
    103105      filter = photcode[0].name;
    104106      sprintf (base, "%s.%s.", MOSAICNAME, filter);
    … …  
    111113      /* add this measurement to the grid cell for this chip */
    112114      ave = measure[0].averef;
    113       ra  = catalog[cat].average[ave].R - measure[0].dR_PS / 3600.0;
    114       dec = catalog[cat].average[ave].D - measure[0].dD_PS / 3600.0;
     115      ra  = catalog[cat].average[ave].R - measure[0].dR / 3600.0;
     116      dec = catalog[cat].average[ave].D - measure[0].dD / 3600.0;
    115117       
    116118      /* X,Y always positive-definite in range 0,0 - dX, dY */
    … …  
    133135    return;
    134136  }
    135   /*  fprintf (stderr, "can't find source image for this measurement: %d (%d)\n", measure[0].t, measure[0].source); */
     137  /*  fprintf (stderr, "can't find source image for this measurement: %d (%d)\n", measure[0].t, measure[0].photcode); */
    136138}
    137139
    … …  
    145147
    146148  if (image[i].code & IMAGE_BAD)  return (NO_MAG); 
    147   value = image[i].Mcal_PS;
     149  value = image[i].Mcal;
    148150  return (value);
    149151}
    … …  
    203205      Msys = PhotSys (&catalog[c].measure[m], &catalog[c].average[n], &catalog[c].secfilt[n*PhotNsec]);
    204206      list[N] = Msys - Mrel - Mmos - Mgrid;
    205       dlist[N] = MAX (catalog[c].measure[m].dM_PS, MIN_ERROR);
     207      dlist[N] = MAX (catalog[c].measure[m].dM, MIN_ERROR);
    206208      N++;
    207209    }
    … …  
    219221   
    220222    liststats (list, dlist, N, &stats);
    221     image[i].Mcal_PS  = stats.mean;
    222     image[i].dMcal_PS = stats.sigma;
     223    image[i].Mcal  = stats.mean;
     224    image[i].dMcal = stats.sigma;
    223225    image[i].Xm    = 100.0*log10(stats.chisq);
    224226  }
    … …  
    251253  for (i = N = 0; i < Nimage; i++) {
    252254    if (image[i].code & IMAGE_BAD) continue;
    253     mlist[N] = fabs (image[i].Mcal_PS);
    254     slist[N] = image[i].dMcal_PS;
     255    mlist[N] = fabs (image[i].Mcal);
     256    slist[N] = image[i].dMcal;
    255257    dlist[N] = 1;
    256258    N++;
    … …  
    268270    mark = FALSE;
    269271    image[i].code &= ~ID_IMAGE_POOR;
    270     mark = (image[i].dMcal_PS > MaxScatter) || (fabs(image[i].Mcal_PS - MedOffset) > MaxOffset);
     272    mark = (image[i].dMcal > MaxScatter) || (fabs(image[i].Mcal - MedOffset) > MaxOffset);
    271273    if (mark) {
    272274      Nmark ++;
    … …  
    298300  /**** dMcal vs airmass ****/
    299301  for (i = 0; i < Nimage; i++) {
    300     Mlist[i] = image[i].Mcal_PS;
    301     dlist[i] = image[i].dMcal_PS;
    302     xlist[i] = image[i].secz_PS;
     302    Mlist[i] = image[i].Mcal;
     303    dlist[i] = image[i].dMcal;
     304    xlist[i] = image[i].secz;
    303305  }
    304306
    … …  
    318320  bzero (Mlist, NBIN*sizeof(double));
    319321  for (i = 0; i < Nimage; i++) {
    320     bin = image[i].dMcal_PS / 0.00025;
     322    bin = image[i].dMcal / 0.00025;
    321323    bin = MAX (0, MIN (NBIN - 1, bin));
    322324    Mlist[bin] += 1.0;
    … …  
    420422    if (image[i].code & IMAGE_BAD)  continue;
    421423
    422     list[n] = image[i].Mcal_PS;
     424    list[n] = image[i].Mcal;
    423425    dlist[n] = 1;
    424426    n++;
    … …  
    448450    if (image[i].code & IMAGE_BAD)  continue;
    449451
    450     list[n] = image[i].dMcal_PS;
     452    list[n] = image[i].dMcal;
    451453    dlist[n] = 1;
    452454    n++;

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

    r9633 r12332  
    3636
    3737    /* select valid mosaic images by photcode */
    38     pname = GetPhotcodeNamebyCode (image[i].source);
     38    pname = GetPhotcodeNamebyCode (image[i].photcode);
    3939    status = strncmp (pname, MOSAICNAME, strlen (MOSAICNAME));
    4040    if (status) continue;
    … …  
    6969    mosaic[Nmosaic].Xm    = 0.0;
    7070    mosaic[Nmosaic].code  = image[i].code;
    71     mosaic[Nmosaic].secz  = image[i].secz_PS;
     71    mosaic[Nmosaic].secz  = image[i].secz;
    7272
    7373    /* add image to mosaic image list */
    … …  
    134134      Dmin = MIN (Dmin, D);
    135135      Dmax = MAX (Dmax, D);
    136       Mcal += image[m].Mcal_PS;
    137       dMcal += image[m].dMcal_PS;
     136      Mcal += image[m].Mcal;
     137      dMcal += image[m].dMcal;
    138138      Xm += image[m].Xm;
    139139      /* we are using mosaic.Mcal, not image.Mcal. reset image.Mcal */
    140       image[m].Mcal_PS = 0.0;
    141       image[m].dMcal_PS = image[m].Xm = NO_MAG;
     140      image[m].Mcal = 0.0;
     141      image[m].dMcal = 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_PS = mosaic[i].Mcal;
    182       image[im].dMcal_PS = mosaic[i].dMcal;
     181      image[im].Mcal = mosaic[i].Mcal;
     182      image[im].dMcal = mosaic[i].dMcal;
    183183      image[im].Xm = mosaic[i].Xm;
    184184      image[im].code |= (mosaic[i].code & ID_IMAGE_FEW);
    … …  
    247247        if (catalog[i].measure[j].t > TSTOP) continue;
    248248      }
    249       ecode = GetPhotcodeEquivCodebyCode (catalog[i].measure[j].source);
     249      ecode = GetPhotcodeEquivCodebyCode (catalog[i].measure[j].photcode);
    250250      if (photcode[0].code != ecode) continue;
    251251      matchMosaics (catalog, j, i);
    … …  
    266266    if (USE_GRID) {
    267267      ave = catalog[cat].measure[meas].averef;
    268       ra  = catalog[cat].average[ave].R_PS - catalog[cat].measure[meas].dR_PS / 3600.0;
    269       dec = catalog[cat].average[ave].D_PS - catalog[cat].measure[meas].dD_PS / 3600.0;
     268      ra  = catalog[cat].average[ave].R - catalog[cat].measure[meas].dR / 3600.0;
     269      dec = catalog[cat].average[ave].D - catalog[cat].measure[meas].dD / 3600.0;
    270270
    271271      /* X,Y always positive-definite in range 0,0 - dX, dY */
    … …  
    355355      Msys = PhotSys (&catalog[c].measure[m], &catalog[c].average[n], &catalog[c].secfilt[n*PhotNsec]);
    356356      list[N]  = Msys - Mrel - Mcal - Mgrid;
    357       dlist[N] = MAX (catalog[c].measure[m].dM_PS, MIN_ERROR);
     357      dlist[N] = MAX (catalog[c].measure[m].dM, MIN_ERROR);
    358358      Mlist[N] = Msys;
    359359      dMlist[N] = list[N];
    … …  
    596596
    597597      ave = catalog[c].measure[m].averef;
    598       xlist[N] = catalog[c].average[ave].R - catalog[c].measure[m].dR_PS / 3600.0;
    599       ylist[N] = catalog[c].average[ave].D - catalog[c].measure[m].dD_PS / 3600.0;
     598      xlist[N] = catalog[c].average[ave].R - catalog[c].measure[m].dR / 3600.0;
     599      ylist[N] = catalog[c].average[ave].D - catalog[c].measure[m].dD / 3600.0;
    600600      N++;
    601601    }

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

    r10506 r12332  
    2828  if (catalog[cat].average[ave].code & STAR_BAD) return (NO_MAG); 
    2929 
    30   value = PhotPrimary ? catalog[cat].average[ave].M : catalog[cat].secfilt[PhotNsec*ave+PhotSec].M_PS;
     30  value = catalog[cat].secfilt[PhotNsec*ave+PhotSec].M;
    3131  return (value);
    3232}
    … …  
    6565        Msys = PhotSys (&catalog[i].measure[m], &catalog[i].average[j], &catalog[i].secfilt[j*PhotNsec]);
    6666        list[N] = Msys - Mcal - Mmos - Mgrid;
    67         dlist[N] = MAX (catalog[i].measure[m].dM_PS, MIN_ERROR);
     67        dlist[N] = MAX (catalog[i].measure[m].dM, MIN_ERROR);
    6868        N++;
    6969      }
    … …  
    7676      liststats (list, dlist, N, &stats);
    7777
    78       if (PhotPrimary) {
    79         catalog[i].average[j].M = stats.mean;
    80         catalog[i].average[j].dM = stats.sigma;
    81         catalog[i].average[j].Xm = (stats.Nmeas > 1) ? 100.0*log10(stats.chisq) : NO_MAG;
    82       } else {
    83         catalog[i].secfilt[PhotNsec*j+PhotSec].M_PS  = stats.mean;
    84         catalog[i].secfilt[PhotNsec*j+PhotSec].dM_PS = stats.sigma;
    85         catalog[i].secfilt[PhotNsec*j+PhotSec].Xm = (stats.Nmeas > 1) ? 100.0*log10(stats.chisq) : NO_MAG;
    86       }     
     78      catalog[i].secfilt[PhotNsec*j+PhotSec].M  = stats.mean;
     79      catalog[i].secfilt[PhotNsec*j+PhotSec].dM = stats.sigma;
     80      catalog[i].secfilt[PhotNsec*j+PhotSec].Xm = (stats.Nmeas > 1) ? 100.0*log10(stats.chisq) : NO_MAG;
    8781    }
    8882  }
    … …  
    130124        Msys = PhotSys (&catalog[i].measure[m], &catalog[i].average[j], &catalog[i].secfilt[j*PhotNsec]);
    131125        list[N] = Msys - Mcal - Mmos - Mgrid;
    132         dlist[N] = MAX (catalog[i].measure[m].dM_PS, MIN_ERROR);
     126        dlist[N] = MAX (catalog[i].measure[m].dM, MIN_ERROR);
    133127        N++;
    134128      }
    … …  
    139133
    140134      /* use sigma or error in dM for output? */
    141       if (PhotPrimary) {
    142         catalog[i].average[j].M = stats.mean;
    143         catalog[i].average[j].dM = MAX (stats.sigma, stats.error);
    144         catalog[i].average[j].Xm = (stats.Nmeas > 1) ? 100.0*log10(stats.chisq) : NO_MAG;
    145       } else {
    146         catalog[i].secfilt[PhotNsec*j+PhotSec].M_PS  = stats.mean;
    147         catalog[i].secfilt[PhotNsec*j+PhotSec].dM_PS = MAX (stats.error, stats.sigma);
    148         catalog[i].secfilt[PhotNsec*j+PhotSec].Xm = (stats.Nmeas > 1) ? 100.0*log10(stats.chisq) : NO_MAG;
    149       }     
     135      catalog[i].secfilt[PhotNsec*j+PhotSec].M  = stats.mean;
     136      catalog[i].secfilt[PhotNsec*j+PhotSec].dM = MAX (stats.error, stats.sigma);
     137      catalog[i].secfilt[PhotNsec*j+PhotSec].Xm = (stats.Nmeas > 1) ? 100.0*log10(stats.chisq) : NO_MAG;
    150138    }
    151139  }
    … …  
    178166        if (Mmos == NO_IMAGE) continue;
    179167        if ((Mgrid = getMgrid (m, i)) == NO_MAG) continue;
    180         catalog[i].measure[m].Mcal_PS = Mcal + Mmos + Mgrid;
     168        catalog[i].measure[m].Mcal = Mcal + Mmos + Mgrid;
    181169      }
    182170    }
    … …  
    205193    for (j = 0; j < catalog[i].Naverage; j++) {
    206194      if (catalog[i].average[j].code & STAR_BAD) continue;
    207       Xm = PhotPrimary ? catalog[i].average[j].Xm : catalog[i].secfilt[PhotNsec*j+PhotSec].Xm;
     195      Xm = catalog[i].secfilt[PhotNsec*j+PhotSec].Xm;
    208196      if (Xm == -1) continue;
    209197      Chisq = pow (10.0, 0.01*Xm);
    210198      xlist[Ntot] = Chisq;
    211       slist[Ntot] = PhotPrimary ? catalog[i].average[j].dM : catalog[i].secfilt[PhotNsec*j+PhotSec].dM_PS;
     199      slist[Ntot] = catalog[i].secfilt[PhotNsec*j+PhotSec].dM;
    212200      dlist[Ntot] = 1;
    213201      Ntot ++;
    … …  
    225213  for (i = 0; i < Ncatalog; i++) {
    226214    for (j = 0; j < catalog[i].Naverage; j++) {
    227       dM = PhotPrimary ? catalog[i].average[j].dM : catalog[i].secfilt[PhotNsec*j+PhotSec].dM_PS;
    228       Xm = PhotPrimary ? catalog[i].average[j].Xm    : catalog[i].secfilt[PhotNsec*j+PhotSec].Xm;
     215      dM = catalog[i].secfilt[PhotNsec*j+PhotSec].dM;
     216      Xm = catalog[i].secfilt[PhotNsec*j+PhotSec].Xm;
    229217      Chisq = pow (10.0, 0.01*Xm);
    230218      mark = (dM > MaxScatter) || (Xm == NO_MAG) || (Chisq > MaxChisq);
    … …  
    295283        Msys = PhotSys (&catalog[i].measure[m], &catalog[i].average[j], &catalog[i].secfilt[j*PhotNsec]);
    296284        list[N] = Msys - Mcal - Mmos - Mgrid;
    297         dlist[N] = MAX (catalog[i].measure[m].dM_PS, MIN_ERROR);
     285        dlist[N] = MAX (catalog[i].measure[m].dM, MIN_ERROR);
    298286        N++;
    299287      }
    … …  
    331319        Msys = PhotSys (&catalog[i].measure[m], &catalog[i].average[j], &catalog[i].secfilt[j*PhotNsec]);
    332320        list[N] = Msys - Mcal - Mmos - Mgrid;
    333         dlist[N] = MAX (catalog[i].measure[m].dM_PS, MIN_ERROR);
     321        dlist[N] = MAX (catalog[i].measure[m].dM, MIN_ERROR);
    334322        ilist[N] = m;
    335323        N++;
    … …  
    422410      if (catalog[i].average[j].code & STAR_BAD) continue; 
    423411
    424       Xm = PhotPrimary ? catalog[i].average[j].Xm : catalog[i].secfilt[PhotNsec*j+PhotSec].Xm;
     412      Xm = catalog[i].secfilt[PhotNsec*j+PhotSec].Xm;
    425413      if (Xm == NO_MAG) continue;
    426414      list[n] = pow (10.0, 0.01*Xm);
    … …  
    458446      if (catalog[i].average[j].code & STAR_BAD) continue; 
    459447
    460       dM = PhotPrimary ? catalog[i].average[j].dM : catalog[i].secfilt[PhotNsec*j+PhotSec].dM_PS;
     448      dM = catalog[i].secfilt[PhotNsec*j+PhotSec].dM;
    461449      list[n] = dM;
    462450      dlist[n] = 1;
    … …  
    487475    for (j = 0; j < catalog[i].Naverage; j++) {
    488476      if (catalog[i].average[j].code & STAR_BAD) continue; 
    489       dMrel = PhotPrimary ? catalog[i].average[j].dM : catalog[i].secfilt[PhotNsec*j+PhotSec].dM_PS;
     477      dMrel = catalog[i].secfilt[PhotNsec*j+PhotSec].dM;
    490478      bin = dMrel / 0.00025;
    491479      bin = MAX (0, MIN (NBIN-1, bin));
    … …  
    518506    for (j = 0; j < catalog[i].Naverage; j++) {
    519507      if (catalog[i].average[j].code & STAR_BAD) continue;
    520       xlist[N] = PhotPrimary ? catalog[i].average[j].M : catalog[i].secfilt[PhotNsec*j+PhotSec].M_PS;
    521       value    = PhotPrimary ? catalog[i].average[j].Xm   : catalog[i].secfilt[PhotNsec*j+PhotSec].Xm;
     508      xlist[N] = catalog[i].secfilt[PhotNsec*j+PhotSec].M;
     509      value    = catalog[i].secfilt[PhotNsec*j+PhotSec].Xm;
    522510      if (value == NO_MAG) continue;
    523511      ylist[N] = 0.01*value;

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

    r11062 r12332  
    2727
    2828    if (RESET) {
    29       float *p;
    30       p = (PhotPrimary) ? &subcatalog[0].average[Naverage].M : &subcatalog[0].secfilt[PhotNsec*Naverage+PhotSec].M_PS;
    31       *p = NO_MAG;
    32       p = (PhotPrimary) ? &subcatalog[0].average[Naverage].dM : &subcatalog[0].secfilt[PhotNsec*Naverage+PhotSec].dM_PS;
    33       *p = NO_MAG;
     29      subcatalog[0].secfilt[PhotNsec*Naverage+PhotSec].M  = NO_MAG;
     30      subcatalog[0].secfilt[PhotNsec*Naverage+PhotSec].dM = NO_MAG;
    3431      subcatalog[0].average[Naverage].code &= ~ID_STAR_FEW;
    3532      subcatalog[0].average[Naverage].code &= ~ID_STAR_POOR;
    … …  
    4239
    4340      /* select measurements by photcode */
    44       ecode = GetPhotcodeEquivCodebyCode (catalog[0].measure[offset].source);
     41      ecode = GetPhotcodeEquivCodebyCode (catalog[0].measure[offset].photcode);
    4542      if (ecode != photcode[0].code) continue;
    4643
    … …  
    6057
    6158      /* select measurements by measurement error */
    62       if ((SIGMA_LIM > 0) && (catalog[0].measure[offset].dM_PS > SIGMA_LIM)) continue;
     59      if ((SIGMA_LIM > 0) && (catalog[0].measure[offset].dM > SIGMA_LIM)) continue;
    6360
    6461      /* select measurements by mag limit */
    … …  
    7370      subcatalog[0].measure[Nmeasure].averef = Naverage;
    7471      if (RESET) {
    75         subcatalog[0].measure[Nmeasure].Mcal_PS = 0;
     72        subcatalog[0].measure[Nmeasure].Mcal = 0;
    7673        subcatalog[0].measure[Nmeasure].flags &= 0xff00;
    7774        subcatalog[0].measure[Nmeasure].flags &= ~ID_MEAS_POOR;

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

    r7080 r12332  
    1313    exit (1);
    1414  }
    15   if ((photcode[0].type != PHOT_PRI) && (photcode[0].type != PHOT_SEC)) {
     15  if (photcode[0].type != PHOT_SEC) {
    1616    fprintf (stderr, "photcode %s is not a primary or secondary filter\n", argv[N]);
    1717    exit (1);
    1818  }
    1919
    20   PhotPrimary = (photcode[0].type == PHOT_PRI);
    2120  PhotNsec = GetPhotcodeNsecfilt ();
    2221  PhotSec = GetPhotcodeNsec (photcode[0].code);

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

    r9633 r12332  
    3636        if ((Mgrid = getMgrid (m, i)) == NO_MAG) continue;
    3737
    38         Mrel = PhotPrimary ? catalog[i].average[j].M : catalog[i].secfilt[PhotNsec*j+PhotSec].M_PS;
     38        Mrel = catalog[i].secfilt[PhotNsec*j+PhotSec].M;
    3939        xlist[N] = Mrel;
    4040        ylist[N] = PhotSys  (&catalog[i].measure[m], &catalog[i].average[j], &catalog[i].secfilt[j*PhotNsec]) - Mcal - Mmos - Mgrid - Mrel;

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

    r10506 r12332  
    4444  /* load catalog data from region files */
    4545  catalog = load_catalogs (skylist, &Ncatalog);
     46 
     47  /* add in a loop over the catalogs calling dvo_catalog_chipcoords */
    4648
    4749  /* match measurements with images, mosaics */

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

    r7082 r12332  
    7676     
    7777    /* exclude images by photcode */
    78     ecode = GetPhotcodeEquivCodebyCode (timage[i].source);
     78    ecode = GetPhotcodeEquivCodebyCode (timage[i].photcode);
    7979    if (ecode != photcode[0].code) continue;
    8080
    … …  
    135135      if (RESET) {
    136136        assignMcal (&image[nimage], (double *) NULL, -1);
    137         image[nimage].dMcal_PS = NO_MAG;
     137        image[nimage].dMcal = NO_MAG;
    138138        image[nimage].code &= ~ID_IMAGE_POOR;
    139139      }

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

    r6683 r12332  
    33int setExclusions (Catalog *catalog, int Ncatalog) {
    44
    5   int i, j, k, m, Narea, Nnocal, ecode;
     5  int i, j, k, m, Narea, Nnocal, Ngood, ecode;
    66  Coords *coords;
    77  double r, d, x, y;
    88
    9   Nnocal = Narea = 0;
     9  Ngood = Nnocal = Narea = 0;
    1010  for (i = 0; i < Ncatalog; i++) {
    1111    for (j = 0; j < catalog[i].Naverage; j++) {
    … …  
    1414
    1515        /* select measurements by photcode */
    16         ecode = GetPhotcodeEquivCodebyCode (catalog[i].measure[m].source);
     16        ecode = GetPhotcodeEquivCodebyCode (catalog[i].measure[m].photcode);
    1717        if (ecode != photcode[0].code) goto mark_nocal;
    1818       
    … …  
    2525        /* select measurements by mag limit */
    2626        if (AreaSelect) {
    27           r = catalog[i].average[j].R + catalog[i].measure[m].dR_PS / 3600.0;
    28           d = catalog[i].average[j].D + catalog[i].measure[m].dD_PS / 3600.0;
     27          r = catalog[i].average[j].R + catalog[i].measure[m].dR / 3600.0;
     28          d = catalog[i].average[j].D + catalog[i].measure[m].dD / 3600.0;
    2929          if ((coords = getCoords (m, i)) == NULL) goto markbad;
    3030          RD_to_XY (&x, &y, r, d, coords);
    … …  
    3434          if (y > AreaYmax) goto markbad;
    3535        }
     36        Ngood ++;
    3637        continue;
    3738
    … …  
    5051  if (VERBOSE) fprintf (stderr, "%d measurements marked by area\n", Narea);
    5152  if (VERBOSE) fprintf (stderr, "%d measurements marked nocal\n", Nnocal);
     53  if (VERBOSE) fprintf (stderr, "%d measurements kept for analysis\n", Ngood);
    5254  return (TRUE);
    5355}

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

    r10506 r12332  
    44
    55  int i, j, m, ecode;
    6   float *p;
    7   short *q;
    86
    97  /* if we reset the catalog, reset all the current measurements */
    … …  
    119
    1210    for (i = 0; i < catalog[0].Naverage; i++) {
    13       p = (PhotPrimary) ? &catalog[0].average[i].M  : &catalog[0].secfilt[PhotNsec*i+PhotSec].M_PS;
    14       *p = NO_MAG;
    15       p = (PhotPrimary) ? &catalog[0].average[i].dM : &catalog[0].secfilt[PhotNsec*i+PhotSec].dM_PS;
    16       *p = NO_MAG;
    17       q = (PhotPrimary) ? &catalog[0].average[i].Xm : &catalog[0].secfilt[PhotNsec*i+PhotSec].Xm;
    18       *q = NO_MAG;
     11      catalog[0].secfilt[PhotNsec*i+PhotSec].M = NO_MAG;
     12      catalog[0].secfilt[PhotNsec*i+PhotSec].dM = NO_MAG;
     13      catalog[0].secfilt[PhotNsec*i+PhotSec].Xm = NO_MAG;
    1914
    2015      m = catalog[0].average[i].offset;
    … …  
    2217       
    2318        /* select measurements by photcode */
    24         ecode = GetPhotcodeEquivCodebyCode (catalog[0].measure[m].source);
     19        ecode = GetPhotcodeEquivCodebyCode (catalog[0].measure[m].photcode);
    2520        if (ecode != photcode[0].code) continue;
    2621       
    … …  
    3126        }
    3227       
    33         catalog[0].measure[m].Mcal_PS = 0;
     28        catalog[0].measure[m].Mcal = 0;
    3429        catalog[0].measure[m].flags &= 0xff00;
    3530        catalog[0].measure[m].flags &= ~ID_MEAS_POOR;
    … …  
    9792      /** never use these measurements (wrong photcode, bad time range) */
    9893      /* skipped via NOCAL, don't mark as skipped */
    99       ecode = GetPhotcodeEquivCodebyCode (catalog[0].measure[m].source);
     94      ecode = GetPhotcodeEquivCodebyCode (catalog[0].measure[m].photcode);
    10095      if (ecode != photcode[0].code) continue;
    10196
Note: See TracChangeset for help on using the changeset viewer.