IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 36984


Ignore:
Timestamp:
Jul 9, 2014, 2:22:34 PM (12 years ago)
Author:
eugene
Message:

secfilt.Xm replaced with secfilt.Mchisq, now stored as a regular value (not 100*log10(x)); replacing typed out values for int/u_int bzero entries with macros FT_BZERO_INT32, etc

Location:
branches/eam_branches/ipp-20140610/Ohana/src/relphot
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20140610/Ohana/src/relphot/include/relphot.h

    r36976 r36984  
    4848  float dMsys;
    4949  unsigned short nFitPhotom;
    50   float Mchisq;
     50  float Xm;
    5151  float secz;
    5252  float ubercalDist;
    … …  
    130130  float dMcal;
    131131  float dMagSys;
    132   float Xm;
     132  short Xm;
    133133  int nFitPhotom;
    134134  int flags;

  • branches/eam_branches/ipp-20140610/Ohana/src/relphot/src/BrightCatalog.c

    r36976 r36984  
    274274    gfits_define_bintable_column (&theader, "E", "Y_CCD",    "ccd y coord",                "pix",    1.0, 0.0);
    275275    gfits_define_bintable_column (&theader, "E", "EXPTIME",  "-2.5 * log (exposure time)", "sec",    1.0, 0.0);
    276     gfits_define_bintable_column (&theader, "J", "TIME",     "time of exp",                "sec",    1.0, 1.0*0x8000);
    277     gfits_define_bintable_column (&theader, "J", "AVE_REF",  "pointer to average table",    NULL,    1.0, 1.0*0x8000);
    278     gfits_define_bintable_column (&theader, "J", "IMAGE_ID", "image",                       NULL,    1.0, 1.0*0x8000);
    279     gfits_define_bintable_column (&theader, "J", "DB_FLAGS", "flags",                       NULL,    1.0, 1.0*0x8000);
    280     gfits_define_bintable_column (&theader, "J", "PHOT_FLAGS", "photflags",                 NULL,    1.0, 1.0*0x8000);
    281     gfits_define_bintable_column (&theader, "J", "CAT_ID",   "catalog",                     NULL,    1.0, 1.0*0x8000);
    282     gfits_define_bintable_column (&theader, "I", "PHOTCODE", "photcode",                    NULL,    1.0, 1.0*0x80);
     276    gfits_define_bintable_column (&theader, "J", "TIME",     "time of exp",                "sec",    1.0, FT_BZERO_INT32);
     277    gfits_define_bintable_column (&theader, "J", "AVE_REF",  "pointer to average table",    NULL,    1.0, FT_BZERO_INT32);
     278    gfits_define_bintable_column (&theader, "J", "IMAGE_ID", "image",                       NULL,    1.0, FT_BZERO_INT32);
     279    gfits_define_bintable_column (&theader, "J", "DB_FLAGS", "flags",                       NULL,    1.0, FT_BZERO_INT32);
     280    gfits_define_bintable_column (&theader, "J", "PHOT_FLAGS", "photflags",                 NULL,    1.0, FT_BZERO_INT32);
     281    gfits_define_bintable_column (&theader, "J", "CAT_ID",   "catalog",                     NULL,    1.0, FT_BZERO_INT32);
     282    gfits_define_bintable_column (&theader, "I", "PHOTCODE", "photcode",                    NULL,    1.0, FT_BZERO_INT16);
    283283
    284284    // generate the output array that carries the data

  • branches/eam_branches/ipp-20140610/Ohana/src/relphot/src/ImageMagIO.c

    r36630 r36984  
    6161  GET_COLUMN (dMcal,             "MCAL_ERR",       float);
    6262  GET_COLUMN (dMagSys,           "MCAL_SYSERR",    float);
    63   GET_COLUMN (Xm,                "CHISQ",          float);
    6463  GET_COLUMN (nFitPhotom,        "NFIT",             int);
    6564  GET_COLUMN (flags,             "FLAGS",            int);
    6665  GET_COLUMN (ubercalDist,       "UDIST",            int);
    6766  GET_COLUMN (imageID,           "ID",               int);
     67  GET_COLUMN (Xm,                "CHISQ",          short);
    6868
    6969  // free the memory associated with the FITS files
    … …  
    121121  gfits_create_table_header (&theader, "BINTABLE", "IMAGE_MAGS");
    122122
    123   gfits_define_bintable_column (&theader, "E", "MCAL",           "cal offset", "magnitudes", 1.0, 0.0);
    124   gfits_define_bintable_column (&theader, "E", "MCAL_ERR",       "cal error", "magnitudes", 1.0, 0.0);
    125   gfits_define_bintable_column (&theader, "E", "MCAL_SYSERR",    "systematic error", "magnitudes", 1.0, 0.0);
    126   gfits_define_bintable_column (&theader, "E", "CHISQ",          "cal chisq", "unitless", 1.0, 0.0);
    127   gfits_define_bintable_column (&theader, "J", "NFIT",           "number of fitted stars", "unitless", 1.0, 0.0);
    128   gfits_define_bintable_column (&theader, "J", "FLAGS",          "analysis flags", "unitless", 1.0, 0.0);
    129   gfits_define_bintable_column (&theader, "J", "UDIST",          "distance to ubercal images", "images", 1.0, 0.0);
    130   gfits_define_bintable_column (&theader, "J", "ID",             "image ID", "unitless", 1.0, 0.0);
     123  gfits_define_bintable_column (&theader, "E", "MCAL",           "cal offset",                 "magnitudes", 1.0, 0.0);
     124  gfits_define_bintable_column (&theader, "E", "MCAL_ERR",       "cal error",                  "magnitudes", 1.0, 0.0);
     125  gfits_define_bintable_column (&theader, "E", "MCAL_SYSERR",    "systematic error",           "magnitudes", 1.0, 0.0);
     126  gfits_define_bintable_column (&theader, "J", "NFIT",           "number of fitted stars",     "unitless",  1.0, 0.0);
     127  gfits_define_bintable_column (&theader, "J", "FLAGS",          "analysis flags",             "unitless",  1.0, 0.0);
     128  gfits_define_bintable_column (&theader, "J", "UDIST",          "distance to ubercal images", "images",    1.0, 0.0);
     129  gfits_define_bintable_column (&theader, "J", "ID",             "image ID",                   "unitless",  1.0, 0.0);
     130  gfits_define_bintable_column (&theader, "I", "CHISQ",          "cal chisq",                  "unitless",   1.0, FT_BZERO_INT16);
    131131
    132132  // generate the output array that carries the data

  • branches/eam_branches/ipp-20140610/Ohana/src/relphot/src/ImageSubset.c

    r36491 r36984  
    126126  gfits_create_table_header (&theader, "BINTABLE", "IMAGE_SUBSET");
    127127
    128   gfits_define_bintable_column (&theader, "E", "MCAL", "zero point offset", "magnitudes", 1.0, 0.0);
    129   gfits_define_bintable_column (&theader, "E", "MCAL_ERR", "zero point error", "magnitudes", 1.0, 0.0);
    130 
    131   gfits_define_bintable_column (&theader, "J", "IMAGE_ID", "image ID", NULL, 1.0, 1.0*0x8000);
    132   gfits_define_bintable_column (&theader, "J", "PHOTOM_MAP", "map", NULL, 1.0, 1.0*0x8000);
    133   gfits_define_bintable_column (&theader, "J", "FLAGS", "flags", NULL, 1.0, 1.0*0x8000);
    134 
    135   gfits_define_bintable_column (&theader, "J", "TESS_ID", "ID", NULL, 1.0, 0.0);
    136   gfits_define_bintable_column (&theader, "J", "PROJ_ID", "ID", NULL, 1.0, 0.0);
    137   gfits_define_bintable_column (&theader, "J", "SKYCELL_ID", "ID", NULL, 1.0, 0.0);
    138 
    139   gfits_define_bintable_column (&theader, "J", "TZERO", "exposure start", NULL, 1.0, 1.0*0x8000);
    140   gfits_define_bintable_column (&theader, "I", "TRATE", "tti rate", NULL, 1.0, 0.0);
    141 
    142   gfits_define_bintable_column (&theader, "I", "UBERCAL_DIST", "ubercal distance", NULL, 1.0, 1.0*0x80);
     128  gfits_define_bintable_column (&theader, "E", "MCAL",         "zero point offset", "magnitudes", 1.0, 0.0);
     129  gfits_define_bintable_column (&theader, "E", "MCAL_ERR",     "zero point error",  "magnitudes", 1.0, 0.0);
     130  gfits_define_bintable_column (&theader, "J", "IMAGE_ID",     "image ID",          NULL,         1.0, FT_BZERO_INT32);
     131  gfits_define_bintable_column (&theader, "J", "PHOTOM_MAP",   "map",               NULL,         1.0, FT_BZERO_INT32);
     132  gfits_define_bintable_column (&theader, "J", "FLAGS",        "flags",             NULL,         1.0, FT_BZERO_INT32);
     133  gfits_define_bintable_column (&theader, "J", "TESS_ID",      "ID",                NULL,         1.0, 0.0);
     134  gfits_define_bintable_column (&theader, "J", "PROJ_ID",      "ID",                NULL,         1.0, 0.0);
     135  gfits_define_bintable_column (&theader, "J", "SKYCELL_ID",   "ID",                NULL,         1.0, 0.0);
     136  gfits_define_bintable_column (&theader, "J", "TZERO",        "exposure start",    NULL,         1.0, FT_BZERO_INT32);
     137  gfits_define_bintable_column (&theader, "I", "TRATE",        "tti rate",          NULL,         1.0, FT_BZERO_INT16);
     138  gfits_define_bintable_column (&theader, "I", "UBERCAL_DIST", "ubercal distance",  NULL,         1.0, 0.0);
    143139
    144140  // generate the output array that carries the data
    … …  
    152148
    153149  // create intermediate storage arrays
    154   ALLOCATE (Mcal,      float,        Nimage);
    155   ALLOCATE (dMcal,     float,        Nimage);
     150  ALLOCATE (Mcal,      float,          Nimage);
     151  ALLOCATE (dMcal,     float,          Nimage);
    156152  ALLOCATE (imageID,   unsigned int,   Nimage);
    157153  ALLOCATE (map,       unsigned int,   Nimage);

  • branches/eam_branches/ipp-20140610/Ohana/src/relphot/src/MeanMagIO.c

    r36976 r36984  
    118118  gfits_define_bintable_column (&theader, "E", "MAG_ERR",   "mean magnitude error", "magnitudes", 1.0, 0.0);
    119119  gfits_define_bintable_column (&theader, "E", "MAG_CHISQ", "mean magnitude chisq", "unitless", 1.0, 0.0);
    120   gfits_define_bintable_column (&theader, "J", "NSEC",      "secfilt sequence", NULL, 1.0, 1.0*0x8000);
    121   gfits_define_bintable_column (&theader, "J", "OBJ_ID",    "object ID",        NULL, 1.0, 1.0*0x8000);
    122   gfits_define_bintable_column (&theader, "J", "CAT_ID",    "catalog ID",       NULL, 1.0, 1.0*0x8000);
     120  gfits_define_bintable_column (&theader, "J", "NSEC",      "secfilt sequence", NULL, 1.0, FT_BZERO_INT32);
     121  gfits_define_bintable_column (&theader, "J", "OBJ_ID",    "object ID",        NULL, 1.0, FT_BZERO_INT32);
     122  gfits_define_bintable_column (&theader, "J", "CAT_ID",    "catalog ID",       NULL, 1.0, FT_BZERO_INT32);
    123123
    124124  // generate the output array that carries the data

  • branches/eam_branches/ipp-20140610/Ohana/src/relphot/src/MosaicOps.c

    r36976 r36984  
    101101    mosaic[Nmosaic].dMcal  = 0.0; // note : at the end, mosaic.Mcal is added back to the input images
    102102    mosaic[Nmosaic].dMsys  = 0.0;
    103     mosaic[Nmosaic].Mchisq = 0.0;
     103    mosaic[Nmosaic].Xm = 0.0;
    104104    mosaic[Nmosaic].flags  = image[i].flags;
    105105    mosaic[Nmosaic].secz   = image[i].secz;
    … …  
    221221    mosaic[i].dMcal    = 0.0;
    222222    mosaic[i].dMsys    = 0.0;
    223     mosaic[i].Mchisq   = 0.0;
     223    mosaic[i].Xm   = 0.0;
    224224    mosaic[i].flags    = 0;
    225225    mosaic[i].secz     = NAN;
    … …  
    328328    mosaic[j].Mcal  = 0.0;
    329329    mosaic[j].dMcal = 0.0;
    330     mosaic[j].Mchisq = 0.0;
     330    mosaic[j].Xm = 0.0;
    331331    mosaic[j].dMsys = subset[i].flags;
    332332    mosaic[j].flags = subset[i].flags;
    … …  
    410410    mosaic[i].dMcal = 0.0;
    411411    mosaic[i].dMsys = 0.0;
    412     mosaic[i].Mchisq    = 0.0;
     412    mosaic[i].Xm    = 0.0;
    413413    mosaic[i].flags = 0;
    414414    mosaic[i].secz  = NAN;
    … …  
    469469    mosaic[j].Mcal  = 0.0;
    470470    mosaic[j].dMcal = 0.0;
    471     mosaic[j].Mchisq    = 0.0;
     471    mosaic[j].Xm    = 0.0;
    472472    mosaic[j].dMsys = image[i].flags;
    473473    mosaic[j].flags = image[i].flags;
    … …  
    592592      Mcal  += image[m].Mcal;
    593593      dMcal += image[m].dMcal;
    594       Xm    += image[m].Mchisq;
     594      Xm    += image[m].Xm;
    595595
    596596      // for ubercal images, we (elsewhere) keep Mcal frozen
    … …  
    599599      image[m].Mcal  = 0.0;
    600600      image[m].dMcal = NAN;
    601       image[m].Mchisq    = NAN_S_SHORT;
     601      image[m].Xm    = NAN_S_SHORT;
    602602    }
    603603
    … …  
    645645    mosaic[i].Mcal   = Mcal / MosaicN_Image[i];
    646646    mosaic[i].dMcal  = dMcal / MosaicN_Image[i];
    647     mosaic[i].Mchisq = Xm / MosaicN_Image[i];
     647    mosaic[i].Xm = Xm / MosaicN_Image[i];
    648648  }
    649649  return;
    … …  
    695695      Mcal  += image[m].Mcal;
    696696      dMcal += image[m].dMcal;
    697       Xm    += image[m].Mchisq;
     697      Xm    += image[m].Xm;
    698698
    699699      // XXX: how does this work with UBERCAL?  We want to keep the Mcal values supplied by ubercal, but
    … …  
    707707      image[m].Mcal   = 0.0;
    708708      image[m].dMcal  = NAN;
    709       image[m].Mchiqs = NAN;
     709      image[m].Xm = NAN_S_SHORT;
    710710    }
    711711    dS /= MosaicN_Image[i];
    … …  
    725725    mosaic[i].Mcal   = Mcal / MosaicN_Image[i];
    726726    mosaic[i].dMcal  = dMcal / MosaicN_Image[i];
    727     mosaic[i].Mchisq = Xm / MosaicN_Image[i];
     727    mosaic[i].Xm = Xm / MosaicN_Image[i];
    728728  }
    729729  if (!USE_GRID) return;
    … …  
    755755      image[im].Mcal += mosaic[i].Mcal;
    756756      image[im].dMcal = mosaic[i].dMcal;
    757       image[im].Mchisq = mosaic[i].Mchisq;
     757      image[im].Xm = mosaic[i].Xm;
    758758      image[im].dMagSys = mosaic[i].dMsys;
    759759      image[im].nFitPhotom = mosaic[i].nFitPhotom;
    … …  
    12471247  myMosaic[0].dMcal = stats.error;
    12481248  myMosaic[0].nFitPhotom = N;
    1249   myMosaic[0].Mchisq    = stats.chisq;
     1249  myMosaic[0].Xm    = 100.0*log10(stats.chisq);
    12501250
    12511251  if (testImage) {
    … …  
    12671267
    12681268  if (testImage) {
    1269     fprintf (stderr, "%f %f  :  %f\n", myMosaic[0].Mcal, myMosaic[0].dMsys, myMosaic[0].Mchisq);
     1269    fprintf (stderr, "%f %f  :  %f\n", myMosaic[0].Mcal, myMosaic[0].dMsys, myMosaic[0].Xm);
    12701270  }
    12711271
    … …  
    17271727    if (mosaic[i].flags & IMAGE_BAD) continue;
    17281728    if (mosaic[i].skipCal) continue;
    1729     list[n] = mosaic[i].Mchisq;
     1729    list[n]  = pow (10.0, 0.01*mosaic[i].Xm);
    17301730    dlist[n] = 1;
    17311731    n++;

  • branches/eam_branches/ipp-20140610/Ohana/src/relphot/src/StarOps.c

    r36976 r36984  
    954954  int i, j, Ndel, Nave, Ntot, mark, Ns, Nscat, Nchi, Nnan;
    955955  float dM;
    956   double Chisq, MaxScatter, MaxChisq;
     956  double MaxScatter, MaxChisq;
    957957  double *xlist, *slist, *dlist;
    958958
    … …  
    981981      for (j = 0; j < catalog[i].Naverage; j++) {
    982982        if ( catalog[i].secfilt[Nsecfilt*j+Nsec].flags & STAR_BAD ) continue;
    983         Mchisq = catalog[i].secfilt[Nsecfilt*j+Nsec].Mchisq;
     983        float Mchisq = catalog[i].secfilt[Nsecfilt*j+Nsec].Mchisq;
     984        if (isnan(Mchisq)) continue;
    984985        xlist[Ntot] = Mchisq;
    985986        slist[Ntot] = catalog[i].secfilt[Nsecfilt*j+Nsec].dM;
    … …  
    10001001      for (j = 0; j < catalog[i].Naverage; j++) {
    10011002        dM = catalog[i].secfilt[Nsecfilt*j+Nsec].dM;
    1002         Mchisq = catalog[i].secfilt[Nsecfilt*j+Nsec].Mchisq;
    1003         mark = (dM > MaxScatter) || (isnan(Mchisq) || (Mchisq > MaxChisq);
     1003        float Mchisq = catalog[i].secfilt[Nsecfilt*j+Nsec].Mchisq;
     1004        mark = (dM > MaxScatter) || (isnan(Mchisq)) || (Mchisq > MaxChisq);
    10041005        if (mark) {
    10051006          catalog[i].secfilt[Nsecfilt*j+Nsec].flags |= ID_STAR_POOR;
    … …  
    12541255      if (catalog[i].secfilt[Nsecfilt*j+Nsec].flags & STAR_BAD) continue; 
    12551256       
    1256       Mchisq = catalog[i].secfilt[Nsecfilt*j+Nsec].Mchisq;
     1257      float Mchisq = catalog[i].secfilt[Nsecfilt*j+Nsec].Mchisq;
    12571258      if (isnan(Mchisq)) continue;
    12581259      list[n] = Mchisq;
Note: See TracChangeset for help on using the changeset viewer.