Changeset 40063 for trunk/Ohana/src/libdvo/src/dvo_convert.c
- Timestamp:
- Jun 18, 2017, 11:13:40 AM (9 years ago)
- File:
-
- 1 edited
-
trunk/Ohana/src/libdvo/src/dvo_convert.c (modified) (19 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Ohana/src/libdvo/src/dvo_convert.c
r39457 r40063 42 42 CONVERT_FORMAT ("DVO_AVERAGE_PS1_V4", PS1_V4); 43 43 CONVERT_FORMAT ("DVO_AVERAGE_PS1_V5", PS1_V5); 44 CONVERT_FORMAT ("DVO_AVERAGE_PS1_V5_LOAD", PS1_V5_LOAD); 44 45 CONVERT_FORMAT ("DVO_AVERAGE_PS1_REF", PS1_REF); 45 46 CONVERT_FORMAT ("DVO_AVERAGE_PS1_SIM", PS1_SIM); … … 132 133 CONVERT_FORMAT ("DVO_AVERAGE_PS1_V4", PS1_V4, PS1_V4); 133 134 CONVERT_FORMAT ("DVO_AVERAGE_PS1_V5", PS1_V5, PS1_V5); 135 CONVERT_FORMAT ("DVO_AVERAGE_PS1_V5_LOAD", PS1_V5_LOAD, PS1_V5_LOAD); 134 136 CONVERT_FORMAT ("DVO_AVERAGE_PS1_REF", PS1_REF, PS1_REF); 135 137 CONVERT_FORMAT ("DVO_AVERAGE_PS1_SIM", PS1_SIM, PS1_SIM); … … 169 171 FORMAT_CASE (PS1_V4, PS1_V4); 170 172 FORMAT_CASE (PS1_V5, PS1_V5); 173 FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD); 171 174 FORMAT_CASE (PS1_REF, PS1_REF); 172 175 FORMAT_CASE (PS1_SIM, PS1_SIM); … … 267 270 CONVERT_FORMAT ("DVO_MEASURE_PS1_V4", PS1_V4, PS1_V4, FALSE); 268 271 CONVERT_FORMAT ("DVO_MEASURE_PS1_V5", PS1_V5, PS1_V5, TRUE); 272 CONVERT_FORMAT ("DVO_MEASURE_PS1_V5_LOAD", PS1_V5_LOAD, PS1_V5_LOAD, TRUE); 269 273 CONVERT_FORMAT ("DVO_MEASURE_PS1_REF", PS1_REF, PS1_REF, FALSE); 270 274 CONVERT_FORMAT ("DVO_MEASURE_PS1_SIM", PS1_SIM, PS1_SIM, TRUE); … … 306 310 FORMAT_CASE (PS1_V4, PS1_V4, FALSE); 307 311 FORMAT_CASE (PS1_V5, PS1_V5, TRUE); 312 FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD, TRUE); 308 313 FORMAT_CASE (PS1_REF, PS1_REF, FALSE); 309 314 FORMAT_CASE (PS1_SIM, PS1_SIM, TRUE); … … 386 391 SKIPPING_FORMAT ("DVO_MISSING_PS1_V4", PS1_V4, PS1_V4); 387 392 SKIPPING_FORMAT ("DVO_MISSING_PS1_V5", PS1_V5, PS1_V5); 393 SKIPPING_FORMAT ("DVO_MISSING_PS1_V5_LOAD", PS1_V5_LOAD, PS1_V5_LOAD); 388 394 # undef CONVERT_FORMAT 389 395 # undef SKIPPING_FORMAT … … 460 466 CONVERT_FORMAT ("DVO_SECFILT_PS1_V4", PS1_V4, PS1_V4); 461 467 CONVERT_FORMAT ("DVO_SECFILT_PS1_V5", PS1_V5, PS1_V5); 468 CONVERT_FORMAT ("DVO_SECFILT_PS1_V5_LOAD", PS1_V5_LOAD, PS1_V5_LOAD); 462 469 CONVERT_FORMAT ("DVO_SECFILT_PS1_REF", PS1_REF, PS1_REF); 463 470 CONVERT_FORMAT ("DVO_SECFILT_PS1_SIM", PS1_SIM, PS1_SIM); … … 497 504 FORMAT_CASE (PS1_V4, PS1_V4); 498 505 FORMAT_CASE (PS1_V5, PS1_V5); 506 FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD); 499 507 FORMAT_CASE (PS1_REF, PS1_REF); 500 508 FORMAT_CASE (PS1_SIM, PS1_SIM); … … 604 612 SKIPPING_FORMAT ("DVO_LENSING_PS1_V4", PS1_V4, PS1_V4); 605 613 CONVERT_FORMAT ("DVO_LENSING_PS1_V5", PS1_V5, PS1_V5_R3); 614 CONVERT_FORMAT ("DVO_LENSING_PS1_V5_LOAD", PS1_V5_LOAD, PS1_V5_LOAD); 606 615 SKIPPING_FORMAT ("DVO_LENSING_PS1_SIM", PS1_SIM, PS1_SIM); 607 616 # undef CONVERT_FORMAT … … 643 652 // FORMAT_CASE (PS1_V4, PS1_V4); 644 653 FORMAT_CASE (PS1_V5, PS1_V5_R3); 654 FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD); 645 655 # undef FORMAT_CASE 646 656 … … 722 732 SKIPPING_FORMAT ("DVO_LENSOBJ_PS1_V4", PS1_V4, PS1_V4); 723 733 CONVERT_FORMAT ("DVO_LENSOBJ_PS1_V5", PS1_V5, PS1_V5_R1); 734 CONVERT_FORMAT ("DVO_LENSOBJ_PS1_V5_LOAD", PS1_V5_LOAD, PS1_V5_LOAD); 724 735 SKIPPING_FORMAT ("DVO_LENSOBJ_PS1_SIM", PS1_SIM, PS1_SIM); 725 736 # undef CONVERT_FORMAT … … 761 772 // FORMAT_CASE (PS1_V4, PS1_V4); 762 773 FORMAT_CASE (PS1_V5, PS1_V5_R1); 774 FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD); 763 775 # undef FORMAT_CASE 764 776 … … 828 840 SKIPPING_FORMAT ("DVO_STARPAR_PS1_V4", PS1_V4, PS1_V4); 829 841 CONVERT_FORMAT ("DVO_STARPAR_PS1_V5", PS1_V5, PS1_V5); 842 CONVERT_FORMAT ("DVO_STARPAR_PS1_V5_LOAD", PS1_V5_LOAD, PS1_V5_LOAD); 830 843 # undef CONVERT_FORMAT 831 844 # undef SKIPPING_FORMAT … … 867 880 // FORMAT_CASE (PS1_V4, PS1_V4); 868 881 FORMAT_CASE (PS1_V5, PS1_V5); 882 FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD); 869 883 # undef FORMAT_CASE 870 884 … … 947 961 SKIPPING_FORMAT ("DVO_GALPHOT_PS1_V4", PS1_V4, PS1_V4); 948 962 CONVERT_FORMAT ("DVO_GALPHOT_PS1_V5", PS1_V5, PS1_V5_R1); 963 CONVERT_FORMAT ("DVO_GALPHOT_PS1_V5_LOAD", PS1_V5_LOAD, PS1_V5_LOAD); 949 964 SKIPPING_FORMAT ("DVO_GALPHOT_PS1_SIM", PS1_SIM, PS1_SIM); 950 965 # undef CONVERT_FORMAT … … 986 1001 // FORMAT_CASE (PS1_V4, PS1_V4); 987 1002 FORMAT_CASE (PS1_V5, PS1_V5_R1); 1003 FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD); 988 1004 # undef FORMAT_CASE 989 1005 … … 1059 1075 CONVERT_FORMAT ("DVO_IMAGE_PS1_V4", PS1_V4, PS1_V4); 1060 1076 CONVERT_FORMAT ("DVO_IMAGE_PS1_V5", PS1_V5, PS1_V5); 1077 CONVERT_FORMAT ("DVO_IMAGE_PS1_V5_LOAD", PS1_V5_LOAD, PS1_V5_LOAD); 1061 1078 CONVERT_FORMAT ("DVO_IMAGE_PS1_REF", PS1_REF, PS1_REF); 1062 1079 CONVERT_FORMAT ("DVO_IMAGE_PS1_SIM", PS1_SIM, PS1_SIM); … … 1097 1114 FORMAT_CASE (PS1_V4, PS1_V4); 1098 1115 FORMAT_CASE (PS1_V5, PS1_V5); 1116 FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD); 1099 1117 FORMAT_CASE (PS1_REF, PS1_REF); 1100 1118 FORMAT_CASE (PS1_SIM, PS1_SIM); … … 1148 1166 FORMAT_CASE (PS1_V4, PS1_V4); 1149 1167 FORMAT_CASE (PS1_V5, PS1_V5); 1168 FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD); 1150 1169 FORMAT_CASE (PS1_REF, PS1_REF); 1151 1170 FORMAT_CASE (PS1_SIM, PS1_SIM);
Note:
See TracChangeset
for help on using the changeset viewer.
