Changeset 8120 for trunk/ippTools/src/dettool.c
- Timestamp:
- Aug 3, 2006, 6:18:57 PM (20 years ago)
- File:
-
- 1 edited
-
trunk/ippTools/src/dettool.c (modified) (16 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ippTools/src/dettool.c
r8076 r8120 422 422 rawExp->imfiles, 423 423 rawExp->filter, 424 rawExp->stats 424 rawExp->airmass, 425 rawExp->ra, 426 rawExp->decl, 427 rawExp->exp_time, 428 rawExp->background 425 429 ); 426 430 } … … 604 608 return false; 605 609 } 606 psString stats = psMetadataLookupStr(&status, config->args, "-stats");607 if (!status) {608 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -stats");609 return false;610 }611 if (!stats) {612 psError(PS_ERR_UNKNOWN, true, "-stats is required");613 return false;614 }615 610 psString recipe = psMetadataLookupStr(&status, config->args, "-recip"); 616 611 if (!status) { … … 645 640 // create a new detProcessedImfile object 646 641 detProcessedImfileRow *detRow = detProcessedImfileRowAlloc( 647 (psS32)atol(det_id), exp_id, class_id, uri, stats,recipe642 (psS32)atol(det_id), exp_id, class_id, uri, recipe 648 643 ); 649 644 psFree(rawImfiles); … … 921 916 PS_ASSERT_PTR_NON_NULL(config, false); 922 917 923 // det_id, class_id, uri, stats,& recipe are required918 // det_id, class_id, uri, & recipe are required 924 919 bool status = false; 925 920 psString det_id = psMetadataLookupStr(&status, config->args, "-det_id"); … … 948 943 if (!uri) { 949 944 psError(PS_ERR_UNKNOWN, true, "-uri is required"); 950 return false;951 }952 psString stats = psMetadataLookupStr(&status, config->args, "-stats");953 if (!status) {954 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -stats");955 return false;956 }957 if (!stats) {958 psError(PS_ERR_UNKNOWN, true, "-stats is required");959 945 return false; 960 946 } … … 1010 996 // create a new detStackedImfile object 1011 997 detStackedImfileRow *stackedImfile = detStackedImfileRowAlloc( 1012 (psS32)atol(det_id), iteration, class_id, uri, stats,recipe998 (psS32)atol(det_id), iteration, class_id, uri, recipe 1013 999 ); 1014 1000 … … 1270 1256 PS_ASSERT_PTR_NON_NULL(config, false); 1271 1257 1272 // det_id, class_id, uri, stats,& recipe are required1258 // det_id, class_id, uri, & recipe are required 1273 1259 bool status = false; 1274 1260 psString det_id = psMetadataLookupStr(&status, config->args, "-det_id"); … … 1297 1283 if (!uri) { 1298 1284 psError(PS_ERR_UNKNOWN, true, "-uri is required"); 1299 return false;1300 }1301 psString stats = psMetadataLookupStr(&status, config->args, "-stats");1302 if (!status) {1303 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -stats");1304 return false;1305 }1306 if (!stats) {1307 psError(PS_ERR_UNKNOWN, true, "-stats is required");1308 1285 return false; 1309 1286 } … … 1367 1344 // create a new detNormalizedImfile object 1368 1345 detNormalizedImfileRow *masterImfile = detNormalizedImfileRowAlloc( 1369 (psS32)atol(det_id), iteration, class_id, uri, stats,recipe1346 (psS32)atol(det_id), iteration, class_id, uri, recipe 1370 1347 ); 1371 1348 … … 1541 1518 PS_ASSERT_PTR_NON_NULL(config, false); 1542 1519 1543 // det_id, exp_id, class_id, stats,& recipe are required1520 // det_id, exp_id, class_id, & recipe are required 1544 1521 bool status = false; 1545 1522 psString det_id = psMetadataLookupStr(&status, config->args, "-det_id"); … … 1568 1545 if (!class_id) { 1569 1546 psError(PS_ERR_UNKNOWN, true, "-class_id is required"); 1570 return false;1571 }1572 psString stats = psMetadataLookupStr(&status, config->args, "-stats");1573 if (!status) {1574 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -stats");1575 return false;1576 }1577 if (!stats) {1578 psError(PS_ERR_UNKNOWN, true, "-stats is required");1579 1547 return false; 1580 1548 } … … 1649 1617 exp_id, 1650 1618 class_id, 1651 stats,1652 1619 recipe 1653 1620 ); … … 1704 1671 PS_ASSERT_PTR_NON_NULL(config, false); 1705 1672 1706 // det_id, exp_id, stats,& recipe are required1673 // det_id, exp_id, & recipe are required 1707 1674 bool status = false; 1708 1675 psString det_id = psMetadataLookupStr(&status, config->args, "-det_id"); … … 1722 1689 if (!exp_id) { 1723 1690 psError(PS_ERR_UNKNOWN, true, "-exp_id is required"); 1724 return false;1725 }1726 psString stats = psMetadataLookupStr(&status, config->args, "-stats");1727 if (!status) {1728 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -stats");1729 return false;1730 }1731 if (!stats) {1732 psError(PS_ERR_UNKNOWN, true, "-stats is required");1733 1691 return false; 1734 1692 } … … 1789 1747 iteration, 1790 1748 exp_id, 1791 stats,1792 1749 recipe, 1793 1750 accept … … 2099 2056 inputExp->imfiles, 2100 2057 inputExp->filter, 2101 inputExp->stats 2058 inputExp->airmass, 2059 inputExp->ra, 2060 inputExp->decl, 2061 inputExp->exp_time, 2062 inputExp->background 2102 2063 ); 2103 2064 psArrayAdd(newInputExps, 0, newInputExp);
Note:
See TracChangeset
for help on using the changeset viewer.
