IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Aug 24, 2005, 8:51:56 AM (21 years ago)
Author:
eugene
Message:

adding internal vs external formats for average, measure, secfilt

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

Legend:

Unmodified
Added
Removed

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

    r4864 r4865  
    1515  unsigned int start;
    1616  unsigned int stop;
    17   short int Mcal;
    18   short int dMcal;
    19   short int Xm;
    20   short int secz;
     17  float Mcal;
     18  float dMcal;
     19  short Xm;
     20  float secz;
    2121  char code;
    2222  Coords coords;
    … …  
    133133int           gcatalog            PROTO((Catalog *catalog, int FINAL));
    134134Coords       *getCoords           PROTO((int meas, int cat));
    135 short         getMcal             PROTO((int meas, int cat));
    136 short         getMgrid            PROTO((int meas, int cat));
    137 short         getMmos             PROTO((int meas, int cat));
    138 short         getMrel             PROTO((Catalog *catalog, int meas, int cat));
     135float         getMcal             PROTO((int meas, int cat));
     136float         getMgrid            PROTO((int meas, int cat));
     137float         getMmos             PROTO((int meas, int cat));
     138float         getMrel             PROTO((Catalog *catalog, int meas, int cat));
    139139GSCRegion    *get_regions         PROTO((double minRa, double maxRa, double minDec, double maxDec, int *Nregions));
    140140void          getfullregion       PROTO((Image *image, int Nimage, GSCRegion *fullregion));

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

    r4828 r4865  
    2222  GetConfig (config, "IMAGE_SCATTER",          "%lf", 0, &IMAGE_SCATTER);
    2323  GetConfig (config, "IMAGE_OFFSET",           "%lf", 0, &IMAGE_OFFSET);
    24   MAG_LIM *= 1000;
    25   SIGMA_LIM *= 1000;
    26   STAR_SCATTER *= 1000;
     24
    2725  IMAGE_SCATTER *= 1000;
    2826  IMAGE_OFFSET *= 1000;

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

    r4796 r4865  
    22
    33static int     Ngrid;
    4 static short   *gridM;
    5 static short   *gridS;
     4static float   *gridM;
     5static float   *gridS;
    66static int     *gridN;
    77static int      gridX;
    … …  
    3636  Ngrid = gridX * gridY;
    3737
    38   ALLOCATE (gridM, short, Ngrid);
    39   ALLOCATE (gridS, short, Ngrid);
     38  ALLOCATE (gridM, float, Ngrid);
     39  ALLOCATE (gridS, float, Ngrid);
    4040  ALLOCATE (gridN, int,   Ngrid);
    41   bzero (gridM, Ngrid*sizeof(short));
    42   bzero (gridS, Ngrid*sizeof(short));
     41  bzero (gridM, Ngrid*sizeof(float));
     42  bzero (gridS, Ngrid*sizeof(float));
    4343  bzero (gridN, Ngrid*sizeof(int));
    4444
    … …  
    8787  Ngrid = gridX * gridY;
    8888
    89   ALLOCATE (gridM, short, Ngrid);
    90   ALLOCATE (gridS, short, Ngrid);
     89  ALLOCATE (gridM, float, Ngrid);
     90  ALLOCATE (gridS, float, Ngrid);
    9191  ALLOCATE (gridN, int,   Ngrid);
    92   bzero (gridM, Ngrid*sizeof(short));
    93   bzero (gridS, Ngrid*sizeof(short));
     92  bzero (gridM, Ngrid*sizeof(float));
     93  bzero (gridS, Ngrid*sizeof(float));
    9494  bzero (gridN, Ngrid*sizeof(int));
    9595
    … …  
    232232# endif
    233233
    234 short getMgrid (int meas, int cat) {
     234float getMgrid (int meas, int cat) {
    235235
    236236  int i;
    237   short value;
     237  float value;
    238238
    239239  if (!USE_GRID) return (0);
    … …  
    250250  int i, j, m, c, n, N, Nmax;
    251251  double *list, *dlist;
    252   short Msys, Mrel, Mcal, Mmos;
     252  float Msys, Mrel, Mcal, Mmos;
    253253  StatType stats;
    254254 
    … …  
    276276     
    277277      n = catalog[c].measure[m].averef;
    278       Msys = iPhotSys (&catalog[c].measure[m], &catalog[c].average[n], &catalog[c].secfilt[n*PhotNsec]);
     278      Msys = PhotSys (&catalog[c].measure[m], &catalog[c].average[n], &catalog[c].secfilt[n*PhotNsec]);
    279279      list[N] = Msys - Mrel - Mcal - Mmos;
    280       dlist[N] = MAX (catalog[c].measure[m].dM, MIN_ERROR);
     280      dlist[N] = MAX (catalog[c].measure[m].dM_PS, MIN_ERROR);
    281281      N++;
    282282    }
    … …  
    294294
    295295  int i, j, m, c, n, N;
    296   short Msys, Mrel, Mcal, Mmos;
     296  float Msys, Mrel, Mcal, Mmos;
    297297  double *xlist, *Mlist, *dlist, *ylist;
    298298  Graphdata graphdata;
    … …  
    322322
    323323      n = catalog[c].measure[m].averef;
    324       Msys = iPhotSys (&catalog[c].measure[m], &catalog[c].average[n], &catalog[c].secfilt[n*PhotNsec]);
     324      Msys = PhotSys (&catalog[c].measure[m], &catalog[c].average[n], &catalog[c].secfilt[n*PhotNsec]);
    325325
    326326      xlist[N] = Xmeas[c][m];
    … …  
    328328      Mlist[N] = Msys - Mrel - Mcal - Mmos;
    329329      dlist[N] = Msys - Mrel - Mcal - Mmos - gridM[i];
    330       Mlist[N] *= 0.001;
    331       dlist[N] *= 0.001;
    332330      N++;
    333331    }

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

    r4796 r4865  
    136136}
    137137
    138 short getMcal (int meas, int cat) {
     138float getMcal (int meas, int cat) {
    139139
    140140  int i;
    141   short value;
     141  float value;
    142142
    143143  i = bin[cat][meas];
    … …  
    145145
    146146  if (image[i].code & IMAGE_BAD)  return (NO_MAG); 
    147   value = image[i].Mcal;
     147  value = 0.001*image[i].Mcal;
    148148  return (value);
    149149}
    … …  
    162162
    163163  int i, j, m, c, n, N, Nmax, mark, bad;
    164   short Msys, Mrel, Mmos, Mgrid;
     164  float Msys, Mrel, Mmos, Mgrid;
    165165  double *list, *dlist;
    166166  StatType stats;
    … …  
    199199     
    200200      n = catalog[c].measure[m].averef;
    201       Msys = iPhotSys (&catalog[c].measure[m], &catalog[c].average[n], &catalog[c].secfilt[n*PhotNsec]);
     201      Msys = PhotSys (&catalog[c].measure[m], &catalog[c].average[n], &catalog[c].secfilt[n*PhotNsec]);
    202202      list[N] = Msys - Mrel - Mmos - Mgrid;
    203       dlist[N] = MAX (catalog[c].measure[m].dM, MIN_ERROR);
     203      dlist[N] = MAX (catalog[c].measure[m].dM_PS, MIN_ERROR);
    204204      N++;
    205205    }
    … …  
    217217   
    218218    liststats (list, dlist, N, &stats);
    219     image[i].Mcal  = stats.mean;
    220     image[i].dMcal = stats.sigma;
     219    image[i].Mcal  = 1000.0*stats.mean;
     220    image[i].dMcal = 1000.0*stats.sigma;
    221221    image[i].Xm    = 100.0*log10(stats.chisq);
    222222  }

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

    r4864 r4865  
    134134      Dmin = MIN (Dmin, D);
    135135      Dmax = MAX (Dmax, D);
    136       Mcal += image[m].Mcal;
    137       dMcal += image[m].dMcal;
     136      Mcal += 0.001*image[m].Mcal;
     137      dMcal += 0.001*image[m].dMcal;
    138138      Xm += image[m].Xm;
    139139      /* we are using mosaic.Mcal, not image.Mcal. reset image.Mcal */
    … …  
    179179    for (j = 0; j < Nimlist[i]; j++) {
    180180      im = imlist[i][j];
    181       image[im].Mcal = mosaic[i].Mcal;
    182       image[im].dMcal = mosaic[i].dMcal;
     181      image[im].Mcal = 1000.0*mosaic[i].Mcal;
     182      image[im].dMcal = 1000.0*mosaic[i].dMcal;
    183183      image[im].Xm = mosaic[i].Xm;
    184184      image[im].code |= (mosaic[i].code & ID_IMAGE_FEW);
    … …  
    292292}
    293293
    294 short getMmos (int meas, int cat) {
     294float getMmos (int meas, int cat) {
    295295
    296296  int i;
    297   short value;
     297  float value;
    298298
    299299  if (!MOSAICNAME[0]) return (0);
    … …  
    309309
    310310  int i, j, m, c, n, N, Nmax, mark, bad;
    311   short Msys, Mrel, Mcal, Mgrid;
     311  float Msys, Mrel, Mcal, Mgrid;
    312312  double *list, *dlist, *Mlist, *dMlist;
    313313  StatType stats;
    … …  
    351351     
    352352      n = catalog[c].measure[m].averef;
    353       Msys = iPhotSys (&catalog[c].measure[m], &catalog[c].average[n], &catalog[c].secfilt[n*PhotNsec]);
     353      Msys = PhotSys (&catalog[c].measure[m], &catalog[c].average[n], &catalog[c].secfilt[n*PhotNsec]);
    354354      list[N]  = Msys - Mrel - Mcal - Mgrid;
    355       dlist[N] = MAX (catalog[c].measure[m].dM, MIN_ERROR);
    356       Mlist[N] = 0.001*Msys;
    357       dMlist[N] = 0.001*list[N];
     355      dlist[N] = MAX (catalog[c].measure[m].dM_PS, MIN_ERROR);
     356      Mlist[N] = Msys;
     357      dMlist[N] = list[N];
    358358      N++;
    359359    }

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

    r4796 r4865  
    2020} 
    2121
    22 short getMrel (Catalog *catalog, int meas, int cat) {
     22float getMrel (Catalog *catalog, int meas, int cat) {
    2323
    2424  int ave;
    25   short value;
     25  float value;
    2626
    2727  ave = catalog[cat].measure[meas].averef;
    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;
     30  value = PhotPrimary ? catalog[cat].average[ave].M_PS : catalog[cat].secfilt[PhotNsec*ave+PhotSec].M_PS;
    3131  return (value);
    3232}
    … …  
    3535
    3636  int i, j, k, m, N;
    37   short Msys, Mcal, Mmos, Mgrid;
     37  float Msys, Mcal, Mmos, Mgrid;
    3838  StatType stats;
    3939
    … …  
    5252        if ((Mgrid = getMgrid (m, i)) == NO_MAG) continue;
    5353
    54         Msys = iPhotSys (&catalog[i].measure[m], &catalog[i].average[j], &catalog[i].secfilt[j*PhotNsec]);
     54        Msys = PhotSys (&catalog[i].measure[m], &catalog[i].average[j], &catalog[i].secfilt[j*PhotNsec]);
    5555        list[N] = Msys - Mcal - Mmos - Mgrid;
    56         dlist[N] = MAX (catalog[i].measure[m].dM, MIN_ERROR);
     56        dlist[N] = MAX (catalog[i].measure[m].dM_PS, MIN_ERROR);
    5757        N++;
    5858      }
    … …  
    6666
    6767      if (PhotPrimary) {
    68         catalog[i].average[j].M = stats.mean;
    69         catalog[i].average[j].dM = stats.sigma;
     68        catalog[i].average[j].M_PS = stats.mean;
     69        catalog[i].average[j].dM_PS = stats.sigma;
    7070        catalog[i].average[j].Xm = (stats.Nmeas > 1) ? 100.0*log10(stats.chisq) : NO_MAG;
    7171      } else {
    72         catalog[i].secfilt[PhotNsec*j+PhotSec].M  = stats.mean;
    73         catalog[i].secfilt[PhotNsec*j+PhotSec].dM = stats.sigma;
     72        catalog[i].secfilt[PhotNsec*j+PhotSec].M_PS  = stats.mean;
     73        catalog[i].secfilt[PhotNsec*j+PhotSec].dM_PS = stats.sigma;
    7474        catalog[i].secfilt[PhotNsec*j+PhotSec].Xm = (stats.Nmeas > 1) ? 100.0*log10(stats.chisq) : NO_MAG;
    7575      }     
    … …  
    8282
    8383  int i, j, k, m, N, Nmax;
    84   short Msys, Mcal, Mmos, Mgrid;
     84  float Msys, Mcal, Mmos, Mgrid;
    8585  double *list, *dlist;
    8686  StatType stats;
    … …  
    110110        if ((Mgrid = getMgrid (m, i)) == NO_MAG) continue;
    111111
    112         Msys = iPhotSys (&catalog[i].measure[m], &catalog[i].average[j], &catalog[i].secfilt[j*PhotNsec]);
     112        Msys = PhotSys (&catalog[i].measure[m], &catalog[i].average[j], &catalog[i].secfilt[j*PhotNsec]);
    113113        list[N] = Msys - Mcal - Mmos - Mgrid;
    114         dlist[N] = MAX (catalog[i].measure[m].dM, MIN_ERROR);
     114        dlist[N] = MAX (catalog[i].measure[m].dM_PS, MIN_ERROR);
    115115        N++;
    116116      }
    … …  
    122122      /* use sigma or error in dM for output? */
    123123      if (PhotPrimary) {
    124         catalog[i].average[j].M = stats.mean;
    125         catalog[i].average[j].dM = MAX (stats.sigma, stats.error);
     124        catalog[i].average[j].M_PS = stats.mean;
     125        catalog[i].average[j].dM_PS = MAX (stats.sigma, stats.error);
    126126        catalog[i].average[j].Xm = (stats.Nmeas > 1) ? 100.0*log10(stats.chisq) : NO_MAG;
    127127      } else {
    128         catalog[i].secfilt[PhotNsec*j+PhotSec].M  = stats.mean;
    129         catalog[i].secfilt[PhotNsec*j+PhotSec].dM = MAX (stats.error, stats.sigma);
     128        catalog[i].secfilt[PhotNsec*j+PhotSec].M_PS  = stats.mean;
     129        catalog[i].secfilt[PhotNsec*j+PhotSec].dM_PS = MAX (stats.error, stats.sigma);
    130130        catalog[i].secfilt[PhotNsec*j+PhotSec].Xm = (stats.Nmeas > 1) ? 100.0*log10(stats.chisq) : NO_MAG;
    131131      }     
    … …  
    142142
    143143  int i, j, k, m;
    144   short Mcal, Mmos, Mgrid;
     144  float Mcal, Mmos, Mgrid;
    145145
    146146  MEAS_BAD = ID_MEAS_NOCAL;
    … …  
    156156        if ((Mmos  = getMmos  (m, i)) == NO_MAG) continue;
    157157        if ((Mgrid = getMgrid (m, i)) == NO_MAG) continue;
    158         catalog[i].measure[m].Mcal = Mcal + Mmos + Mgrid;
     158        catalog[i].measure[m].Mcal_PS = Mcal + Mmos + Mgrid;
    159159      }
    160160    }
    … …  
    166166
    167167  int i, j, Ndel, Nave, Ntot, mark;
    168   short dM, Xm;
     168  float dM, Xm;
    169169  double Chisq, MaxScatter, MaxChisq;
    170170  double *xlist, *slist, *dlist;
    … …  
    187187      Chisq = pow (10.0, 0.01*Xm);
    188188      xlist[Ntot] = Chisq;
    189       slist[Ntot] = PhotPrimary ? catalog[i].average[j].dM : catalog[i].secfilt[PhotNsec*j+PhotSec].dM;
     189      slist[Ntot] = PhotPrimary ? catalog[i].average[j].dM_PS : catalog[i].secfilt[PhotNsec*j+PhotSec].dM_PS;
    190190      dlist[Ntot] = 1;
    191191      Ntot ++;
    … …  
    198198  liststats (slist, dlist, Ntot, &stats);
    199199  MaxScatter = MAX (STAR_SCATTER, 2*stats.median);
    200   fprintf (stderr, "Max Scatter: %f, Max Chisq: %f\n", 0.001*MaxScatter, MaxChisq);
     200  fprintf (stderr, "Max Scatter: %f, Max Chisq: %f\n", MaxScatter, MaxChisq);
    201201
    202202  Ndel = Nave = 0;
    203203  for (i = 0; i < Ncatalog; i++) {
    204204    for (j = 0; j < catalog[i].Naverage; j++) {
    205       dM = PhotPrimary ? catalog[i].average[j].dM : catalog[i].secfilt[PhotNsec*j+PhotSec].dM;
    206       Xm = PhotPrimary ? catalog[i].average[j].Xm : catalog[i].secfilt[PhotNsec*j+PhotSec].Xm;
     205      dM = PhotPrimary ? catalog[i].average[j].dM_PS : catalog[i].secfilt[PhotNsec*j+PhotSec].dM_PS;
     206      Xm = PhotPrimary ? catalog[i].average[j].Xm    : catalog[i].secfilt[PhotNsec*j+PhotSec].Xm;
    207207      Chisq = pow (10.0, 0.01*Xm);
    208208      mark = (dM > MaxScatter) || (Xm == NO_MAG) || (Chisq > MaxChisq);
    … …  
    228228  int *ilist;
    229229  double *tlist, *list, *dlist, Ns;
    230   short Msys, Mcal, Mmos, Mgrid;
     230  float Msys, Mcal, Mmos, Mgrid;
    231231  StatType stats;
    232232
    … …  
    267267        if ((Mgrid = getMgrid (m, i)) == NO_MAG) continue;
    268268
    269         Msys = iPhotSys (&catalog[i].measure[m], &catalog[i].average[j], &catalog[i].secfilt[j*PhotNsec]);
     269        Msys = PhotSys (&catalog[i].measure[m], &catalog[i].average[j], &catalog[i].secfilt[j*PhotNsec]);
    270270        list[N] = Msys - Mcal - Mmos - Mgrid;
    271         dlist[N] = MAX (catalog[i].measure[m].dM, MIN_ERROR);
     271        dlist[N] = MAX (catalog[i].measure[m].dM_PS, MIN_ERROR);
    272272        N++;
    273273      }
    … …  
    299299        if ((Mgrid = getMgrid (m, i)) == NO_MAG) continue;
    300300
    301         Msys = iPhotSys (&catalog[i].measure[m], &catalog[i].average[j], &catalog[i].secfilt[j*PhotNsec]);
     301        Msys = PhotSys (&catalog[i].measure[m], &catalog[i].average[j], &catalog[i].secfilt[j*PhotNsec]);
    302302        list[N] = Msys - Mcal - Mmos - Mgrid;
    303         dlist[N] = MAX (catalog[i].measure[m].dM, MIN_ERROR);
     303        dlist[N] = MAX (catalog[i].measure[m].dM_PS, MIN_ERROR);
    304304        ilist[N] = m;
    305305        N++;
    … …  
    422422      if (catalog[i].average[j].code & STAR_BAD) continue; 
    423423
    424       dM = PhotPrimary ? catalog[i].average[j].dM : catalog[i].secfilt[PhotNsec*j+PhotSec].dM;
    425       list[n] = 0.001*dM;
     424      dM = PhotPrimary ? catalog[i].average[j].dM_PS : catalog[i].secfilt[PhotNsec*j+PhotSec].dM_PS;
     425      list[n] = dM;
    426426      dlist[n] = 1;
    427427      n++;
    … …  
    438438
    439439  int i, j, bin;
    440   short dMrel;
     440  float dMrel;
    441441  double *xlist, *Mlist;
    442442  Graphdata graphdata;
    … …  
    451451    for (j = 0; j < catalog[i].Naverage; j++) {
    452452      if (catalog[i].average[j].code & STAR_BAD) continue; 
    453       dMrel = PhotPrimary ? catalog[i].average[j].dM : catalog[i].secfilt[PhotNsec*j+PhotSec].dM;
    454       bin = 0.001*dMrel / 0.0025;
     453      dMrel = PhotPrimary ? catalog[i].average[j].dM_PS : catalog[i].secfilt[PhotNsec*j+PhotSec].dM_PS;
     454      bin = dMrel / 0.0025;
    455455      bin = MAX (0, MIN (NBIN-1, bin));
    456456      Mlist[bin] += 1.0;
    … …  
    482482    for (j = 0; j < catalog[i].Naverage; j++) {
    483483      if (catalog[i].average[j].code & STAR_BAD) continue;
    484       xlist[N] = PhotPrimary ? 0.001*catalog[i].average[j].M : 0.001*catalog[i].secfilt[PhotNsec*j+PhotSec].M;
    485       value    = PhotPrimary ? catalog[i].average[j].Xm : catalog[i].secfilt[PhotNsec*j+PhotSec].Xm;
     484      xlist[N] = PhotPrimary ? catalog[i].average[j].M_PS : catalog[i].secfilt[PhotNsec*j+PhotSec].M_PS;
     485      value    = PhotPrimary ? catalog[i].average[j].Xm   : catalog[i].secfilt[PhotNsec*j+PhotSec].Xm;
    486486      if (value == NO_MAG) continue;
    487487      ylist[N] = 0.01*value;

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

    r4796 r4865  
    113113  if ((N = get_argument (argc, argv, "-minerror"))) {
    114114    remove_argument (N, &argc, argv);
    115     MIN_ERROR = 1000.0*atof (argv[N]);
     115    MIN_ERROR = atof (argv[N]);
    116116    remove_argument (N, &argc, argv);
    117117    /* require MIN_ERROR > 0 */
    … …  
    135135  if ((N = get_argument (argc, argv, "-instmag"))) {
    136136    remove_argument (N, &argc, argv);
    137     ImagMin = 1000*atof (argv[N]);
     137    ImagMin = atof (argv[N]);
    138138    remove_argument (N, &argc, argv);
    139     ImagMax = 1000*atof (argv[N]);
     139    ImagMax = atof (argv[N]);
    140140    remove_argument (N, &argc, argv);
    141141    ImagSelect = TRUE;

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

    r4796 r4865  
    55  int i, j, offset, ecode;
    66  int NAVERAGE, NMEASURE, Naverage, Nmeasure, Nm;
    7   int mag;
     7  float mag;
    88
    99  /* we are moving only the subset of measurements from catalog[0] to subcatalog[0] */
    … …  
    3131
    3232    if (RESET) {
    33       short *p;
    34       p = (PhotPrimary) ? &subcatalog[0].average[Naverage].M : &subcatalog[0].secfilt[PhotNsec*Naverage+PhotSec].M;
     33      float *p;
     34      p = (PhotPrimary) ? &subcatalog[0].average[Naverage].M_PS : &subcatalog[0].secfilt[PhotNsec*Naverage+PhotSec].M_PS;
    3535      *p = NO_MAG;
    36       p = (PhotPrimary) ? &subcatalog[0].average[Naverage].dM : &subcatalog[0].secfilt[PhotNsec*Naverage+PhotSec].dM;
     36      p = (PhotPrimary) ? &subcatalog[0].average[Naverage].dM_PS : &subcatalog[0].secfilt[PhotNsec*Naverage+PhotSec].dM_PS;
    3737      *p = NO_MAG;
    3838      subcatalog[0].average[Naverage].code &= ~ID_STAR_FEW;
    … …  
    5959
    6060      /* select measurements by mag limit */
    61       mag = iPhotCat (&catalog[0].measure[offset]);
     61      mag = PhotCat (&catalog[0].measure[offset]);
    6262      if (mag > MAG_LIM) continue;
    6363
    6464      /* select measurements by measurement error */
    65       if (catalog[0].measure[offset].dM > SIGMA_LIM) continue;
     65      if (catalog[0].measure[offset].dM_PS > SIGMA_LIM) continue;
    6666
    6767      /* select measurements by mag limit */
    6868      if (ImagSelect) {
    69         mag = iPhotInst (&catalog[0].measure[offset]);
     69        mag = PhotInst (&catalog[0].measure[offset]);
    7070        if (mag < ImagMin) continue;
    7171        if (mag > ImagMax) continue;
    … …  
    7676      subcatalog[0].measure[Nmeasure].averef = Naverage;
    7777      if (RESET) {
    78         subcatalog[0].measure[Nmeasure].Mcal = 0;
     78        subcatalog[0].measure[Nmeasure].Mcal_PS = 0;
    7979        subcatalog[0].measure[Nmeasure].flags &= 0xff00;
    8080        subcatalog[0].measure[Nmeasure].flags &= ~ID_MEAS_POOR;

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

    r4796 r4865  
    44
    55  int i, j, k, m, N, Ntot;
    6   short Mrel, Mcal, Mmos, Mgrid;
     6  float Mrel, Mcal, Mmos, Mgrid;
    77  double *xlist, *ylist, *ilist;
    88  Graphdata graphdata;
    … …  
    3232        if ((Mgrid = getMgrid (m, i)) == NO_MAG) continue;
    3333
    34         Mrel = PhotPrimary ? catalog[i].average[j].M : catalog[i].secfilt[PhotNsec*j+PhotSec].M;
     34        Mrel = PhotPrimary ? catalog[i].average[j].M_PS : catalog[i].secfilt[PhotNsec*j+PhotSec].M_PS;
    3535        xlist[N] = Mrel;
    36         ylist[N] = iPhotSys (&catalog[i].measure[m], &catalog[i].average[j], &catalog[i].secfilt[j*PhotNsec]) - Mcal - Mmos - Mgrid - Mrel;
     36        ylist[N] = PhotSys (&catalog[i].measure[m], &catalog[i].average[j], &catalog[i].secfilt[j*PhotNsec]) - Mcal - Mmos - Mgrid - Mrel;
    3737        ilist[N] = PhotInst (&catalog[i].measure[m]);
    38         xlist[N] *= 0.001;
    39         ylist[N] *= 0.001;
    4038        N++;
    4139      }

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

    r4796 r4865  
    44
    55  int i, j, m, ecode;
    6   short *p;
     6  float *p;
     7  short *q;
    78
    89  /* if we reset the catalog, reset all the current measurements */
    … …  
    1011
    1112    for (i = 0; i < catalog[0].Naverage; i++) {
    12       p = (PhotPrimary) ? &catalog[0].average[i].M : &catalog[0].secfilt[PhotNsec*i+PhotSec].M;
     13      p = (PhotPrimary) ? &catalog[0].average[i].M_PS  : &catalog[0].secfilt[PhotNsec*i+PhotSec].M_PS;
    1314      *p = NO_MAG;
    14       p = (PhotPrimary) ? &catalog[0].average[i].dM : &catalog[0].secfilt[PhotNsec*i+PhotSec].dM;
     15      p = (PhotPrimary) ? &catalog[0].average[i].dM_PS : &catalog[0].secfilt[PhotNsec*i+PhotSec].dM_PS;
    1516      *p = NO_MAG;
    16       p = (PhotPrimary) ? &catalog[0].average[i].Xm : &catalog[0].secfilt[PhotNsec*i+PhotSec].Xm;
    17       *p = NO_MAG;
     17      q = (PhotPrimary) ? &catalog[0].average[i].Xm : &catalog[0].secfilt[PhotNsec*i+PhotSec].Xm;
     18      *q = NO_MAG;
    1819
    1920      m = catalog[0].average[i].offset;
    … …  
    3031        }
    3132       
    32         catalog[0].measure[m].Mcal = 0;
     33        catalog[0].measure[m].Mcal_PS = 0;
    3334        catalog[0].measure[m].flags &= 0xff00;
    3435        catalog[0].measure[m].flags &= ~ID_MEAS_POOR;
    … …  
    7273  int i, k, m, ecode, d1, d2;
    7374  int Ntot, Ntry, Nkeep, Nskip;
    74   short mag;
     75  float mag;
    7576
    7677  Ntot = Ntry = Nskip = Nkeep = 0;
    … …  
    114115      /* skip measurements by inst mag limit */
    115116      if ((pass < 4) && ImagSelect) {
    116         mag = iPhotInst (&catalog[0].measure[m]);
     117        mag = PhotInst (&catalog[0].measure[m]);
    117118        if (mag < ImagMin) goto skip;
    118119        if (mag > ImagMax) goto skip;
Note: See TracChangeset for help on using the changeset viewer.