IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

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

merge changes from eam_branches/ipp-20120905 (fixes some mean values and flags in DVO)

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/Ohana/src/relastro/src/UpdateObjects.c

    r34405 r34429  
    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;

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

    r33652 r34429  
    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 */

  • trunk/Ohana/src/relastro/src/initialize.c

    r33652 r34429  
    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

  • trunk/Ohana/src/relastro/src/liststats.c

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

  • trunk/Ohana/src/relastro/src/relastro_objects.c

    r34405 r34429  
    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...
Note: See TracChangeset for help on using the changeset viewer.