IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 34423


Ignore:
Timestamp:
Sep 10, 2012, 11:27:56 AM (14 years ago)
Author:
eugene
Message:

reset all secfilt bits in relphot, reset all but average.astrom bits in relphot; reset all astrom bits in relastro; add NO_ASTROM bit for average, HAS_PS1 and HAS_STACK for secfilt

Location:
branches/eam_branches/ipp-20120905/Ohana/src
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20120905/Ohana/src/libdvo/include/dvo.h

    r34405 r34423  
    149149/* Average.flags values -- these values are 32 bit (as of PS1_V1) */
    150150typedef enum {
    151   ID_STAR_FEW     = 0x00000001, // used within relphot: skip star
    152   ID_STAR_POOR    = 0x00000002, // used within relphot: skip star
    153   ID_PROPER       = 0x00000400, // star with large proper motion
    154   ID_TRANSIENT    = 0x00001000, // is this mutually exclusive with USNO?
    155   ID_VARIABLE     = 0x00002000, // not currently set?
    156   ID_ASTEROID     = 0x00002000, // identified with an asteroid
    157   ID_BAD_OBJECT   = 0x00004000, // if all measurements are bad, set this bit
    158   ID_MOVING       = 0x00008000, // is a moving object
    159   ID_ROCK         = 0x0000a000, // 0x8000 + 0x2000
    160   ID_GHOST        = 0x0000c001, // 0x8000 + 0x4000 + 0x0001
    161   ID_TRAIL        = 0x0000c002, // 0x8000 + 0x4000 + 0x0002
    162   ID_BLEED        = 0x0000c003, // 0x8000 + 0x4000 + 0x0003
    163   ID_COSMIC       = 0x0000c004, // 0x8000 + 0x4000 + 0x0004
    164   ID_STAR_FIT_AVE = 0x00010000, // average position fitted
    165   ID_STAR_FIT_PM  = 0x00020000, // proper motion fitted
    166   ID_STAR_FIT_PAR = 0x00040000, // parallax fitted
    167   ID_STAR_USE_AVE = 0x00080000, // average position used (not PM or PAR)
    168   ID_STAR_USE_PM  = 0x00100000, // proper motion used (not AVE or PAR)
    169   ID_STAR_USE_PAR = 0x00200000, // parallax used (not AVE or PM)
    170   ID_OBJ_EXT      = 0x01000000, // extended in our data (eg, PS)
    171   ID_OBJ_EXT_ALT  = 0x02000000, // extended in external data (eg, 2MASS)
    172   ID_OBJ_GOOD     = 0x04000000, // good-quality measurement in our data (eg,PS)
    173   ID_OBJ_GOOD_ALT = 0x08000000, // good-quality measurement in  external data (eg, 2MASS)
     151  ID_STAR_FEW       = 0x00000001, // used within relphot: skip star
     152  ID_STAR_POOR      = 0x00000002, // used within relphot: skip star
     153  ID_PROPER         = 0x00000400, // star with large proper motion
     154  ID_TRANSIENT      = 0x00001000, // is this mutually exclusive with USNO?
     155  ID_VARIABLE       = 0x00002000, // not currently set?
     156  ID_ASTEROID       = 0x00002000, // identified with an asteroid
     157  ID_BAD_OBJECT     = 0x00004000, // if all measurements are bad, set this bit
     158  ID_MOVING         = 0x00008000, // is a moving object
     159  ID_ROCK           = 0x0000a000, // 0x8000 + 0x2000
     160  ID_GHOST          = 0x0000c001, // 0x8000 + 0x4000 + 0x0001
     161  ID_TRAIL          = 0x0000c002, // 0x8000 + 0x4000 + 0x0002
     162  ID_BLEED          = 0x0000c003, // 0x8000 + 0x4000 + 0x0003
     163  ID_COSMIC         = 0x0000c004, // 0x8000 + 0x4000 + 0x0004
     164  ID_STAR_FIT_AVE   = 0x00010000, // average position fitted
     165  ID_STAR_FIT_PM    = 0x00020000, // proper motion fitted
     166  ID_STAR_FIT_PAR   = 0x00040000, // parallax fitted
     167  ID_STAR_USE_AVE   = 0x00080000, // average position used (not PM or PAR)
     168  ID_STAR_USE_PM    = 0x00100000, // proper motion used (not AVE or PAR)
     169  ID_STAR_USE_PAR   = 0x00200000, // parallax used (not AVE or PM)
     170  ID_STAR_NO_ASTROM = 0x00400000, // mean astrometry could not be measured
     171  ID_OBJ_EXT        = 0x01000000, // extended in our data (eg, PS)
     172  ID_OBJ_EXT_ALT    = 0x02000000, // extended in external data (eg, 2MASS)
     173  ID_OBJ_GOOD       = 0x04000000, // good-quality measurement in our data (eg,PS)
     174  ID_OBJ_GOOD_ALT   = 0x08000000, // good-quality measurement in  external data (eg, 2MASS)
    174175} DVOAverageFlags;
    175176
    … …  
    180181  ID_SECF_USE_SYNTH   = 0x00000004, // synthetic photometry used in average measurement
    181182  ID_SECF_USE_UBERCAL = 0x00000008, // synthetic photometry used in average measurement
     183  ID_SECF_HAS_PS1     = 0x00000010, // PS1 photometry used in average measurement
     184  ID_SECF_HAS_STACK   = 0x00000020, // PS1 stack photometry exists
    182185  ID_PHOTOM_PASS_0    = 0x00000100, // average magnitude calculated in 0th pass
    183186  ID_PHOTOM_PASS_1    = 0x00000200, // average magnitude calculated in 1th pass

  • branches/eam_branches/ipp-20120905/Ohana/src/relastro/src/UpdateObjects.c

    r34405 r34423  
    168168      }
    169169
    170       // if we have too few good detections for the desired fit, or too limited a baseline, use a
    171       // fit with fewer parameters.  XXX if we have too few parameters for even the average
    172       // position, consider including the lower-quality detections
    173 
    174       catalog[i].average[j].flags &= ~ID_STAR_FEW;
     170      // if we have too few good detections for the desired fit, or too limited a
     171      // baseline, use a fit with fewer parameters.  XXX if we have too few measurements
     172      // for even the average position, consider including the lower-quality detections?
     173
     174      catalog[i].average[j].flags &= ~ID_STAR_NO_ASTROM;
    175175
    176176      // find Tmin & Tmax from the list of accepted measurements
    … …  
    197197        // XXX need to define PHOTOM and ASTROM object flags
    198198        // XXX reset the average value fields?
    199         catalog[i].average[j].flags |= ID_STAR_FEW;
     199        catalog[i].average[j].flags |= ID_STAR_NO_ASTROM;
    200200        catalog[i].average[j].ChiSqAve  = NAN;
    201201        catalog[i].average[j].ChiSqPM   = NAN;

  • branches/eam_branches/ipp-20120905/Ohana/src/relastro/src/bcatalog.c

    r33652 r34423  
    2626
    2727  DVOAverageFlags averageBits =
    28     ID_STAR_FEW     |
    29     ID_STAR_POOR    |
    30     ID_STAR_FIT_AVE |
    31     ID_STAR_FIT_PM  |
    32     ID_STAR_FIT_PAR |
    33     ID_STAR_USE_AVE |
    34     ID_STAR_USE_PM  |
    35     ID_STAR_USE_PAR;
     28    ID_STAR_FIT_AVE   |
     29    ID_STAR_FIT_PM    |
     30    ID_STAR_FIT_PAR   |
     31    ID_STAR_USE_AVE   |
     32    ID_STAR_USE_PM    |
     33    ID_STAR_USE_PAR   |
     34    ID_STAR_NO_ASTROM ;
    3635
    3736  /* exclude stars not in range or with too few measurements */

  • branches/eam_branches/ipp-20120905/Ohana/src/relastro/src/initialize.c

    r33652 r34423  
    1919
    2020  initstats (STATMODE);
    21 
    22   // IMAGE_BAD = ID_IMAGE_ASTROM_POOR | ID_IMAGE_ASTROM_FEW | ID_IMAGE_ASTROM_SKIP;
    23   // STAR_BAD  = ID_STAR_POOR | ID_STAR_FEW;
    24   // MEAS_BAD  = ID_MEAS_NOCAL | ID_MEAS_POOR_ASTROM | ID_MEAS_SKIP_ASTROM | ID_MEAS_AREA;
    2521
    2622  /* XXX drop irrelevant entries */
    … …  
    5753
    5854  initstats (STATMODE);
    59 
    60   // IMAGE_BAD = ID_IMAGE_ASTROM_POOR | ID_IMAGE_ASTROM_FEW | ID_IMAGE_ASTROM_SKIP;
    61   // STAR_BAD  = ID_STAR_POOR | ID_STAR_FEW;
    62   // MEAS_BAD  = ID_MEAS_NOCAL | ID_MEAS_POOR_ASTROM | ID_MEAS_SKIP_ASTROM | ID_MEAS_AREA;
    6355}
    6456

  • branches/eam_branches/ipp-20120905/Ohana/src/relastro/src/liststats.c

    r17214 r34423  
    136136    dS += M;
    137137  }
    138   X2 = X2 / Nm;
     138  X2 = X2 / (Nm - 1);
    139139  dS = sqrt (dS / Nm);
    140140

  • branches/eam_branches/ipp-20120905/Ohana/src/relastro/src/relastro_objects.c

    r34405 r34423  
    1616
    1717  DVOAverageFlags averageBits =
    18     ID_STAR_FEW     |
    19     ID_STAR_POOR    |
    20     ID_STAR_FIT_AVE |
    21     ID_STAR_FIT_PM  |
    22     ID_STAR_FIT_PAR |
    23     ID_STAR_USE_AVE |
    24     ID_STAR_USE_PM  |
    25     ID_STAR_USE_PAR;
     18    ID_STAR_FIT_AVE   |
     19    ID_STAR_FIT_PM    |
     20    ID_STAR_FIT_PAR   |
     21    ID_STAR_USE_AVE   |
     22    ID_STAR_USE_PM    |
     23    ID_STAR_USE_PAR   |
     24    ID_STAR_NO_ASTROM ;
    2625
    2726  // XXX need to decide how to determine PARALLEL mode...

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

    r34267 r34423  
    365365      int haveSynth = FALSE;
    366366      int haveStack = FALSE;
     367      int havePS1   = FALSE;
    367368
    368369      // need to find the measurement closest to the center of its skycell, as well as the
    … …  
    438439              }
    439440            }
     441            havePS1 = TRUE;
    440442          }
    441443          // gpc1 stack data
    … …  
    678680          catalog[Nc].secfilt[Nsecfilt*j+Nsec].flags |= ID_SECF_USE_SYNTH;
    679681        }       
     682        if (haveStack) {
     683          catalog[Nc].secfilt[Nsecfilt*j+Nsec].flags |= ID_SECF_HAS_STACK;
     684        }       
     685        if (havePS1) {
     686          catalog[Nc].secfilt[Nsecfilt*j+Nsec].flags |= ID_SECF_HAS_PS1;
     687        }       
    680688        if (haveUbercal) {
    681689          catalog[Nc].secfilt[Nsecfilt*j+Nsec].flags |= ID_SECF_USE_UBERCAL;

  • branches/eam_branches/ipp-20120905/Ohana/src/relphot/src/relphot_objects.c

    r34405 r34423  
    6161      Nsecfilt = catalog.Nsecfilt;
    6262      DVOSecfiltFlags secfiltBits =
    63         ID_SECF_STAR_FEW |
    64         ID_SECF_STAR_POOR |
    65         ID_PHOTOM_PASS_0 |
    66         ID_PHOTOM_PASS_1 |
    67         ID_PHOTOM_PASS_2 |
    68         ID_PHOTOM_PASS_3 |
    69         ID_PHOTOM_PASS_4 |
    70         ID_SECF_USE_SYNTH |
     63        ID_SECF_STAR_FEW    |
     64        ID_SECF_STAR_POOR   |
     65        ID_PHOTOM_PASS_0    |
     66        ID_PHOTOM_PASS_1    |
     67        ID_PHOTOM_PASS_2    |
     68        ID_PHOTOM_PASS_3    |
     69        ID_PHOTOM_PASS_4    |
     70        ID_SECF_USE_SYNTH   |
    7171        ID_SECF_USE_UBERCAL |
    72         ID_SECF_OBJ_EXT;
     72        ID_SECF_HAS_STACK   |
     73        ID_SECF_HAS_PS1     |
     74        ID_SECF_OBJ_EXT     ;
     75     
     76      DVOAverageFlags astromBits =
     77        ID_STAR_FIT_AVE   |
     78        ID_STAR_FIT_PM    |
     79        ID_STAR_FIT_PAR   |
     80        ID_STAR_USE_AVE   |
     81        ID_STAR_USE_PM    |
     82        ID_STAR_USE_PAR   |
     83        ID_STAR_NO_ASTROM ;
    7384     
    7485      for (j = 0; j < catalog.Naverage; j++) {
    75         catalog.average[j].flags = 0;
     86        catalog.average[j].flags &= astromBits; // reset all except astrometry bits
    7687        for (k = 0; k < Nsecfilt; k++) {
    7788          catalog.secfilt[j*Nsecfilt + k].M      = NAN;
    … …  
    8495          catalog.secfilt[j*Nsecfilt + k].Ncode  = 0;
    8596          catalog.secfilt[j*Nsecfilt + k].Nused  = 0;
    86           catalog.secfilt[j*Nsecfilt + k].flags &= ~secfiltBits;
     97          catalog.secfilt[j*Nsecfilt + k].flags &= ~secfiltBits; // XXX: only reset photom bits:
     98          catalog.secfilt[j*Nsecfilt + k].flags  = 0;            // XXX: reset all secfilt flag bits:
    8799          catalog.secfilt[j*Nsecfilt + k].ubercalDist = 1000;
    88100        }
Note: See TracChangeset for help on using the changeset viewer.