Changeset 13617
- Timestamp:
- Jun 4, 2007, 2:25:04 PM (19 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
-
dbconfig/det.md (modified) (7 diffs)
-
dbconfig/tasks.md (modified) (4 diffs)
-
ippTools/src/dettool.c (modified) (16 diffs)
-
ippTools/src/dettoolConfig.c (modified) (12 diffs)
-
ippTools/src/regtool.c (modified) (4 diffs)
-
ippTools/src/regtoolConfig.c (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/dbconfig/det.md
r12531 r13617 46 46 bg_stdev F64 0.0 47 47 bg_mean_stdev F64 0.0 48 fringe_0 F64 0.0 49 fringe_1 F64 0.0 50 fringe_2 F64 0.0 51 user_1 F64 0.0 52 user_2 F64 0.0 53 user_3 F64 0.0 54 user_4 F64 0.0 55 user_5 F64 0.0 48 56 path_base STR 255 49 57 fault S16 0 # Key NOT NULL … … 57 65 bg_stdev F64 0.0 58 66 bg_mean_stdev F64 0.0 67 fringe_0 F64 0.0 68 fringe_1 F64 0.0 69 fringe_2 F64 0.0 70 user_1 F64 0.0 71 user_2 F64 0.0 72 user_3 F64 0.0 73 user_4 F64 0.0 74 user_5 F64 0.0 59 75 path_base STR 255 60 76 fault S16 0 # Key NOT NULL … … 70 86 bg_stdev F64 0.0 71 87 bg_mean_stdev F64 0.0 88 user_1 F64 0.0 89 user_2 F64 0.0 90 user_3 F64 0.0 91 user_4 F64 0.0 92 user_5 F64 0.0 72 93 fault S16 0 # Key NOT NULL 73 94 END … … 89 110 bg_stdev F64 0.0 90 111 bg_mean_stdev F64 0.0 112 user_1 F64 0.0 113 user_2 F64 0.0 114 user_3 F64 0.0 115 user_4 F64 0.0 116 user_5 F64 0.0 91 117 path_base STR 255 92 118 fault S16 0 # Key NOT NULL … … 100 126 bg_stdev F64 0.0 101 127 bg_mean_stdev F64 0.0 128 user_1 F64 0.0 129 user_2 F64 0.0 130 user_3 F64 0.0 131 user_4 F64 0.0 132 user_5 F64 0.0 102 133 path_base STR 255 103 134 fault S16 0 # Key NOT NULL … … 128 159 bg_stdev F64 0.0 129 160 bg_mean_stdev F64 0.0 161 bin_stdev F64 0.0 162 fringe_0 F64 0.0 163 fringe_1 F64 0.0 164 fringe_2 F64 0.0 165 user_1 F64 0.0 166 user_2 F64 0.0 167 user_3 F64 0.0 168 user_4 F64 0.0 169 user_5 F64 0.0 130 170 path_base STR 255 131 171 fault S16 0 # Key NOT NULL … … 140 180 bg_stdev F64 0.0 141 181 bg_mean_stdev F64 0.0 182 bin_stdev F64 0.0 183 fringe_0 F64 0.0 184 fringe_1 F64 0.0 185 fringe_2 F64 0.0 186 user_1 F64 0.0 187 user_2 F64 0.0 188 user_3 F64 0.0 189 user_4 F64 0.0 190 user_5 F64 0.0 142 191 path_base STR 255 143 192 accept BOOL f -
trunk/dbconfig/tasks.md
r13606 r13617 1 # $Id: tasks.md,v 1.13 3 2007-06-04 02:26:09eugene Exp $1 # $Id: tasks.md,v 1.134 2007-06-05 00:24:52 eugene Exp $ 2 2 3 3 # this table records all exposure ID ever seen from the summit … … 124 124 ccd_temp F32 0.0 125 125 posang F64 0.0 126 user_1 F64 0.0 127 user_2 F64 0.0 128 user_3 F64 0.0 129 user_4 F64 0.0 130 user_5 F64 0.0 126 131 object STR 64 127 132 solang F32 0.0 … … 151 156 ccd_temp F32 0.0 152 157 posang F64 0.0 158 user_1 F64 0.0 159 user_2 F64 0.0 160 user_3 F64 0.0 161 user_4 F64 0.0 162 user_5 F64 0.0 153 163 object STR 64 154 164 dateobs UTC 0001-01-01T00:00:00Z … … 157 167 158 168 # 159 # XXX - temporarily (???) sto tcarrying around class in imfiles after rawImfile169 # XXX - temporarily (???) stop carrying around class in imfiles after rawImfile 160 170 # -
trunk/ippTools/src/dettool.c
r13596 r13617 2226 2226 return false; 2227 2227 } 2228 2228 2229 // optional 2230 psF64 fringe_0 = psMetadataLookupF64(&status, config->args, "-fringe_0"); 2231 if (!status) { 2232 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fringe_0"); 2233 return false; 2234 } 2235 psF64 fringe_1 = psMetadataLookupF64(&status, config->args, "-fringe_1"); 2236 if (!status) { 2237 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fringe_1"); 2238 return false; 2239 } 2240 psF64 fringe_2 = psMetadataLookupF64(&status, config->args, "-fringe_2"); 2241 if (!status) { 2242 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fringe_2"); 2243 return false; 2244 } 2245 2246 psF64 user_1 = psMetadataLookupF64(&status, config->args, "-user_1"); 2247 if (!status) { 2248 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_1"); 2249 return false; 2250 } 2251 psF64 user_2 = psMetadataLookupF64(&status, config->args, "-user_2"); 2252 if (!status) { 2253 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_2"); 2254 return false; 2255 } 2256 psF64 user_3 = psMetadataLookupF64(&status, config->args, "-user_3"); 2257 if (!status) { 2258 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_3"); 2259 return false; 2260 } 2261 psF64 user_4 = psMetadataLookupF64(&status, config->args, "-user_4"); 2262 if (!status) { 2263 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_4"); 2264 return false; 2265 } 2266 psF64 user_5 = psMetadataLookupF64(&status, config->args, "-user_5"); 2267 if (!status) { 2268 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_5"); 2269 return false; 2270 } 2271 2229 2272 psString path_base = psMetadataLookupStr(&status, config->args, "-path_base"); 2230 2273 if (!status) { … … 2271 2314 bg_stdev, 2272 2315 bg_mean_stdev, 2316 fringe_0, 2317 fringe_1, 2318 fringe_2, 2319 user_1, 2320 user_2, 2321 user_3, 2322 user_4, 2323 user_5, 2273 2324 path_base, 2274 2325 code … … 2474 2525 } 2475 2526 // optional 2527 psF64 fringe_0 = psMetadataLookupF64(&status, config->args, "-fringe_0"); 2528 if (!status) { 2529 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fringe_0"); 2530 return false; 2531 } 2532 psF64 fringe_1 = psMetadataLookupF64(&status, config->args, "-fringe_1"); 2533 if (!status) { 2534 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fringe_1"); 2535 return false; 2536 } 2537 psF64 fringe_2 = psMetadataLookupF64(&status, config->args, "-fringe_2"); 2538 if (!status) { 2539 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fringe_2"); 2540 return false; 2541 } 2542 2543 psF64 user_1 = psMetadataLookupF64(&status, config->args, "-user_1"); 2544 if (!status) { 2545 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_1"); 2546 return false; 2547 } 2548 psF64 user_2 = psMetadataLookupF64(&status, config->args, "-user_2"); 2549 if (!status) { 2550 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_2"); 2551 return false; 2552 } 2553 psF64 user_3 = psMetadataLookupF64(&status, config->args, "-user_3"); 2554 if (!status) { 2555 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_3"); 2556 return false; 2557 } 2558 psF64 user_4 = psMetadataLookupF64(&status, config->args, "-user_4"); 2559 if (!status) { 2560 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_4"); 2561 return false; 2562 } 2563 psF64 user_5 = psMetadataLookupF64(&status, config->args, "-user_5"); 2564 if (!status) { 2565 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_5"); 2566 return false; 2567 } 2568 2476 2569 psString path_base = psMetadataLookupStr(&status, config->args, "-path_base"); 2477 2570 if (!status) { … … 2551 2644 bg_stdev, 2552 2645 bg_mean_stdev, 2646 fringe_0, 2647 fringe_1, 2648 fringe_2, 2649 user_1, 2650 user_2, 2651 user_3, 2652 user_4, 2653 user_5, 2553 2654 path_base, 2554 2655 code … … 2940 3041 } 2941 3042 3043 // optional values 3044 psF64 user_1 = psMetadataLookupF64(&status, config->args, "-user_1"); 3045 if (!status) { 3046 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_1"); 3047 return false; 3048 } 3049 psF64 user_2 = psMetadataLookupF64(&status, config->args, "-user_2"); 3050 if (!status) { 3051 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_2"); 3052 return false; 3053 } 3054 psF64 user_3 = psMetadataLookupF64(&status, config->args, "-user_3"); 3055 if (!status) { 3056 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_3"); 3057 return false; 3058 } 3059 psF64 user_4 = psMetadataLookupF64(&status, config->args, "-user_4"); 3060 if (!status) { 3061 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_4"); 3062 return false; 3063 } 3064 psF64 user_5 = psMetadataLookupF64(&status, config->args, "-user_5"); 3065 if (!status) { 3066 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_5"); 3067 return false; 3068 } 3069 2942 3070 // default values 2943 3071 psS32 iteration = psMetadataLookupS32(&status, config->args, "-iteration"); … … 2995 3123 bg_stdev, 2996 3124 bg_mean_stdev, 3125 user_1, 3126 user_2, 3127 user_3, 3128 user_4, 3129 user_5, 2997 3130 code 2998 3131 ); … … 3833 3966 return false; 3834 3967 } 3968 3969 // optional 3970 psF64 user_1 = psMetadataLookupF64(&status, config->args, "-user_1"); 3971 if (!status) { 3972 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_1"); 3973 return false; 3974 } 3975 psF64 user_2 = psMetadataLookupF64(&status, config->args, "-user_2"); 3976 if (!status) { 3977 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_2"); 3978 return false; 3979 } 3980 psF64 user_3 = psMetadataLookupF64(&status, config->args, "-user_3"); 3981 if (!status) { 3982 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_3"); 3983 return false; 3984 } 3985 psF64 user_4 = psMetadataLookupF64(&status, config->args, "-user_4"); 3986 if (!status) { 3987 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_4"); 3988 return false; 3989 } 3990 psF64 user_5 = psMetadataLookupF64(&status, config->args, "-user_5"); 3991 if (!status) { 3992 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_5"); 3993 return false; 3994 } 3995 3835 3996 // iteration has a default value 3836 3997 psS32 iteration = psMetadataLookupS32(&status, config->args, "-iteration"); … … 3918 4079 bg_stdev, 3919 4080 bg_mean_stdev, 4081 user_1, 4082 user_2, 4083 user_3, 4084 user_4, 4085 user_5, 3920 4086 path_base, 3921 4087 code … … 4062 4228 } 4063 4229 // optional 4230 psF64 user_1 = psMetadataLookupF64(&status, config->args, "-user_1"); 4231 if (!status) { 4232 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_1"); 4233 return false; 4234 } 4235 psF64 user_2 = psMetadataLookupF64(&status, config->args, "-user_2"); 4236 if (!status) { 4237 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_2"); 4238 return false; 4239 } 4240 psF64 user_3 = psMetadataLookupF64(&status, config->args, "-user_3"); 4241 if (!status) { 4242 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_3"); 4243 return false; 4244 } 4245 psF64 user_4 = psMetadataLookupF64(&status, config->args, "-user_4"); 4246 if (!status) { 4247 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_4"); 4248 return false; 4249 } 4250 psF64 user_5 = psMetadataLookupF64(&status, config->args, "-user_5"); 4251 if (!status) { 4252 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_5"); 4253 return false; 4254 } 4255 4256 // optional 4064 4257 psString path_base = psMetadataLookupStr(&status, config->args, "-path_base"); 4065 4258 if (!status) { … … 4083 4276 bg_stdev, 4084 4277 bg_mean_stdev, 4278 user_1, 4279 user_2, 4280 user_3, 4281 user_4, 4282 user_5, 4085 4283 path_base, 4086 4284 code … … 4582 4780 return false; 4583 4781 } 4782 psF64 bin_stdev = psMetadataLookupF64(&status, config->args, "-bin_stdev"); 4783 if (!status) { 4784 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bin_stdev"); 4785 return false; 4786 } 4787 4584 4788 // optional 4585 4789 psString path_base = psMetadataLookupStr(&status, config->args, "-path_base"); 4586 4790 if (!status) { 4587 4791 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -path_base"); 4792 return false; 4793 } 4794 4795 // optional 4796 psF64 fringe_0 = psMetadataLookupF64(&status, config->args, "-fringe_0"); 4797 if (!status) { 4798 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fringe_0"); 4799 return false; 4800 } 4801 psF64 fringe_1 = psMetadataLookupF64(&status, config->args, "-fringe_1"); 4802 if (!status) { 4803 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fringe_1"); 4804 return false; 4805 } 4806 psF64 fringe_2 = psMetadataLookupF64(&status, config->args, "-fringe_2"); 4807 if (!status) { 4808 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fringe_2"); 4809 return false; 4810 } 4811 4812 psF64 user_1 = psMetadataLookupF64(&status, config->args, "-user_1"); 4813 if (!status) { 4814 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_1"); 4815 return false; 4816 } 4817 psF64 user_2 = psMetadataLookupF64(&status, config->args, "-user_2"); 4818 if (!status) { 4819 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_2"); 4820 return false; 4821 } 4822 psF64 user_3 = psMetadataLookupF64(&status, config->args, "-user_3"); 4823 if (!status) { 4824 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_3"); 4825 return false; 4826 } 4827 psF64 user_4 = psMetadataLookupF64(&status, config->args, "-user_4"); 4828 if (!status) { 4829 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_4"); 4830 return false; 4831 } 4832 psF64 user_5 = psMetadataLookupF64(&status, config->args, "-user_5"); 4833 if (!status) { 4834 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_5"); 4588 4835 return false; 4589 4836 } … … 4607 4854 bg_stdev, 4608 4855 bg_mean_stdev, 4856 bin_stdev, 4857 fringe_0, 4858 fringe_1, 4859 fringe_2, 4860 user_1, 4861 user_2, 4862 user_3, 4863 user_4, 4864 user_5, 4609 4865 path_base, 4610 4866 code … … 5091 5347 return false; 5092 5348 } 5349 psF64 bin_stdev = psMetadataLookupF64(&status, config->args, "-bin_stdev"); 5350 if (!status) { 5351 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bin_stdev"); 5352 return false; 5353 } 5354 // optional 5355 psF64 fringe_0 = psMetadataLookupF64(&status, config->args, "-fringe_0"); 5356 if (!status) { 5357 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fringe_0"); 5358 return false; 5359 } 5360 psF64 fringe_1 = psMetadataLookupF64(&status, config->args, "-fringe_1"); 5361 if (!status) { 5362 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fringe_1"); 5363 return false; 5364 } 5365 psF64 fringe_2 = psMetadataLookupF64(&status, config->args, "-fringe_2"); 5366 if (!status) { 5367 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fringe_2"); 5368 return false; 5369 } 5370 5371 psF64 user_1 = psMetadataLookupF64(&status, config->args, "-user_1"); 5372 if (!status) { 5373 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_1"); 5374 return false; 5375 } 5376 psF64 user_2 = psMetadataLookupF64(&status, config->args, "-user_2"); 5377 if (!status) { 5378 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_2"); 5379 return false; 5380 } 5381 psF64 user_3 = psMetadataLookupF64(&status, config->args, "-user_3"); 5382 if (!status) { 5383 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_3"); 5384 return false; 5385 } 5386 psF64 user_4 = psMetadataLookupF64(&status, config->args, "-user_4"); 5387 if (!status) { 5388 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_4"); 5389 return false; 5390 } 5391 psF64 user_5 = psMetadataLookupF64(&status, config->args, "-user_5"); 5392 if (!status) { 5393 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_5"); 5394 return false; 5395 } 5396 5093 5397 // optional 5094 5398 bool reject = psMetadataLookupBool(&status, config->args, "-reject"); … … 5123 5427 bg_stdev, 5124 5428 bg_mean_stdev, 5429 bin_stdev, 5430 fringe_0, 5431 fringe_1, 5432 fringe_2, 5433 user_1, 5434 user_2, 5435 user_3, 5436 user_4, 5437 user_5, 5125 5438 path_base, 5126 5439 !reject, … … 6507 6820 } 6508 6821 6822 psF64 user_1 = psMetadataLookupF64(&status, config->args, "-user_1"); 6823 if (!status) { 6824 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_1"); 6825 return false; 6826 } 6827 psF64 user_2 = psMetadataLookupF64(&status, config->args, "-user_2"); 6828 if (!status) { 6829 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_2"); 6830 return false; 6831 } 6832 psF64 user_3 = psMetadataLookupF64(&status, config->args, "-user_3"); 6833 if (!status) { 6834 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_3"); 6835 return false; 6836 } 6837 psF64 user_4 = psMetadataLookupF64(&status, config->args, "-user_4"); 6838 if (!status) { 6839 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_4"); 6840 return false; 6841 } 6842 psF64 user_5 = psMetadataLookupF64(&status, config->args, "-user_5"); 6843 if (!status) { 6844 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_5"); 6845 return false; 6846 } 6847 6509 6848 psString path_base = psMetadataLookupStr(&status, config->args, "-path_base"); 6510 6849 if (!status) { … … 6518 6857 // the det_id is valid 6519 6858 if (!detNormalizedImfileInsert(config->dbh, 6520 (psS64)atoll(det_id), 6521 0, // the iteration is fixed at 0 6522 class_id, 6523 uri, 6524 bg, 6525 bg_stdev, 6526 bg_mean_stdev, 6527 path_base, 6528 0 // fault code 6529 )) { 6859 (psS64)atoll(det_id), 6860 0, // the iteration is fixed at 0 6861 class_id, 6862 uri, 6863 bg, 6864 bg_stdev, 6865 bg_mean_stdev, 6866 user_1, 6867 user_2, 6868 user_3, 6869 user_4, 6870 user_5, 6871 path_base, 6872 0 // fault code 6873 )) { 6530 6874 psError(PS_ERR_UNKNOWN, false, "database error"); 6531 6875 return false; -
trunk/ippTools/src/dettoolConfig.c
r13588 r13617 304 304 "define recipe (required)", NULL); 305 305 psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-bg", 0, 306 "define exposu e background (required)", NAN);306 "define exposure background (required)", NAN); 307 307 psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-bg_stdev", 0, 308 "define exposu e background stdev (required)", NAN);308 "define exposure background stdev (required)", NAN); 309 309 psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, 310 "define exposue background mean stdev", NAN); 310 "define exposure background mean stdev", NAN); 311 psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-fringe_0", 0, 312 "define fringe slope (0th term)", NAN); 313 psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-fringe_1", 0, 314 "define fringe slope (1st term)", NAN); 315 psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-fringe_2", 0, 316 "define fringe slope (2nd term)", NAN); 317 psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-user_1", 0, 318 "define user statistic (1)", NAN); 319 psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-user_2", 0, 320 "define user statistic (2)", NAN); 321 psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-user_3", 0, 322 "define user statistic (3)", NAN); 323 psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-user_4", 0, 324 "define user statistic (4)", NAN); 325 psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-user_5", 0, 326 "define user statistic (5)", NAN); 311 327 psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-path_base", 0, 312 "define ba nana 1", NULL);328 "define base output location", NULL); 313 329 psMetadataAddS16(addprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, 314 330 "set fault code", 0); … … 351 367 "define recipe (required)", NULL); 352 368 psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg", 0, 353 "define exposu e background (required)", NAN);369 "define exposure background (required)", NAN); 354 370 psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg_stdev", 0, 355 "define exposu e background stdev (required)", NAN);371 "define exposure background stdev (required)", NAN); 356 372 psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, 357 "define exposue background mean stdev", NAN); 373 "define exposure background mean stdev", NAN); 374 psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-fringe_0", 0, 375 "define fringe slope (0th term)", NAN); 376 psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-fringe_1", 0, 377 "define fringe slope (1st term)", NAN); 378 psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-fringe_2", 0, 379 "define fringe slope (2nd term)", NAN); 380 psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-user_1", 0, 381 "define user statistic (1)", NAN); 382 psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-user_2", 0, 383 "define user statistic (2)", NAN); 384 psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-user_3", 0, 385 "define user statistic (3)", NAN); 386 psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-user_4", 0, 387 "define user statistic (4)", NAN); 388 psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-user_5", 0, 389 "define user statistic (5)", NAN); 358 390 psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-path_base", 0, 359 "define ba nana 1", NULL);391 "define base output location", NULL); 360 392 psMetadataAddS16(addprocessedexpArgs, PS_LIST_TAIL, "-code", 0, 361 393 "set fault code", 0); … … 392 424 "define recipe (required)", NULL); 393 425 psMetadataAddF64(addstackedArgs, PS_LIST_TAIL, "-bg", 0, 394 "define exposu e background (required)", NAN);426 "define exposure background (required)", NAN); 395 427 psMetadataAddF64(addstackedArgs, PS_LIST_TAIL, "-bg_stdev", 0, 396 "define exposu e background stdev (required)", NAN);428 "define exposure background stdev (required)", NAN); 397 429 psMetadataAddF64(addstackedArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, 398 "define exposue background mean stdev", NAN); 430 "define exposure background mean stdev", NAN); 431 psMetadataAddF64(addstackedArgs, PS_LIST_TAIL, "-user_1", 0, 432 "define user statistic (1)", NAN); 433 psMetadataAddF64(addstackedArgs, PS_LIST_TAIL, "-user_2", 0, 434 "define user statistic (2)", NAN); 435 psMetadataAddF64(addstackedArgs, PS_LIST_TAIL, "-user_3", 0, 436 "define user statistic (3)", NAN); 437 psMetadataAddF64(addstackedArgs, PS_LIST_TAIL, "-user_4", 0, 438 "define user statistic (4)", NAN); 439 psMetadataAddF64(addstackedArgs, PS_LIST_TAIL, "-user_5", 0, 440 "define user statistic (5)", NAN); 399 441 psMetadataAddStr(addstackedArgs, PS_LIST_TAIL, "-uri", 0, 400 442 "define URI (required)", NULL); … … 457 499 "define URI (required)", NULL); 458 500 psMetadataAddF64(addnormalizedimfileArgs, PS_LIST_TAIL, "-bg", 0, 459 "define exposu e background", NAN);501 "define exposure background", NAN); 460 502 psMetadataAddF64(addnormalizedimfileArgs, PS_LIST_TAIL, "-bg_stdev", 0, 461 "define exposu e background stdev", NAN);503 "define exposure background stdev", NAN); 462 504 psMetadataAddF64(addnormalizedimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, 463 "define exposue background mean stdev", NAN); 505 "define exposure background mean stdev", NAN); 506 psMetadataAddF64(addnormalizedimfileArgs, PS_LIST_TAIL, "-user_1", 0, 507 "define user statistic (1)", NAN); 508 psMetadataAddF64(addnormalizedimfileArgs, PS_LIST_TAIL, "-user_2", 0, 509 "define user statistic (2)", NAN); 510 psMetadataAddF64(addnormalizedimfileArgs, PS_LIST_TAIL, "-user_3", 0, 511 "define user statistic (3)", NAN); 512 psMetadataAddF64(addnormalizedimfileArgs, PS_LIST_TAIL, "-user_4", 0, 513 "define user statistic (4)", NAN); 514 psMetadataAddF64(addnormalizedimfileArgs, PS_LIST_TAIL, "-user_5", 0, 515 "define user statistic (5)", NAN); 464 516 psMetadataAddStr(addnormalizedimfileArgs, PS_LIST_TAIL, "-path_base", 0, 465 "define ba nana 1", NULL);517 "define base output location", NULL); 466 518 psMetadataAddS16(addnormalizedimfileArgs, PS_LIST_TAIL, "-code", 0, 467 519 "set fault code", 0); … … 483 535 "search for recipe (required)", NULL); 484 536 psMetadataAddF64(addnormalizedexpArgs, PS_LIST_TAIL, "-bg", 0, 485 "define exposu e background (required)", NAN);537 "define exposure background (required)", NAN); 486 538 psMetadataAddF64(addnormalizedexpArgs, PS_LIST_TAIL, "-bg_stdev", 0, 487 "define exposu e background stdev (required)", NAN);539 "define exposure background stdev (required)", NAN); 488 540 psMetadataAddF64(addnormalizedexpArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, 489 "define exposue background mean stdev", NAN); 541 "define exposure background mean stdev", NAN); 542 543 psMetadataAddF64(addnormalizedexpArgs, PS_LIST_TAIL, "-user_1", 0, 544 "define user statistic (1)", NAN); 545 psMetadataAddF64(addnormalizedexpArgs, PS_LIST_TAIL, "-user_2", 0, 546 "define user statistic (2)", NAN); 547 psMetadataAddF64(addnormalizedexpArgs, PS_LIST_TAIL, "-user_3", 0, 548 "define user statistic (3)", NAN); 549 psMetadataAddF64(addnormalizedexpArgs, PS_LIST_TAIL, "-user_4", 0, 550 "define user statistic (4)", NAN); 551 psMetadataAddF64(addnormalizedexpArgs, PS_LIST_TAIL, "-user_5", 0, 552 "define user statistic (5)", NAN); 553 490 554 psMetadataAddStr(addnormalizedexpArgs, PS_LIST_TAIL, "-path_base", 0, 491 "define ba nana 1", NULL);555 "define base output location", NULL); 492 556 psMetadataAddS16(addnormalizedexpArgs, PS_LIST_TAIL, "-code", 0, 493 557 "set fault code", 0); … … 502 566 "search for recipe", NULL); 503 567 psMetadataAddF64(normalizedexpArgs, PS_LIST_TAIL, "-bg", 0, 504 "define exposu e background", NAN);568 "define exposure background", NAN); 505 569 psMetadataAddF64(normalizedexpArgs, PS_LIST_TAIL, "-bg_stdev", 0, 506 "define exposu e background stdev", NAN);570 "define exposure background stdev", NAN); 507 571 psMetadataAddF64(normalizedexpArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, 508 "define exposu e background mean stdev", NAN);572 "define exposure background mean stdev", NAN); 509 573 psMetadataAddStr(normalizedexpArgs, PS_LIST_TAIL, "-path_base", 0, 510 "define ba nana 1", NULL);574 "define base output location", NULL); 511 575 psMetadataAddU64(normalizedexpArgs, PS_LIST_TAIL, "-limit", 0, 512 576 "limit result set to N items", 0); … … 562 626 "define recipe (required)", NULL); 563 627 psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-bg", 0, 564 "define exposu e background (required)", NAN);628 "define exposure background (required)", NAN); 565 629 psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-bg_stdev", 0, 566 "define exposu e background stdev (required)", NAN);630 "define exposure background stdev (required)", NAN); 567 631 psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, 568 "define exposue background mean stdev", NAN); 632 "define exposure background mean stdev", NAN); 633 psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-bin_stdev", 0, 634 "define exposure background binned stdev", NAN); 635 psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-fringe_0", 0, 636 "define fringe slope (0th term)", NAN); 637 psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-fringe_1", 0, 638 "define fringe slope (1st term)", NAN); 639 psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-fringe_2", 0, 640 "define fringe slope (2nd term)", NAN); 641 psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-user_1", 0, 642 "define user statistic (1)", NAN); 643 psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-user_2", 0, 644 "define user statistic (2)", NAN); 645 psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-user_3", 0, 646 "define user statistic (3)", NAN); 647 psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-user_4", 0, 648 "define user statistic (4)", NAN); 649 psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-user_5", 0, 650 "define user statistic (5)", NAN); 569 651 psMetadataAddStr(addresidimfileArgs, PS_LIST_TAIL, "-path_base", 0, 570 "define ba nana 1", NULL);652 "define base output location", NULL); 571 653 psMetadataAddS16(addresidimfileArgs, PS_LIST_TAIL, "-code", 0, 572 654 "set fault code", 0); … … 602 684 "define recipe (required)", NULL); 603 685 psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-bg", 0, 604 "define exposu e background (required)", NAN);686 "define exposure background (required)", NAN); 605 687 psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-bg_stdev", 0, 606 "define exposu e background stdev (required)", NAN);688 "define exposure background stdev (required)", NAN); 607 689 psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, 608 "define exposue background mean stdev", NAN); 690 "define exposure background mean stdev", NAN); 691 psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-bin_stdev", 0, 692 "define exposure background binned stdev", NAN); 693 psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-fringe_0", 0, 694 "define fringe slope (0th term)", NAN); 695 psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-fringe_1", 0, 696 "define fringe slope (1st term)", NAN); 697 psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-fringe_2", 0, 698 "define fringe slope (2nd term)", NAN); 699 psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-user_1", 0, 700 "define user statistic (1)", NAN); 701 psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-user_2", 0, 702 "define user statistic (2)", NAN); 703 psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-user_3", 0, 704 "define user statistic (3)", NAN); 705 psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-user_4", 0, 706 "define user statistic (4)", NAN); 707 psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-user_5", 0, 708 "define user statistic (5)", NAN); 609 709 psMetadataAddStr(addresidexpArgs, PS_LIST_TAIL, "-path_base", 0, 610 "define ba nana 1", NULL);710 "define base output location", NULL); 611 711 psMetadataAddS16(addresidexpArgs, PS_LIST_TAIL, "-code", 0, 612 712 "set fault code", 0); … … 651 751 "define recipe", NULL); 652 752 psMetadataAddF64(updateresidexpArgs, PS_LIST_TAIL, "-bg", 0, 653 "define exposu e background", NAN);753 "define exposure background", NAN); 654 754 psMetadataAddF64(updateresidexpArgs, PS_LIST_TAIL, "-bg_stdev", 0, 655 "define exposu e background stdev", NAN);755 "define exposure background stdev", NAN); 656 756 psMetadataAddF64(updateresidexpArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, 657 "define exposu e background mean stdev", NAN);757 "define exposure background mean stdev", NAN); 658 758 psMetadataAddStr(updateresidexpArgs, PS_LIST_TAIL, "-path_base", 0, 659 "define ba nana 1", NULL);759 "define base output location", NULL); 660 760 psMetadataAddBool(updateresidexpArgs, PS_LIST_TAIL, "-reject", 0, 661 761 "exposure is not to be stacked in the next iteration", false); … … 668 768 "define iteration number", 0); 669 769 psMetadataAddF64(adddetrunsummaryArgs, PS_LIST_TAIL, "-bg", 0, 670 "define exposu e background (required)", NAN);770 "define exposure background (required)", NAN); 671 771 psMetadataAddF64(adddetrunsummaryArgs, PS_LIST_TAIL, "-bg_stdev", 0, 672 "define exposu e background stdev (required)", NAN);772 "define exposure background stdev (required)", NAN); 673 773 psMetadataAddF64(adddetrunsummaryArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, 674 "define exposu e background mean stdev", NAN);774 "define exposure background mean stdev", NAN); 675 775 psMetadataAddS16(adddetrunsummaryArgs, PS_LIST_TAIL, "-code", 0, 676 776 "set fault code", 0); … … 752 852 "end of detrend run applicable peroid", NULL); 753 853 psMetadataAddF64(register_detrendArgs, PS_LIST_TAIL, "-bg", 0, 754 "define exposu e background", NAN);854 "define exposure background", NAN); 755 855 psMetadataAddF64(register_detrendArgs, PS_LIST_TAIL, "-bg_stdev", 0, 756 "define exposu e background stdev", NAN);856 "define exposure background stdev", NAN); 757 857 psMetadataAddF64(register_detrendArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, 758 "define exposu e background mean stdev", NAN);858 "define exposure background mean stdev", NAN); 759 859 psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-parent", 0, 760 860 "define parent det_id", NULL); … … 771 871 "define resid file URI (required)", NULL); 772 872 psMetadataAddF64(register_detrend_imfileArgs, PS_LIST_TAIL, "-bg", 0, 773 "define exposu e background", NAN);873 "define exposure background", NAN); 774 874 psMetadataAddF64(register_detrend_imfileArgs, PS_LIST_TAIL, "-bg_stdev", 0, 775 "define exposu e background stdev", NAN);875 "define exposure background stdev", NAN); 776 876 psMetadataAddF64(register_detrend_imfileArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, 777 "define exposu e background mean stdev", NAN);877 "define exposure background mean stdev", NAN); 778 878 psMetadataAddStr(register_detrend_imfileArgs, PS_LIST_TAIL, "-path_base", 0, 779 "define ba nana 1", NULL);879 "define base output location", NULL); 780 880 781 881 psFree(now); -
trunk/ippTools/src/regtool.c
r13606 r13617 940 940 } 941 941 942 psF64 user_1 = psMetadataLookupF64(&status, config->args, "-user_1"); 943 if (!status) { 944 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_1"); 945 return false; 946 } 947 psF64 user_2 = psMetadataLookupF64(&status, config->args, "-user_2"); 948 if (!status) { 949 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_2"); 950 return false; 951 } 952 psF64 user_3 = psMetadataLookupF64(&status, config->args, "-user_3"); 953 if (!status) { 954 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_3"); 955 return false; 956 } 957 psF64 user_4 = psMetadataLookupF64(&status, config->args, "-user_4"); 958 if (!status) { 959 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_4"); 960 return false; 961 } 962 psF64 user_5 = psMetadataLookupF64(&status, config->args, "-user_5"); 963 if (!status) { 964 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_5"); 965 return false; 966 } 967 942 968 psString object = psMetadataLookupStr(&status, config->args, "-object"); 943 969 if (!status) { … … 991 1017 ccd_temp, 992 1018 posang, 1019 user_1, 1020 user_2, 1021 user_3, 1022 user_4, 1023 user_5, 993 1024 object, 994 1025 0.0, … … 1098 1129 if (!status) { 1099 1130 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -posang"); 1131 return false; 1132 } 1133 1134 psF64 user_1 = psMetadataLookupF64(&status, config->args, "-user_1"); 1135 if (!status) { 1136 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_1"); 1137 return false; 1138 } 1139 psF64 user_2 = psMetadataLookupF64(&status, config->args, "-user_2"); 1140 if (!status) { 1141 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_2"); 1142 return false; 1143 } 1144 psF64 user_3 = psMetadataLookupF64(&status, config->args, "-user_3"); 1145 if (!status) { 1146 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_3"); 1147 return false; 1148 } 1149 psF64 user_4 = psMetadataLookupF64(&status, config->args, "-user_4"); 1150 if (!status) { 1151 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_4"); 1152 return false; 1153 } 1154 psF64 user_5 = psMetadataLookupF64(&status, config->args, "-user_5"); 1155 if (!status) { 1156 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_5"); 1100 1157 return false; 1101 1158 } … … 1147 1204 ccd_temp, 1148 1205 posang, 1206 user_1, 1207 user_2, 1208 user_3, 1209 user_4, 1210 user_5, 1149 1211 object, 1150 1212 dateobs, -
trunk/ippTools/src/regtoolConfig.c
r13606 r13617 95 95 psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-posang", 0, 96 96 "define rotator position angle", NAN); 97 psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-user_1", 0, 98 "define user statistic (1)", NAN); 99 psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-user_2", 0, 100 "define user statistic (2)", NAN); 101 psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-user_3", 0, 102 "define user statistic (3)", NAN); 103 psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-user_4", 0, 104 "define user statistic (4)", NAN); 105 psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-user_5", 0, 106 "define user statistic (5)", NAN); 97 107 psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-object", 0, 98 108 "define exposure object", NULL); … … 178 188 psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-posang", 0, 179 189 "define rotator position angle", NAN); 190 psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-user_1", 0, 191 "define user statistic (1)", NAN); 192 psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-user_2", 0, 193 "define user statistic (2)", NAN); 194 psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-user_3", 0, 195 "define user statistic (3)", NAN); 196 psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-user_4", 0, 197 "define user statistic (4)", NAN); 198 psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-user_5", 0, 199 "define user statistic (5)", NAN); 180 200 psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-object", 0, 181 201 "define exposure object", NULL);
Note:
See TracChangeset
for help on using the changeset viewer.
