IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Sep 26, 2007, 5:34:27 PM (19 years ago)
Author:
eugene
Message:

various fixes to ensure data is carried from Stars to Measures correctly for PS1_DEV_1

Location:
trunk/Ohana/src/addstar/src
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/addstar/src/FilterStars.c

    r12732 r15038  
    4343    stars[N].Mcal    = image[0].Mcal;
    4444    stars[N].t       = image[0].tzero + 1e-4*stars[N].Y*image[0].trate;  /* trate is in 0.1 msec / row */
     45    stars[N].dt      = MTIME;
    4546
    4647    stars[N].M       = MIN (stars[N].M + MTIME, NO_MAG);

  • trunk/Ohana/src/addstar/src/ImageOptions.c

    r12332 r15038  
    3636  }
    3737  options[0].photcode = equivPhotcode;
     38
     39  options[0].imageID = 0;
    3840  return (TRUE);
    3941}

  • trunk/Ohana/src/addstar/src/ReadStarsFITS.c

    r15036 r15038  
    176176    stars[i].extNsigma = ps1data[i].extNsigma;
    177177
    178     stars[i].detID   = ps1data[i].detID;
     178    stars[i].detID     = ps1data[i].detID;
     179    stars[i].flags     = ps1data[i].flags;
     180
     181    // XXX not defined anyway
     182    // stars[i].stargal   = ps1data[i].stargal;
    179183
    180184    /* these are set elsewhere */
    … …  
    196200    stars[i].dt      = 0;
    197201    stars[i].airmass = 0;
     202    stars[i].az      = 0;
    198203    stars[i].code    = 0;
    199204    stars[i].found   = 0;

  • trunk/Ohana/src/addstar/src/SEDfit.c

    r12332 r15038  
    186186      outcat[0].measure[Nmeas].dM       = 0.0;
    187187      outcat[0].measure[Nmeas].Mcal     = 0;
    188       outcat[0].measure[Nmeas].t           = TIMEREF;
    189       outcat[0].measure[Nmeas].averef      = Nave;
    190       outcat[0].measure[Nmeas].photcode      = table[0].code[n];
    191       outcat[0].measure[Nmeas].dophot      = 0;
    192       outcat[0].measure[Nmeas].flags       = 0;
     188      outcat[0].measure[Nmeas].t        = TIMEREF;
     189      outcat[0].measure[Nmeas].averef   = Nave;
     190      outcat[0].measure[Nmeas].photcode = table[0].code[n];
     191      outcat[0].measure[Nmeas].dophot   = 0;
     192      outcat[0].measure[Nmeas].dbFlags  = 0;
    193193      outcat[0].measure[Nmeas].dt       = 0xffff;
    194194

  • trunk/Ohana/src/addstar/src/find_matches.c

    r14291 r15038  
    163163      catalog[0].measure[Nmeas].dD       = 3600.0*(catalog[0].average[n].D - stars[N].D);
    164164
    165       /* XXX need to add dX, dY : need to load into stars[N].dX,dY */
    166       /* XXX need to add stargal, Sky, dSky, qPSF, detID, imageID */
    167165      catalog[0].measure[Nmeas].Xccd     = stars[N].X;
    168166      catalog[0].measure[Nmeas].Yccd     = stars[N].Y;
    … …  
    175173      catalog[0].measure[Nmeas].photcode = stars[N].code;  /* photcode */
    176174      catalog[0].measure[Nmeas].dophot   = stars[N].dophot; 
    177       catalog[0].measure[Nmeas].flags    = 0;
     175      catalog[0].measure[Nmeas].dbFlags  = 0;
    178176      catalog[0].measure[Nmeas].dt       = stars[N].dt;
    179177      catalog[0].measure[Nmeas].airmass  = stars[N].airmass;
     178
     179      catalog[0].measure[Nmeas].photFlags = stars[N].flags;
     180      catalog[0].measure[Nmeas].qPSF      = stars[N].psfQual;
     181      catalog[0].measure[Nmeas].psfProb   = stars[N].psfProb;
     182      catalog[0].measure[Nmeas].crNsigma  = stars[N].crNsigma;
     183      catalog[0].measure[Nmeas].extNsigma = stars[N].extNsigma;
     184      catalog[0].measure[Nmeas].Sky       = stars[N].sky;
     185      catalog[0].measure[Nmeas].dSky      = stars[N].dsky;
     186
     187      catalog[0].measure[Nmeas].stargal   = 0; // XXX not yet set
     188
     189      catalog[0].measure[Nmeas].detID     = stars[N].detID;
     190      catalog[0].measure[Nmeas].imageID   = options.imageID;
     191
     192      catalog[0].measure[Nmeas].dXccd     = stars[N].dX;
     193      catalog[0].measure[Nmeas].dYccd     = stars[N].dY;
    180194
    181195      catalog[0].measure[Nmeas].Mgal     = stars[N].Mgal;
    … …  
    201215      /* this image star matches more than one catalog star */
    202216      if (stars[N].found > -1) {
    203         catalog[0].measure[stars[N].found].flags |= BLEND_IMAGE;
    204         catalog[0].measure[Nmeas].flags |= BLEND_IMAGE;
     217        catalog[0].measure[stars[N].found].dbFlags |= BLEND_IMAGE;
     218        catalog[0].measure[Nmeas].dbFlags |= BLEND_IMAGE;
    205219      }
    206220      if (stars[N].found == -2) { /* this image star matches a catalog star on a neighboring catalog */
    207         catalog[0].measure[Nmeas].flags |= BLEND_IMAGE_NEIGHBOR;
     221        catalog[0].measure[Nmeas].dbFlags |= BLEND_IMAGE_NEIGHBOR;
    208222      }
    209223      if (stars[N].found == -1) { /* this image star matches only this catalog star */
    … …  
    212226      /* this catalog star matches more than one image star */
    213227      if (catalog[0].found[n] > -1) {
    214         catalog[0].measure[catalog[0].found[n]].flags |= BLEND_CATALOG;
    215         catalog[0].measure[Nmeas].flags |= BLEND_CATALOG;
     228        catalog[0].measure[catalog[0].found[n]].dbFlags |= BLEND_CATALOG;
     229        catalog[0].measure[Nmeas].dbFlags |= BLEND_CATALOG;
    216230      } else {
    217231        catalog[0].found[n] = Nmeas;
    … …  
    273287    }
    274288
    275     /* XXX need to add dX, dY : need to load into stars[N].dX,dY */
    276     /* XXX need to add stargal, Sky, dSky, qPSF, detID, imageID */
    277289    catalog[0].measure[Nmeas].Xccd     = stars[N].X;
    278290    catalog[0].measure[Nmeas].Yccd     = stars[N].Y;
    … …  
    287299    catalog[0].measure[Nmeas].photcode  = stars[N].code;  /* photcode */
    288300    catalog[0].measure[Nmeas].dophot    = stars[N].dophot; 
    289     catalog[0].measure[Nmeas].flags     = 0;
     301    catalog[0].measure[Nmeas].dbFlags   = 0;
    290302    catalog[0].measure[Nmeas].dt        = stars[N].dt;
    291303    catalog[0].measure[Nmeas].airmass   = stars[N].airmass;
     304
     305    catalog[0].measure[Nmeas].photFlags = stars[N].flags;
     306    catalog[0].measure[Nmeas].qPSF      = stars[N].psfQual;
     307    catalog[0].measure[Nmeas].psfProb   = stars[N].psfProb;
     308    catalog[0].measure[Nmeas].crNsigma  = stars[N].crNsigma;
     309    catalog[0].measure[Nmeas].extNsigma = stars[N].extNsigma;
     310    catalog[0].measure[Nmeas].Sky       = stars[N].sky;
     311    catalog[0].measure[Nmeas].dSky      = stars[N].dsky;
     312
     313    catalog[0].measure[Nmeas].stargal   = 0; // XXX not yet set
     314
     315    catalog[0].measure[Nmeas].detID     = stars[N].detID;
     316    catalog[0].measure[Nmeas].imageID   = options.imageID;
     317
     318    catalog[0].measure[Nmeas].dXccd     = stars[N].dX;
     319    catalog[0].measure[Nmeas].dYccd     = stars[N].dY;
    292320
    293321    catalog[0].measure[Nmeas].Mgal      = stars[N].Mgal;

  • trunk/Ohana/src/addstar/src/find_matches_closest.c

    r14291 r15038  
    193193    catalog[0].measure[Nmeas].photcode = stars[N].code;  /* photcode */
    194194    catalog[0].measure[Nmeas].dophot   = stars[N].dophot; 
    195     catalog[0].measure[Nmeas].flags    = 0;
     195    catalog[0].measure[Nmeas].dbFlags  = 0;
    196196    catalog[0].measure[Nmeas].dt       = stars[N].dt;
    197197    catalog[0].measure[Nmeas].airmass  = stars[N].airmass;
     198
     199    catalog[0].measure[Nmeas].photFlags = stars[N].flags;
     200    catalog[0].measure[Nmeas].qPSF      = stars[N].psfQual;
     201    catalog[0].measure[Nmeas].psfProb   = stars[N].psfProb;
     202    catalog[0].measure[Nmeas].crNsigma  = stars[N].crNsigma;
     203    catalog[0].measure[Nmeas].extNsigma = stars[N].extNsigma;
     204    catalog[0].measure[Nmeas].Sky       = stars[N].sky;
     205    catalog[0].measure[Nmeas].dSky      = stars[N].dsky;
     206
     207    catalog[0].measure[Nmeas].stargal   = 0;
     208
     209    catalog[0].measure[Nmeas].detID     = stars[N].detID;
     210    catalog[0].measure[Nmeas].imageID   = options.imageID;
     211
     212    catalog[0].measure[Nmeas].dXccd     = stars[N].dX;
     213    catalog[0].measure[Nmeas].dYccd     = stars[N].dY;
    198214
    199215    catalog[0].measure[Nmeas].Mgal     = stars[N].Mgal;
    … …  
    270286    }
    271287
    272     /* XXX need to add dX, dY : need to load into stars[N].dX,dY */
    273     /* XXX need to add stargal, Sky, dSky, qPSF, detID, imageID */
    274288    catalog[0].measure[Nmeas].Xccd     = stars[N].X;
    275289    catalog[0].measure[Nmeas].Yccd     = stars[N].Y;
    … …  
    284298    catalog[0].measure[Nmeas].photcode = stars[N].code;  /* photcode */
    285299    catalog[0].measure[Nmeas].dophot   = stars[N].dophot; 
    286     catalog[0].measure[Nmeas].flags    = 0;
     300    catalog[0].measure[Nmeas].dbFlags  = 0;
    287301    catalog[0].measure[Nmeas].dt       = stars[N].dt;
    288302    catalog[0].measure[Nmeas].airmass  = stars[N].airmass;
     303
     304    catalog[0].measure[Nmeas].photFlags = stars[N].flags;
     305    catalog[0].measure[Nmeas].qPSF      = stars[N].psfQual;
     306    catalog[0].measure[Nmeas].psfProb   = stars[N].psfProb;
     307    catalog[0].measure[Nmeas].crNsigma  = stars[N].crNsigma;
     308    catalog[0].measure[Nmeas].extNsigma = stars[N].extNsigma;
     309    catalog[0].measure[Nmeas].Sky       = stars[N].sky;
     310    catalog[0].measure[Nmeas].dSky      = stars[N].dsky;
     311
     312    catalog[0].measure[Nmeas].stargal   = 0;
     313
     314    catalog[0].measure[Nmeas].detID     = stars[N].detID;
     315    catalog[0].measure[Nmeas].imageID   = options.imageID;
     316
     317    catalog[0].measure[Nmeas].dXccd     = stars[N].dX;
     318    catalog[0].measure[Nmeas].dYccd     = stars[N].dY;
    289319
    290320    catalog[0].measure[Nmeas].Mgal     = stars[N].Mgal;

  • trunk/Ohana/src/addstar/src/find_matches_refstars.c

    r12332 r15038  
    140140      catalog[0].measure[Nmeas].photcode = stars[N][0].code;
    141141      catalog[0].measure[Nmeas].dophot   = 0;
    142       catalog[0].measure[Nmeas].flags    = 0;
     142      catalog[0].measure[Nmeas].dbFlags  = 0;
    143143      catalog[0].measure[Nmeas].dt       = 0xffff;
    144144
    … …  
    149149      catalog[0].measure[Nmeas].theta    = NO_MAG;
    150150       
    151       /* XXX need to add dX, dY : need to load into stars[N].dX,dY */
    152       /* XXX need to add stargal, Sky, dSky, qPSF, detID, imageID */
     151      catalog[0].measure[Nmeas].photFlags = 0;
     152      catalog[0].measure[Nmeas].qPSF      = 0;
     153      catalog[0].measure[Nmeas].psfProb   = 0;
     154      catalog[0].measure[Nmeas].crNsigma  = 0;
     155      catalog[0].measure[Nmeas].extNsigma = 0;
     156      catalog[0].measure[Nmeas].Sky       = 0;
     157      catalog[0].measure[Nmeas].dSky      = 0;
     158
     159      catalog[0].measure[Nmeas].stargal   = 0; // XXX not yet set
     160
     161      catalog[0].measure[Nmeas].detID     = 0;
     162      catalog[0].measure[Nmeas].imageID   = 0;
     163
     164      catalog[0].measure[Nmeas].dXccd     = 0;
     165      catalog[0].measure[Nmeas].dYccd     = 0;
     166
    153167      catalog[0].measure[Nmeas].Xccd     = 0.0;
    154168      catalog[0].measure[Nmeas].Yccd     = 0.0;
    … …  
    168182      /* this image star matches more than one catalog star */
    169183      if (stars[N][0].found > -1) {
    170         catalog[0].measure[stars[N][0].found].flags |= BLEND_IMAGE;
    171         catalog[0].measure[Nmeas].flags |= BLEND_IMAGE;
     184        catalog[0].measure[stars[N][0].found].dbFlags |= BLEND_IMAGE;
     185        catalog[0].measure[Nmeas].dbFlags |= BLEND_IMAGE;
    172186      }
    173187      if (stars[N][0].found == -2) { /* this image star matches a catalog star on a neighboring catalog */
    174         catalog[0].measure[Nmeas].flags |= BLEND_IMAGE_NEIGHBOR;
     188        catalog[0].measure[Nmeas].dbFlags |= BLEND_IMAGE_NEIGHBOR;
    175189      }
    176190      if (stars[N][0].found == -1) { /* this image star matches only this catalog star */
    … …  
    179193      /* this catalog star matches more than one image star */
    180194      if (catalog[0].found[n] > -1) {
    181         catalog[0].measure[catalog[0].found[n]].flags |= BLEND_CATALOG;
    182         catalog[0].measure[Nmeas].flags |= BLEND_CATALOG;
     195        catalog[0].measure[catalog[0].found[n]].dbFlags |= BLEND_CATALOG;
     196        catalog[0].measure[Nmeas].dbFlags |= BLEND_CATALOG;
    183197      } else {
    184198        catalog[0].found[n] = Nmeas;
    … …  
    254268    catalog[0].measure[Nmeas].photcode = stars[N][0].code;
    255269    catalog[0].measure[Nmeas].dophot   = 0;
    256     catalog[0].measure[Nmeas].flags    = 0;
     270    catalog[0].measure[Nmeas].dbFlags  = 0;
    257271    catalog[0].measure[Nmeas].dt       = 0xffff;
     272
     273    catalog[0].measure[Nmeas].photFlags = 0;
     274    catalog[0].measure[Nmeas].qPSF      = 0;
     275    catalog[0].measure[Nmeas].psfProb   = 0;
     276    catalog[0].measure[Nmeas].crNsigma  = 0;
     277    catalog[0].measure[Nmeas].extNsigma = 0;
     278    catalog[0].measure[Nmeas].Sky       = 0;
     279    catalog[0].measure[Nmeas].dSky      = 0;
     280
     281    catalog[0].measure[Nmeas].stargal   = 0; // XXX not yet set
     282
     283    catalog[0].measure[Nmeas].detID     = 0;
     284    catalog[0].measure[Nmeas].imageID   = 0;
     285
     286    catalog[0].measure[Nmeas].dXccd     = 0;
     287    catalog[0].measure[Nmeas].dYccd     = 0;
     288
     289    catalog[0].measure[Nmeas].Xccd     = 0.0;
     290    catalog[0].measure[Nmeas].Yccd     = 0.0;
    258291
    259292    catalog[0].measure[Nmeas].airmass  = 0;
    … …  
    263296    catalog[0].measure[Nmeas].theta    = NO_MAG;
    264297
    265     /* XXX need to add dX, dY : need to load into stars[N].dX,dY */
    266     /* XXX need to add stargal, Sky, dSky, qPSF, detID, imageID */
    267298    catalog[0].measure[Nmeas].Xccd     = 0.0;
    268299    catalog[0].measure[Nmeas].Yccd     = 0.0;

  • trunk/Ohana/src/addstar/src/load2mass_catalog.c

    r12332 r15038  
    5252      catalog[0].measure[Nmeas].dM       = MIN (stars[i+j].dM,  NO_ERR);
    5353      catalog[0].measure[Nmeas].Mcal     = 0;
    54       catalog[0].measure[Nmeas].t           = stars[i+j].t;
    55       catalog[0].measure[Nmeas].averef      = Nave;
    56       catalog[0].measure[Nmeas].photcode      = stars[i+j].code;
    57       catalog[0].measure[Nmeas].dophot      = 0;
    58       catalog[0].measure[Nmeas].flags       = 0;
     54      catalog[0].measure[Nmeas].t        = stars[i+j].t;
     55      catalog[0].measure[Nmeas].averef   = Nave;
     56      catalog[0].measure[Nmeas].photcode = stars[i+j].code;
     57      catalog[0].measure[Nmeas].dophot   = 0;
     58      catalog[0].measure[Nmeas].dbFlags  = 0;
    5959      catalog[0].measure[Nmeas].dt       = 0xffff;
    6060
Note: See TracChangeset for help on using the changeset viewer.