Index: trunk/Ohana/src/relphot/include/relphot.h =================================================================== --- trunk/Ohana/src/relphot/include/relphot.h (revision 4864) +++ trunk/Ohana/src/relphot/include/relphot.h (revision 4865) @@ -15,8 +15,8 @@ unsigned int start; unsigned int stop; - short int Mcal; - short int dMcal; - short int Xm; - short int secz; + float Mcal; + float dMcal; + short Xm; + float secz; char code; Coords coords; @@ -133,8 +133,8 @@ int gcatalog PROTO((Catalog *catalog, int FINAL)); Coords *getCoords PROTO((int meas, int cat)); -short getMcal PROTO((int meas, int cat)); -short getMgrid PROTO((int meas, int cat)); -short getMmos PROTO((int meas, int cat)); -short getMrel PROTO((Catalog *catalog, int meas, int cat)); +float getMcal PROTO((int meas, int cat)); +float getMgrid PROTO((int meas, int cat)); +float getMmos PROTO((int meas, int cat)); +float getMrel PROTO((Catalog *catalog, int meas, int cat)); GSCRegion *get_regions PROTO((double minRa, double maxRa, double minDec, double maxDec, int *Nregions)); void getfullregion PROTO((Image *image, int Nimage, GSCRegion *fullregion)); Index: trunk/Ohana/src/relphot/src/ConfigInit.c =================================================================== --- trunk/Ohana/src/relphot/src/ConfigInit.c (revision 4864) +++ trunk/Ohana/src/relphot/src/ConfigInit.c (revision 4865) @@ -22,7 +22,5 @@ GetConfig (config, "IMAGE_SCATTER", "%lf", 0, &IMAGE_SCATTER); GetConfig (config, "IMAGE_OFFSET", "%lf", 0, &IMAGE_OFFSET); - MAG_LIM *= 1000; - SIGMA_LIM *= 1000; - STAR_SCATTER *= 1000; + IMAGE_SCATTER *= 1000; IMAGE_OFFSET *= 1000; Index: trunk/Ohana/src/relphot/src/GridOps.v2.c =================================================================== --- trunk/Ohana/src/relphot/src/GridOps.v2.c (revision 4864) +++ trunk/Ohana/src/relphot/src/GridOps.v2.c (revision 4865) @@ -2,6 +2,6 @@ static int Ngrid; -static short *gridM; -static short *gridS; +static float *gridM; +static float *gridS; static int *gridN; static int gridX; @@ -36,9 +36,9 @@ Ngrid = gridX * gridY; - ALLOCATE (gridM, short, Ngrid); - ALLOCATE (gridS, short, Ngrid); + ALLOCATE (gridM, float, Ngrid); + ALLOCATE (gridS, float, Ngrid); ALLOCATE (gridN, int, Ngrid); - bzero (gridM, Ngrid*sizeof(short)); - bzero (gridS, Ngrid*sizeof(short)); + bzero (gridM, Ngrid*sizeof(float)); + bzero (gridS, Ngrid*sizeof(float)); bzero (gridN, Ngrid*sizeof(int)); @@ -87,9 +87,9 @@ Ngrid = gridX * gridY; - ALLOCATE (gridM, short, Ngrid); - ALLOCATE (gridS, short, Ngrid); + ALLOCATE (gridM, float, Ngrid); + ALLOCATE (gridS, float, Ngrid); ALLOCATE (gridN, int, Ngrid); - bzero (gridM, Ngrid*sizeof(short)); - bzero (gridS, Ngrid*sizeof(short)); + bzero (gridM, Ngrid*sizeof(float)); + bzero (gridS, Ngrid*sizeof(float)); bzero (gridN, Ngrid*sizeof(int)); @@ -232,8 +232,8 @@ # endif -short getMgrid (int meas, int cat) { +float getMgrid (int meas, int cat) { int i; - short value; + float value; if (!USE_GRID) return (0); @@ -250,5 +250,5 @@ int i, j, m, c, n, N, Nmax; double *list, *dlist; - short Msys, Mrel, Mcal, Mmos; + float Msys, Mrel, Mcal, Mmos; StatType stats; @@ -276,7 +276,7 @@ n = catalog[c].measure[m].averef; - Msys = iPhotSys (&catalog[c].measure[m], &catalog[c].average[n], &catalog[c].secfilt[n*PhotNsec]); + Msys = PhotSys (&catalog[c].measure[m], &catalog[c].average[n], &catalog[c].secfilt[n*PhotNsec]); list[N] = Msys - Mrel - Mcal - Mmos; - dlist[N] = MAX (catalog[c].measure[m].dM, MIN_ERROR); + dlist[N] = MAX (catalog[c].measure[m].dM_PS, MIN_ERROR); N++; } @@ -294,5 +294,5 @@ int i, j, m, c, n, N; - short Msys, Mrel, Mcal, Mmos; + float Msys, Mrel, Mcal, Mmos; double *xlist, *Mlist, *dlist, *ylist; Graphdata graphdata; @@ -322,5 +322,5 @@ n = catalog[c].measure[m].averef; - Msys = iPhotSys (&catalog[c].measure[m], &catalog[c].average[n], &catalog[c].secfilt[n*PhotNsec]); + Msys = PhotSys (&catalog[c].measure[m], &catalog[c].average[n], &catalog[c].secfilt[n*PhotNsec]); xlist[N] = Xmeas[c][m]; @@ -328,6 +328,4 @@ Mlist[N] = Msys - Mrel - Mcal - Mmos; dlist[N] = Msys - Mrel - Mcal - Mmos - gridM[i]; - Mlist[N] *= 0.001; - dlist[N] *= 0.001; N++; } Index: trunk/Ohana/src/relphot/src/ImageOps.c =================================================================== --- trunk/Ohana/src/relphot/src/ImageOps.c (revision 4864) +++ trunk/Ohana/src/relphot/src/ImageOps.c (revision 4865) @@ -136,8 +136,8 @@ } -short getMcal (int meas, int cat) { +float getMcal (int meas, int cat) { int i; - short value; + float value; i = bin[cat][meas]; @@ -145,5 +145,5 @@ if (image[i].code & IMAGE_BAD) return (NO_MAG); - value = image[i].Mcal; + value = 0.001*image[i].Mcal; return (value); } @@ -162,5 +162,5 @@ int i, j, m, c, n, N, Nmax, mark, bad; - short Msys, Mrel, Mmos, Mgrid; + float Msys, Mrel, Mmos, Mgrid; double *list, *dlist; StatType stats; @@ -199,7 +199,7 @@ n = catalog[c].measure[m].averef; - Msys = iPhotSys (&catalog[c].measure[m], &catalog[c].average[n], &catalog[c].secfilt[n*PhotNsec]); + Msys = PhotSys (&catalog[c].measure[m], &catalog[c].average[n], &catalog[c].secfilt[n*PhotNsec]); list[N] = Msys - Mrel - Mmos - Mgrid; - dlist[N] = MAX (catalog[c].measure[m].dM, MIN_ERROR); + dlist[N] = MAX (catalog[c].measure[m].dM_PS, MIN_ERROR); N++; } @@ -217,6 +217,6 @@ liststats (list, dlist, N, &stats); - image[i].Mcal = stats.mean; - image[i].dMcal = stats.sigma; + image[i].Mcal = 1000.0*stats.mean; + image[i].dMcal = 1000.0*stats.sigma; image[i].Xm = 100.0*log10(stats.chisq); } Index: trunk/Ohana/src/relphot/src/MosaicOps.c =================================================================== --- trunk/Ohana/src/relphot/src/MosaicOps.c (revision 4864) +++ trunk/Ohana/src/relphot/src/MosaicOps.c (revision 4865) @@ -134,6 +134,6 @@ Dmin = MIN (Dmin, D); Dmax = MAX (Dmax, D); - Mcal += image[m].Mcal; - dMcal += image[m].dMcal; + Mcal += 0.001*image[m].Mcal; + dMcal += 0.001*image[m].dMcal; Xm += image[m].Xm; /* we are using mosaic.Mcal, not image.Mcal. reset image.Mcal */ @@ -179,6 +179,6 @@ for (j = 0; j < Nimlist[i]; j++) { im = imlist[i][j]; - image[im].Mcal = mosaic[i].Mcal; - image[im].dMcal = mosaic[i].dMcal; + image[im].Mcal = 1000.0*mosaic[i].Mcal; + image[im].dMcal = 1000.0*mosaic[i].dMcal; image[im].Xm = mosaic[i].Xm; image[im].code |= (mosaic[i].code & ID_IMAGE_FEW); @@ -292,8 +292,8 @@ } -short getMmos (int meas, int cat) { +float getMmos (int meas, int cat) { int i; - short value; + float value; if (!MOSAICNAME[0]) return (0); @@ -309,5 +309,5 @@ int i, j, m, c, n, N, Nmax, mark, bad; - short Msys, Mrel, Mcal, Mgrid; + float Msys, Mrel, Mcal, Mgrid; double *list, *dlist, *Mlist, *dMlist; StatType stats; @@ -351,9 +351,9 @@ n = catalog[c].measure[m].averef; - Msys = iPhotSys (&catalog[c].measure[m], &catalog[c].average[n], &catalog[c].secfilt[n*PhotNsec]); + Msys = PhotSys (&catalog[c].measure[m], &catalog[c].average[n], &catalog[c].secfilt[n*PhotNsec]); list[N] = Msys - Mrel - Mcal - Mgrid; - dlist[N] = MAX (catalog[c].measure[m].dM, MIN_ERROR); - Mlist[N] = 0.001*Msys; - dMlist[N] = 0.001*list[N]; + dlist[N] = MAX (catalog[c].measure[m].dM_PS, MIN_ERROR); + Mlist[N] = Msys; + dMlist[N] = list[N]; N++; } Index: trunk/Ohana/src/relphot/src/StarOps.c =================================================================== --- trunk/Ohana/src/relphot/src/StarOps.c (revision 4864) +++ trunk/Ohana/src/relphot/src/StarOps.c (revision 4865) @@ -20,13 +20,13 @@ } -short getMrel (Catalog *catalog, int meas, int cat) { +float getMrel (Catalog *catalog, int meas, int cat) { int ave; - short value; + float value; ave = catalog[cat].measure[meas].averef; if (catalog[cat].average[ave].code & STAR_BAD) return (NO_MAG); - value = PhotPrimary ? catalog[cat].average[ave].M : catalog[cat].secfilt[PhotNsec*ave+PhotSec].M; + value = PhotPrimary ? catalog[cat].average[ave].M_PS : catalog[cat].secfilt[PhotNsec*ave+PhotSec].M_PS; return (value); } @@ -35,5 +35,5 @@ int i, j, k, m, N; - short Msys, Mcal, Mmos, Mgrid; + float Msys, Mcal, Mmos, Mgrid; StatType stats; @@ -52,7 +52,7 @@ if ((Mgrid = getMgrid (m, i)) == NO_MAG) continue; - Msys = iPhotSys (&catalog[i].measure[m], &catalog[i].average[j], &catalog[i].secfilt[j*PhotNsec]); + Msys = PhotSys (&catalog[i].measure[m], &catalog[i].average[j], &catalog[i].secfilt[j*PhotNsec]); list[N] = Msys - Mcal - Mmos - Mgrid; - dlist[N] = MAX (catalog[i].measure[m].dM, MIN_ERROR); + dlist[N] = MAX (catalog[i].measure[m].dM_PS, MIN_ERROR); N++; } @@ -66,10 +66,10 @@ if (PhotPrimary) { - catalog[i].average[j].M = stats.mean; - catalog[i].average[j].dM = stats.sigma; + catalog[i].average[j].M_PS = stats.mean; + catalog[i].average[j].dM_PS = stats.sigma; catalog[i].average[j].Xm = (stats.Nmeas > 1) ? 100.0*log10(stats.chisq) : NO_MAG; } else { - catalog[i].secfilt[PhotNsec*j+PhotSec].M = stats.mean; - catalog[i].secfilt[PhotNsec*j+PhotSec].dM = stats.sigma; + catalog[i].secfilt[PhotNsec*j+PhotSec].M_PS = stats.mean; + catalog[i].secfilt[PhotNsec*j+PhotSec].dM_PS = stats.sigma; catalog[i].secfilt[PhotNsec*j+PhotSec].Xm = (stats.Nmeas > 1) ? 100.0*log10(stats.chisq) : NO_MAG; } @@ -82,5 +82,5 @@ int i, j, k, m, N, Nmax; - short Msys, Mcal, Mmos, Mgrid; + float Msys, Mcal, Mmos, Mgrid; double *list, *dlist; StatType stats; @@ -110,7 +110,7 @@ if ((Mgrid = getMgrid (m, i)) == NO_MAG) continue; - Msys = iPhotSys (&catalog[i].measure[m], &catalog[i].average[j], &catalog[i].secfilt[j*PhotNsec]); + Msys = PhotSys (&catalog[i].measure[m], &catalog[i].average[j], &catalog[i].secfilt[j*PhotNsec]); list[N] = Msys - Mcal - Mmos - Mgrid; - dlist[N] = MAX (catalog[i].measure[m].dM, MIN_ERROR); + dlist[N] = MAX (catalog[i].measure[m].dM_PS, MIN_ERROR); N++; } @@ -122,10 +122,10 @@ /* use sigma or error in dM for output? */ if (PhotPrimary) { - catalog[i].average[j].M = stats.mean; - catalog[i].average[j].dM = MAX (stats.sigma, stats.error); + catalog[i].average[j].M_PS = stats.mean; + catalog[i].average[j].dM_PS = MAX (stats.sigma, stats.error); catalog[i].average[j].Xm = (stats.Nmeas > 1) ? 100.0*log10(stats.chisq) : NO_MAG; } else { - catalog[i].secfilt[PhotNsec*j+PhotSec].M = stats.mean; - catalog[i].secfilt[PhotNsec*j+PhotSec].dM = MAX (stats.error, stats.sigma); + catalog[i].secfilt[PhotNsec*j+PhotSec].M_PS = stats.mean; + catalog[i].secfilt[PhotNsec*j+PhotSec].dM_PS = MAX (stats.error, stats.sigma); catalog[i].secfilt[PhotNsec*j+PhotSec].Xm = (stats.Nmeas > 1) ? 100.0*log10(stats.chisq) : NO_MAG; } @@ -142,5 +142,5 @@ int i, j, k, m; - short Mcal, Mmos, Mgrid; + float Mcal, Mmos, Mgrid; MEAS_BAD = ID_MEAS_NOCAL; @@ -156,5 +156,5 @@ if ((Mmos = getMmos (m, i)) == NO_MAG) continue; if ((Mgrid = getMgrid (m, i)) == NO_MAG) continue; - catalog[i].measure[m].Mcal = Mcal + Mmos + Mgrid; + catalog[i].measure[m].Mcal_PS = Mcal + Mmos + Mgrid; } } @@ -166,5 +166,5 @@ int i, j, Ndel, Nave, Ntot, mark; - short dM, Xm; + float dM, Xm; double Chisq, MaxScatter, MaxChisq; double *xlist, *slist, *dlist; @@ -187,5 +187,5 @@ Chisq = pow (10.0, 0.01*Xm); xlist[Ntot] = Chisq; - slist[Ntot] = PhotPrimary ? catalog[i].average[j].dM : catalog[i].secfilt[PhotNsec*j+PhotSec].dM; + slist[Ntot] = PhotPrimary ? catalog[i].average[j].dM_PS : catalog[i].secfilt[PhotNsec*j+PhotSec].dM_PS; dlist[Ntot] = 1; Ntot ++; @@ -198,11 +198,11 @@ liststats (slist, dlist, Ntot, &stats); MaxScatter = MAX (STAR_SCATTER, 2*stats.median); - fprintf (stderr, "Max Scatter: %f, Max Chisq: %f\n", 0.001*MaxScatter, MaxChisq); + fprintf (stderr, "Max Scatter: %f, Max Chisq: %f\n", MaxScatter, MaxChisq); Ndel = Nave = 0; for (i = 0; i < Ncatalog; i++) { for (j = 0; j < catalog[i].Naverage; j++) { - dM = PhotPrimary ? catalog[i].average[j].dM : catalog[i].secfilt[PhotNsec*j+PhotSec].dM; - Xm = PhotPrimary ? catalog[i].average[j].Xm : catalog[i].secfilt[PhotNsec*j+PhotSec].Xm; + dM = PhotPrimary ? catalog[i].average[j].dM_PS : catalog[i].secfilt[PhotNsec*j+PhotSec].dM_PS; + Xm = PhotPrimary ? catalog[i].average[j].Xm : catalog[i].secfilt[PhotNsec*j+PhotSec].Xm; Chisq = pow (10.0, 0.01*Xm); mark = (dM > MaxScatter) || (Xm == NO_MAG) || (Chisq > MaxChisq); @@ -228,5 +228,5 @@ int *ilist; double *tlist, *list, *dlist, Ns; - short Msys, Mcal, Mmos, Mgrid; + float Msys, Mcal, Mmos, Mgrid; StatType stats; @@ -267,7 +267,7 @@ if ((Mgrid = getMgrid (m, i)) == NO_MAG) continue; - Msys = iPhotSys (&catalog[i].measure[m], &catalog[i].average[j], &catalog[i].secfilt[j*PhotNsec]); + Msys = PhotSys (&catalog[i].measure[m], &catalog[i].average[j], &catalog[i].secfilt[j*PhotNsec]); list[N] = Msys - Mcal - Mmos - Mgrid; - dlist[N] = MAX (catalog[i].measure[m].dM, MIN_ERROR); + dlist[N] = MAX (catalog[i].measure[m].dM_PS, MIN_ERROR); N++; } @@ -299,7 +299,7 @@ if ((Mgrid = getMgrid (m, i)) == NO_MAG) continue; - Msys = iPhotSys (&catalog[i].measure[m], &catalog[i].average[j], &catalog[i].secfilt[j*PhotNsec]); + Msys = PhotSys (&catalog[i].measure[m], &catalog[i].average[j], &catalog[i].secfilt[j*PhotNsec]); list[N] = Msys - Mcal - Mmos - Mgrid; - dlist[N] = MAX (catalog[i].measure[m].dM, MIN_ERROR); + dlist[N] = MAX (catalog[i].measure[m].dM_PS, MIN_ERROR); ilist[N] = m; N++; @@ -422,6 +422,6 @@ if (catalog[i].average[j].code & STAR_BAD) continue; - dM = PhotPrimary ? catalog[i].average[j].dM : catalog[i].secfilt[PhotNsec*j+PhotSec].dM; - list[n] = 0.001*dM; + dM = PhotPrimary ? catalog[i].average[j].dM_PS : catalog[i].secfilt[PhotNsec*j+PhotSec].dM_PS; + list[n] = dM; dlist[n] = 1; n++; @@ -438,5 +438,5 @@ int i, j, bin; - short dMrel; + float dMrel; double *xlist, *Mlist; Graphdata graphdata; @@ -451,6 +451,6 @@ for (j = 0; j < catalog[i].Naverage; j++) { if (catalog[i].average[j].code & STAR_BAD) continue; - dMrel = PhotPrimary ? catalog[i].average[j].dM : catalog[i].secfilt[PhotNsec*j+PhotSec].dM; - bin = 0.001*dMrel / 0.0025; + dMrel = PhotPrimary ? catalog[i].average[j].dM_PS : catalog[i].secfilt[PhotNsec*j+PhotSec].dM_PS; + bin = dMrel / 0.0025; bin = MAX (0, MIN (NBIN-1, bin)); Mlist[bin] += 1.0; @@ -482,6 +482,6 @@ for (j = 0; j < catalog[i].Naverage; j++) { if (catalog[i].average[j].code & STAR_BAD) continue; - xlist[N] = PhotPrimary ? 0.001*catalog[i].average[j].M : 0.001*catalog[i].secfilt[PhotNsec*j+PhotSec].M; - value = PhotPrimary ? catalog[i].average[j].Xm : catalog[i].secfilt[PhotNsec*j+PhotSec].Xm; + xlist[N] = PhotPrimary ? catalog[i].average[j].M_PS : catalog[i].secfilt[PhotNsec*j+PhotSec].M_PS; + value = PhotPrimary ? catalog[i].average[j].Xm : catalog[i].secfilt[PhotNsec*j+PhotSec].Xm; if (value == NO_MAG) continue; ylist[N] = 0.01*value; Index: trunk/Ohana/src/relphot/src/args.c =================================================================== --- trunk/Ohana/src/relphot/src/args.c (revision 4864) +++ trunk/Ohana/src/relphot/src/args.c (revision 4865) @@ -113,5 +113,5 @@ if ((N = get_argument (argc, argv, "-minerror"))) { remove_argument (N, &argc, argv); - MIN_ERROR = 1000.0*atof (argv[N]); + MIN_ERROR = atof (argv[N]); remove_argument (N, &argc, argv); /* require MIN_ERROR > 0 */ @@ -135,7 +135,7 @@ if ((N = get_argument (argc, argv, "-instmag"))) { remove_argument (N, &argc, argv); - ImagMin = 1000*atof (argv[N]); + ImagMin = atof (argv[N]); remove_argument (N, &argc, argv); - ImagMax = 1000*atof (argv[N]); + ImagMax = atof (argv[N]); remove_argument (N, &argc, argv); ImagSelect = TRUE; Index: trunk/Ohana/src/relphot/src/bcatalog.c =================================================================== --- trunk/Ohana/src/relphot/src/bcatalog.c (revision 4864) +++ trunk/Ohana/src/relphot/src/bcatalog.c (revision 4865) @@ -5,5 +5,5 @@ int i, j, offset, ecode; int NAVERAGE, NMEASURE, Naverage, Nmeasure, Nm; - int mag; + float mag; /* we are moving only the subset of measurements from catalog[0] to subcatalog[0] */ @@ -31,8 +31,8 @@ if (RESET) { - short *p; - p = (PhotPrimary) ? &subcatalog[0].average[Naverage].M : &subcatalog[0].secfilt[PhotNsec*Naverage+PhotSec].M; + float *p; + p = (PhotPrimary) ? &subcatalog[0].average[Naverage].M_PS : &subcatalog[0].secfilt[PhotNsec*Naverage+PhotSec].M_PS; *p = NO_MAG; - p = (PhotPrimary) ? &subcatalog[0].average[Naverage].dM : &subcatalog[0].secfilt[PhotNsec*Naverage+PhotSec].dM; + p = (PhotPrimary) ? &subcatalog[0].average[Naverage].dM_PS : &subcatalog[0].secfilt[PhotNsec*Naverage+PhotSec].dM_PS; *p = NO_MAG; subcatalog[0].average[Naverage].code &= ~ID_STAR_FEW; @@ -59,13 +59,13 @@ /* select measurements by mag limit */ - mag = iPhotCat (&catalog[0].measure[offset]); + mag = PhotCat (&catalog[0].measure[offset]); if (mag > MAG_LIM) continue; /* select measurements by measurement error */ - if (catalog[0].measure[offset].dM > SIGMA_LIM) continue; + if (catalog[0].measure[offset].dM_PS > SIGMA_LIM) continue; /* select measurements by mag limit */ if (ImagSelect) { - mag = iPhotInst (&catalog[0].measure[offset]); + mag = PhotInst (&catalog[0].measure[offset]); if (mag < ImagMin) continue; if (mag > ImagMax) continue; @@ -76,5 +76,5 @@ subcatalog[0].measure[Nmeasure].averef = Naverage; if (RESET) { - subcatalog[0].measure[Nmeasure].Mcal = 0; + subcatalog[0].measure[Nmeasure].Mcal_PS = 0; subcatalog[0].measure[Nmeasure].flags &= 0xff00; subcatalog[0].measure[Nmeasure].flags &= ~ID_MEAS_POOR; Index: trunk/Ohana/src/relphot/src/plot_scatter.c =================================================================== --- trunk/Ohana/src/relphot/src/plot_scatter.c (revision 4864) +++ trunk/Ohana/src/relphot/src/plot_scatter.c (revision 4865) @@ -4,5 +4,5 @@ int i, j, k, m, N, Ntot; - short Mrel, Mcal, Mmos, Mgrid; + float Mrel, Mcal, Mmos, Mgrid; double *xlist, *ylist, *ilist; Graphdata graphdata; @@ -32,10 +32,8 @@ if ((Mgrid = getMgrid (m, i)) == NO_MAG) continue; - Mrel = PhotPrimary ? catalog[i].average[j].M : catalog[i].secfilt[PhotNsec*j+PhotSec].M; + Mrel = PhotPrimary ? catalog[i].average[j].M_PS : catalog[i].secfilt[PhotNsec*j+PhotSec].M_PS; xlist[N] = Mrel; - ylist[N] = iPhotSys (&catalog[i].measure[m], &catalog[i].average[j], &catalog[i].secfilt[j*PhotNsec]) - Mcal - Mmos - Mgrid - Mrel; + ylist[N] = PhotSys (&catalog[i].measure[m], &catalog[i].average[j], &catalog[i].secfilt[j*PhotNsec]) - Mcal - Mmos - Mgrid - Mrel; ilist[N] = PhotInst (&catalog[i].measure[m]); - xlist[N] *= 0.001; - ylist[N] *= 0.001; N++; } Index: trunk/Ohana/src/relphot/src/setMrelFinal.c =================================================================== --- trunk/Ohana/src/relphot/src/setMrelFinal.c (revision 4864) +++ trunk/Ohana/src/relphot/src/setMrelFinal.c (revision 4865) @@ -4,5 +4,6 @@ int i, j, m, ecode; - short *p; + float *p; + short *q; /* if we reset the catalog, reset all the current measurements */ @@ -10,10 +11,10 @@ for (i = 0; i < catalog[0].Naverage; i++) { - p = (PhotPrimary) ? &catalog[0].average[i].M : &catalog[0].secfilt[PhotNsec*i+PhotSec].M; + p = (PhotPrimary) ? &catalog[0].average[i].M_PS : &catalog[0].secfilt[PhotNsec*i+PhotSec].M_PS; *p = NO_MAG; - p = (PhotPrimary) ? &catalog[0].average[i].dM : &catalog[0].secfilt[PhotNsec*i+PhotSec].dM; + p = (PhotPrimary) ? &catalog[0].average[i].dM_PS : &catalog[0].secfilt[PhotNsec*i+PhotSec].dM_PS; *p = NO_MAG; - p = (PhotPrimary) ? &catalog[0].average[i].Xm : &catalog[0].secfilt[PhotNsec*i+PhotSec].Xm; - *p = NO_MAG; + q = (PhotPrimary) ? &catalog[0].average[i].Xm : &catalog[0].secfilt[PhotNsec*i+PhotSec].Xm; + *q = NO_MAG; m = catalog[0].average[i].offset; @@ -30,5 +31,5 @@ } - catalog[0].measure[m].Mcal = 0; + catalog[0].measure[m].Mcal_PS = 0; catalog[0].measure[m].flags &= 0xff00; catalog[0].measure[m].flags &= ~ID_MEAS_POOR; @@ -72,5 +73,5 @@ int i, k, m, ecode, d1, d2; int Ntot, Ntry, Nkeep, Nskip; - short mag; + float mag; Ntot = Ntry = Nskip = Nkeep = 0; @@ -114,5 +115,5 @@ /* skip measurements by inst mag limit */ if ((pass < 4) && ImagSelect) { - mag = iPhotInst (&catalog[0].measure[m]); + mag = PhotInst (&catalog[0].measure[m]); if (mag < ImagMin) goto skip; if (mag > ImagMax) goto skip;