IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Dec 13, 2017, 10:53:48 AM (9 years ago)
Author:
eugene
Message:

merge EAM development branch changes for DR2 into trunk (add PS1_V6 dvo format; change Mcal to McalPSF, McalAPER; change opihi int vectors to 64bit)

Location:
trunk/Ohana
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana

  • trunk/Ohana/src/relastro/src

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

    r39926 r40291  
    208208    if (CHECK_MEASURE_TO_IMAGE) strextend (&command, "-check-measures");
    209209
     210    if (UPDATE_ALL_MEASURE)       strextend (&command, "-update-all-cameras");
    210211    if (UPDATE_PS1_STACK_MEASURE) strextend (&command, "-update-ps1-stack");
    211     if (UPDATE_PS1_CHIP_MEASURE) strextend (&command, "-update-ps1-chip");
    212     if (UPDATE_HSC_MEASURE)      strextend (&command, "-update-hsc");
    213     if (UPDATE_CFH_MEASURE)      strextend (&command, "-update-cfh");
    214 
    215     if (UPDATE)        strextend (&command, "-update");
     212    if (UPDATE_PS1_CHIP_MEASURE)  strextend (&command, "-update-ps1-chip");
     213    if (UPDATE_HSC_MEASURE)       strextend (&command, "-update-hsc");
     214    if (UPDATE_CFH_MEASURE)       strextend (&command, "-update-cfh");
     215
     216    if (UPDATE)           strextend (&command, "-update");
    216217    if (RESET_BAD_IMAGES) strextend (&command, "-reset-bad-images");
    217     if (USE_BASIC_CHECK) strextend (&command, "-basic-image-search");
    218     if (USE_ALL_IMAGES)      strextend (&command, "-use-all-images");
     218    if (USE_BASIC_CHECK)  strextend (&command, "-basic-image-search");
     219    if (USE_ALL_IMAGES)   strextend (&command, "-use-all-images");
    219220
    220221    if (MinBadQF > 0.0)        strextend (&command, "-min-bad-psfqf %f", MinBadQF);
    … …  
    347348    if (CHECK_MEASURE_TO_IMAGE) strextend (&command, "-check-measures");
    348349
     350    if (UPDATE_ALL_MEASURE)       strextend (&command, "-update-all-cameras");
    349351    if (UPDATE_PS1_STACK_MEASURE) strextend (&command, "-update-ps1-stack");
    350     if (UPDATE_PS1_CHIP_MEASURE) strextend (&command, "-update-ps1-chip");
    351     if (UPDATE_HSC_MEASURE)      strextend (&command, "-update-hsc");
    352     if (UPDATE_CFH_MEASURE)      strextend (&command, "-update-cfh");
     352    if (UPDATE_PS1_CHIP_MEASURE)  strextend (&command, "-update-ps1-chip");
     353    if (UPDATE_HSC_MEASURE)       strextend (&command, "-update-hsc");
     354    if (UPDATE_CFH_MEASURE)       strextend (&command, "-update-cfh");
    353355
    354356    if (UPDATE)        strextend (&command, "-update");
Note: See TracChangeset for help on using the changeset viewer.