Changeset 40485
- Timestamp:
- Jun 27, 2018, 3:41:23 PM (8 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
-
ippScripts/scripts/detrend_norm_apply.pl (modified) (1 diff)
-
ippScripts/scripts/detrend_norm_calc.pl (modified) (4 diffs)
-
ippScripts/scripts/detrend_process_imfile.pl (modified) (1 diff)
-
ippScripts/scripts/detrend_resid_imfile.pl (modified) (2 diffs)
-
ippScripts/scripts/detrend_stack.pl (modified) (2 diffs)
-
ippconfig/recipes/reductionClasses.mdc (modified) (3 diffs)
-
ippconfig/recipes/rejections.config (modified) (1 diff)
-
ppMerge/src/ppMergeArguments.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ippScripts/scripts/detrend_norm_apply.pl
r39505 r40485 88 88 'SKYFLATTEST_RAW' => 'FLAT', 89 89 'FLAT' => 'FLAT', 90 'FLATTEST' => 'FLAT', 90 91 'DOMEFLAT' => 'FLAT', 91 92 'SKYFLAT' => 'FLAT', -
trunk/ippScripts/scripts/detrend_norm_calc.pl
r40404 r40485 80 80 'SKYFLATTEST_RAW' => 1, 81 81 'FLAT' => 1, 82 'FLATTEST' => 1, 82 83 'DOMEFLAT' => 1, 83 84 'SKYFLAT' => 1, … … 199 200 if ($normalisation == 0.0 or lc($normalisation) eq 'nan') { 200 201 warn("Class $className has bad normalisation: $normalisation"); 201 exit($PS_EXIT_SYS_ERROR);202 # exit($PS_EXIT_SYS_ERROR); 202 203 } 203 204 … … 212 213 if (not run \@command, \$stdin, \$stdout, \$stderr) { 213 214 warn("Unable to perform dettool -addnormstat for $className: $?"); 214 exit($PS_EXIT_SYS_ERROR);215 # exit($PS_EXIT_SYS_ERROR); 215 216 } 216 217 print $stdout . "\n" if $verbose; … … 225 226 if ($normalisation == 0.0 or lc($normalisation) eq 'nan') { 226 227 warn("Class $className has bad normalisation: $normalisation"); 227 exit($PS_EXIT_SYS_ERROR);228 # exit($PS_EXIT_SYS_ERROR); 228 229 } 229 230 print "$className : $normalisation\n"; -
trunk/ippScripts/scripts/detrend_process_imfile.pl
r39707 r40485 97 97 'SKYFLATTEST_RAW' => 'PPIMAGE.OUTPUT.DETREND', 98 98 'FLAT' => 'PPIMAGE.OUTPUT.DETREND', 99 'FLATTEST' => 'PPIMAGE.OUTPUT.DETREND', 99 100 'DOMEFLAT' => 'PPIMAGE.OUTPUT.DETREND', 100 101 'SKYFLAT' => 'PPIMAGE.OUTPUT.DETREND', -
trunk/ippScripts/scripts/detrend_resid_imfile.pl
r33666 r40485 114 114 'SKYFLATTEST_RAW' => '-flat', # Specify the flat frame 115 115 'FLAT' => '-flat', # Specify the flat frame 116 'FLATTEST' => '-flat', # Specify the flat frame 116 117 'DOMEFLAT' => '-flat', # Specify the flat frame 117 118 'SKYFLAT' => '-flat', # Specify the flat frame … … 142 143 'SKYFLATTEST_RAW' => 'PPIMAGE.OUTPUT.DETREND', 143 144 'FLAT' => 'PPIMAGE.OUTPUT.DETREND', 145 'FLATTEST' => 'PPIMAGE.OUTPUT.DETREND', 144 146 'DOMEFLAT' => 'PPIMAGE.OUTPUT.DETREND', 145 147 'SKYFLAT' => 'PPIMAGE.OUTPUT.DETREND', -
trunk/ippScripts/scripts/detrend_stack.pl
r33666 r40485 92 92 'SKYFLATTEST_RAW' => 'PPMERGE.OUTPUT.FLAT', 93 93 'FLAT' => 'PPMERGE.OUTPUT.FLAT', 94 'FLATTEST' => 'PPMERGE.OUTPUT.FLAT', 94 95 'DOMEFLAT' => 'PPMERGE.OUTPUT.FLAT', 95 96 'SKYFLAT' => 'PPMERGE.OUTPUT.FLAT', … … 118 119 'SKYFLATTEST_RAW' => 'DETSTATS', 119 120 'FLAT' => 'DETSTATS', 121 'FLATTEST' => 'DETSTATS', 120 122 'DOMEFLAT' => 'DETSTATS', 121 123 'SKYFLAT' => 'DETSTATS', -
trunk/ippconfig/recipes/reductionClasses.mdc
r40465 r40485 45 45 FLAT_PREMASK_JPEG_RESID STR FLAT_RESID 46 46 47 FLATTEST_PREMASK_PROCESS STR PPIMAGE_FLATPROC_PREMASK 48 FLATTEST_PREMASK_RESID STR PPIMAGE_F 49 FLATTEST_PREMASK_VERIFY STR PPIMAGE_F 50 FLATTEST_PREMASK_STACK STR PPMERGE_FLAT 51 FLATTEST_PREMASK_JPEG_IMAGE STR FLAT 52 FLATTEST_PREMASK_JPEG_RESID STR FLAT_RESID 53 47 54 DOMEFLAT_PREMASK_PROCESS STR PPIMAGE_FLATPROC_PREMASK 48 55 DOMEFLAT_PREMASK_RESID STR PPIMAGE_F … … 88 95 SKYFLATTEST_RAW_JPEG_RESID STR FLAT_RESID 89 96 90 91 92 97 # *** Standard flat-field types 93 98 FLAT_PROCESS STR PPIMAGE_OBDS … … 97 102 FLAT_JPEG_IMAGE STR FLAT 98 103 FLAT_JPEG_RESID STR FLAT_RESID 104 105 FLATTEST_PROCESS STR PPIMAGE_OBDS 106 FLATTEST_RESID STR PPIMAGE_F 107 FLATTEST_VERIFY STR PPIMAGE_F 108 FLATTEST_STACK STR PPMERGE_FLAT 109 FLATTEST_JPEG_IMAGE STR FLAT 110 FLATTEST_JPEG_RESID STR FLAT_RESID 99 111 100 112 DOMEFLAT_PROCESS STR PPIMAGE_OBDS -
trunk/ippconfig/recipes/rejections.config
r33636 r40485 122 122 123 123 FLAT METADATA 124 FILTER STR * 125 EXPECTED F32 0.0 126 IMFILE.MEAN F32 0.0 127 IMFILE.STDEV F32 0.0 128 IMFILE.MEANSTDEV F32 0.0 129 IMFILE.SKEWNESS F32 0.0 130 IMFILE.KURTOSIS F32 0.0 131 IMFILE.SNR F32 0.0 132 IMFILE.BIN.STDEV F32 0.0 133 IMFILE.BIN.SNR F32 0.0 134 IMFILE.FLUX F32 0.0 135 EXP.MEAN F32 0.0 136 EXP.STDEV F32 0.0 137 EXP.MEANSTDEV F32 0.0 138 EXP.SNR F32 0.0 139 EXP.BIN.STDEV F32 0.0 140 EXP.BIN.SNR F32 0.0 141 EXP.FLUX F32 0.0 142 ENSEMBLE.MEAN F32 0.0 143 ENSEMBLE.STDEV F32 0.0 144 ENSEMBLE.MEANSTDEV F32 3.0 145 END 146 147 FLATTEST METADATA 124 148 FILTER STR * 125 149 EXPECTED F32 0.0 -
trunk/ppMerge/src/ppMergeArguments.c
r33666 r40485 261 261 } 262 262 if (!strcasecmp(typeStr, "FLAT") || 263 !strcasecmp(typeStr, "FLATTEST") || 263 264 !strcasecmp(typeStr, "DOMEFLAT") || 264 265 !strcasecmp(typeStr, "SKYFLAT") ||
Note:
See TracChangeset
for help on using the changeset viewer.
