Changeset 14042
- Timestamp:
- Jul 6, 2007, 9:10:14 AM (19 years ago)
- Location:
- trunk/ippTasks
- Files:
-
- 12 edited
-
camera.pro (modified) (3 diffs)
-
chip.pro (modified) (3 diffs)
-
detrend.norm.pro (modified) (9 diffs)
-
detrend.process.pro (modified) (6 diffs)
-
detrend.reject.pro (modified) (3 diffs)
-
detrend.resid.pro (modified) (6 diffs)
-
detrend.stack.pro (modified) (3 diffs)
-
diff.pro (modified) (3 diffs)
-
pantasks.pro (modified) (6 diffs)
-
register.pro (modified) (6 diffs)
-
stack.pro (modified) (3 diffs)
-
warp.pro (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ippTasks/camera.pro
r13816 r14042 86 86 end 87 87 88 # delete existing entries in the appropriate states88 # delete existing entries in the appropriate pantaskStates 89 89 process_cleanup camPendingExp 90 90 end … … 112 112 if ($network == 0) break 113 113 114 # look for new images in camPendingExp ( state == NULL)115 book getpage camPendingExp 0 -var pageName -key state NULL114 # look for new images in camPendingExp (pantaskState == NULL) 115 book getpage camPendingExp 0 -var pageName -key pantaskState NULL 116 116 if ($pageName == NULL) break 117 117 118 book setword camPendingExp $pageName state RUN118 book setword camPendingExp $pageName pantaskState RUN 119 119 book getword camPendingExp $pageName camera -var CAMERA 120 120 book getword camPendingExp $pageName exp_id -var EXP_ID … … 170 170 task.exit timeout 171 171 showcommand timeout 172 book setword camPendingExp $options:0 state TIMEOUT172 book setword camPendingExp $options:0 pantaskState TIMEOUT 173 173 end 174 174 end -
trunk/ippTasks/chip.pro
r14016 r14042 86 86 end 87 87 88 # delete existing entries in the appropriate states88 # delete existing entries in the appropriate pantaskStates 89 89 process_cleanup chipPendingImfile 90 90 end … … 112 112 if ($network == 0) break 113 113 114 # look for new images in chipPendingImfile ( state == NULL)115 book getpage chipPendingImfile 0 -var pageName -key state NULL114 # look for new images in chipPendingImfile (pantaskState == NULL) 115 book getpage chipPendingImfile 0 -var pageName -key pantaskState NULL 116 116 if ($pageName == NULL) break 117 117 118 book setword chipPendingImfile $pageName state RUN118 book setword chipPendingImfile $pageName pantaskState RUN 119 119 book getword chipPendingImfile $pageName camera -var CAMERA 120 120 book getword chipPendingImfile $pageName exp_id -var EXP_ID … … 173 173 task.exit timeout 174 174 showcommand timeout 175 book setword chipPendingImfile $options:0 state TIMEOUT175 book setword chipPendingImfile $options:0 pantaskState TIMEOUT 176 176 end 177 177 end -
trunk/ippTasks/detrend.norm.pro
r13683 r14042 118 118 end 119 119 120 # delete existing entries in the appropriate states120 # delete existing entries in the appropriate pantaskStates 121 121 process_cleanup detPendingNormStatImfile 122 122 end … … 145 145 146 146 # look for new images in detPendingNormStatImfile 147 book getpage detPendingNormStatImfile 0 -var pageName -key state NULL147 book getpage detPendingNormStatImfile 0 -var pageName -key pantaskState NULL 148 148 if ($pageName == NULL) break 149 149 150 book setword detPendingNormStatImfile $pageName state RUN150 book setword detPendingNormStatImfile $pageName pantaskState RUN 151 151 book getword detPendingNormStatImfile $pageName det_id -var DET_ID 152 152 book getword detPendingNormStatImfile $pageName det_type -var DET_TYPE … … 198 198 task.exit timeout 199 199 showcommand timeout 200 book setword detPendingNormStatImfile $options:0 state TIMEOUT200 book setword detPendingNormStatImfile $options:0 pantaskState TIMEOUT 201 201 end 202 202 end … … 237 237 end 238 238 239 # delete existing entries in the appropriate states239 # delete existing entries in the appropriate pantaskStates 240 240 process_cleanup detPendingNormImfile 241 241 end … … 264 264 265 265 # look for new images in detPendingNormImfile 266 book getpage detPendingNormImfile 0 -var pageName -key state NULL266 book getpage detPendingNormImfile 0 -var pageName -key pantaskState NULL 267 267 if ($pageName == NULL) break 268 268 269 book setword detPendingNormImfile $pageName state RUN269 book setword detPendingNormImfile $pageName pantaskState RUN 270 270 book getword detPendingNormImfile $pageName det_type -var DET_TYPE 271 271 book getword detPendingNormImfile $pageName camera -var CAMERA … … 321 321 task.exit timeout 322 322 showcommand timeout 323 book setword detPendingNormImfile $options:0 state TIMEOUT323 book setword detPendingNormImfile $options:0 pantaskState TIMEOUT 324 324 end 325 325 end … … 360 360 end 361 361 362 # delete existing entries in the appropriate states362 # delete existing entries in the appropriate pantaskStates 363 363 process_cleanup detPendingNormExp 364 364 end … … 387 387 388 388 # look for new images in detPendingNormExp 389 book getpage detPendingNormExp 0 -var pageName -key state NULL389 book getpage detPendingNormExp 0 -var pageName -key pantaskState NULL 390 390 if ($pageName == NULL) break 391 391 392 book setword detPendingNormExp $pageName state RUN392 book setword detPendingNormExp $pageName pantaskState RUN 393 393 book getword detPendingNormExp $pageName det_id -var DET_ID 394 394 book getword detPendingNormExp $pageName iteration -var ITERATION … … 441 441 task.exit timeout 442 442 showcommand timeout 443 book setword detPendingNormExp $options:0 state TIMEOUT444 end 445 end 443 book setword detPendingNormExp $options:0 pantaskState TIMEOUT 444 end 445 end -
trunk/ippTasks/detrend.process.pro
r13937 r14042 105 105 end 106 106 107 # delete existing entries in the appropriate states107 # delete existing entries in the appropriate pantaskStates 108 108 process_cleanup detPendingProcessedImfile 109 109 end … … 132 132 133 133 # look for new images in detPendingProcessedImfile 134 book getpage detPendingProcessedImfile 0 -var pageName -key state NULL134 book getpage detPendingProcessedImfile 0 -var pageName -key pantaskState NULL 135 135 if ($pageName == NULL) break 136 136 137 book setword detPendingProcessedImfile $pageName state RUN137 book setword detPendingProcessedImfile $pageName pantaskState RUN 138 138 book getword detPendingProcessedImfile $pageName det_id -var DET_ID 139 139 book getword detPendingProcessedImfile $pageName det_type -var DET_TYPE … … 197 197 task.exit timeout 198 198 showcommand timeout 199 book setword detPendingProcessedImfile $options:0 state TIMEOUT199 book setword detPendingProcessedImfile $options:0 pantaskState TIMEOUT 200 200 end 201 201 end … … 236 236 end 237 237 238 # delete existing entries in the appropriate states238 # delete existing entries in the appropriate pantaskStates 239 239 process_cleanup detPendingProcessedExp 240 240 end … … 263 263 264 264 # look for new exposures in detPendingProcessedExp 265 book getpage detPendingProcessedExp 0 -var pageName -key state NULL265 book getpage detPendingProcessedExp 0 -var pageName -key pantaskState NULL 266 266 if ($pageName == NULL) break 267 267 268 book setword detPendingProcessedExp $pageName state RUN268 book setword detPendingProcessedExp $pageName pantaskState RUN 269 269 book getword detPendingProcessedExp $pageName det_id -var DET_ID 270 270 book getword detPendingProcessedExp $pageName det_type -var DET_TYPE … … 322 322 task.exit timeout 323 323 showcommand timeout 324 book setword detPendingProcessedExp $options:0 state TIMEOUT325 end 326 end 324 book setword detPendingProcessedExp $options:0 pantaskState TIMEOUT 325 end 326 end -
trunk/ippTasks/detrend.reject.pro
r13683 r14042 86 86 end 87 87 88 # delete existing entries in the appropriate states88 # delete existing entries in the appropriate pantaskStates 89 89 process_cleanup detRejectExp 90 90 end … … 113 113 114 114 # look for new images in detRejectExp 115 book getpage detRejectExp 0 -var pageName -key state NULL115 book getpage detRejectExp 0 -var pageName -key pantaskState NULL 116 116 if ($pageName == NULL) break 117 117 118 book setword detRejectExp $pageName state RUN118 book setword detRejectExp $pageName pantaskState RUN 119 119 book getword detRejectExp $pageName det_id -var DET_ID 120 120 book getword detRejectExp $pageName iteration -var ITERATION … … 167 167 task.exit timeout 168 168 showcommand failure 169 book setword detRejectExp $options:0 state TIMEOUT169 book setword detRejectExp $options:0 pantaskState TIMEOUT 170 170 end 171 171 end -
trunk/ippTasks/detrend.resid.pro
r13937 r14042 102 102 end 103 103 104 # delete existing entries in the appropriate states104 # delete existing entries in the appropriate pantaskStates 105 105 process_cleanup detPendingResidImfile 106 106 end … … 129 129 130 130 # look for new images in detPendingResidImfile 131 book getpage detPendingResidImfile 0 -var pageName -key state NULL131 book getpage detPendingResidImfile 0 -var pageName -key pantaskState NULL 132 132 if ($pageName == NULL) break 133 133 134 book setword detPendingResidImfile $pageName state RUN134 book setword detPendingResidImfile $pageName pantaskState RUN 135 135 book getword detPendingResidImfile $pageName det_id -var DET_ID 136 136 book getword detPendingResidImfile $pageName iteration -var ITERATION … … 197 197 task.exit timeout 198 198 showcommand timeout 199 book setword detPendingResidImfile $options:0 state TIMEOUT199 book setword detPendingResidImfile $options:0 pantaskState TIMEOUT 200 200 end 201 201 end … … 236 236 end 237 237 238 # delete existing entries in the appropriate states238 # delete existing entries in the appropriate pantaskStates 239 239 process_cleanup detPendingResidExp 240 240 end … … 263 263 264 264 # look for new images in detPendingResidExp 265 book getpage detPendingResidExp 0 -var pageName -key state NULL265 book getpage detPendingResidExp 0 -var pageName -key pantaskState NULL 266 266 if ($pageName == NULL) break 267 267 268 book setword detPendingResidExp $pageName state RUN268 book setword detPendingResidExp $pageName pantaskState RUN 269 269 book getword detPendingResidExp $pageName det_id -var DET_ID 270 270 book getword detPendingResidExp $pageName iteration -var ITERATION … … 322 322 task.exit timeout 323 323 showcommand timeout 324 book setword detPendingResidExp $options:0 state TIMEOUT325 end 326 end 324 book setword detPendingResidExp $options:0 pantaskState TIMEOUT 325 end 326 end -
trunk/ippTasks/detrend.stack.pro
r13937 r14042 87 87 end 88 88 89 # delete existing entries in the appropriate states89 # delete existing entries in the appropriate pantaskStates 90 90 process_cleanup detPendingStackedImfile 91 91 end … … 114 114 115 115 # look for new images in detPendingStackedImfile 116 book getpage detPendingStackedImfile 0 -var pageName -key state NULL116 book getpage detPendingStackedImfile 0 -var pageName -key pantaskState NULL 117 117 if ($pageName == NULL) break 118 118 119 book setword detPendingStackedImfile $pageName state RUN119 book setword detPendingStackedImfile $pageName pantaskState RUN 120 120 book getword detPendingStackedImfile $pageName det_id -var DET_ID 121 121 book getword detPendingStackedImfile $pageName iteration -var ITERATION … … 177 177 task.exit timeout 178 178 showcommand timeout 179 book setword detPendingStackedImfile $options:0 state TIMEOUT179 book setword detPendingStackedImfile $options:0 pantaskState TIMEOUT 180 180 end 181 181 end -
trunk/ippTasks/diff.pro
r13892 r14042 95 95 end 96 96 97 # delete existing entries in the appropriate states97 # delete existing entries in the appropriate pantaskStates 98 98 process_cleanup diffSkyfile 99 99 end … … 122 122 if ($network == 0) break 123 123 124 # look for new images in diffSkyfile ( state == NULL)125 book getpage diffSkyfile 0 -var pageName -key state NULL124 # look for new images in diffSkyfile (pantaskState == NULL) 125 book getpage diffSkyfile 0 -var pageName -key pantaskState NULL 126 126 if ($pageName == NULL) break 127 127 128 book setword diffSkyfile $pageName state RUN128 book setword diffSkyfile $pageName pantaskState RUN 129 129 book getword diffSkyfile $pageName diff_id -var DIFF_ID 130 130 book getword diffSkyfile $pageName workdir -var WORKDIR … … 175 175 task.exit timeout 176 176 showcommand timeout 177 book setword diffSkyfile $options:0 state TIMEOUT177 book setword diffSkyfile $options:0 pantaskState TIMEOUT 178 178 end 179 179 end -
trunk/ippTasks/pantasks.pro
r13949 r14042 256 256 if ($exitCode == $EXIT_SUCCESS) 257 257 # the handler scripts update DB the tables; here we just update the page 258 book setword $bookName $pageName state DONE258 book setword $bookName $pageName pantaskState DONE 259 259 return 260 260 end 261 261 262 262 # failure related to the data files 263 # jobs which result in DATAERR must have db state updated263 # jobs which result in DATAERR must have db pantaskState updated 264 264 if ($exitCode == $EXIT_DATA_ERR) 265 265 showcommand failure 266 book setword $bookName $pageName state DATA_ERR266 book setword $bookName $pageName pantaskState DATA_ERR 267 267 return 268 268 end … … 279 279 # stop 280 280 showcommand "system failure" 281 book setword $bookName $pageName state SYS_ERR281 book setword $bookName $pageName pantaskState SYS_ERR 282 282 return 283 283 end … … 287 287 # stop 288 288 showcommand "config error" 289 book setword $bookName $pageName state CONFIG_ERR289 book setword $bookName $pageName pantaskState CONFIG_ERR 290 290 return 291 291 end … … 295 295 # stop 296 296 showcommand "programming error" 297 book setword $bookName $pageName state PROG_ERR297 book setword $bookName $pageName pantaskState PROG_ERR 298 298 return 299 299 end … … 301 301 # any other exit status 302 302 showcommand failure 303 book setword $bookName $pageName state UNKNOWN_ERR303 book setword $bookName $pageName pantaskState UNKNOWN_ERR 304 304 end 305 305 … … 311 311 end 312 312 313 book delpage $1 -key state DONE314 book delpage $1 -key state SYS_ERR315 book delpage $1 -key state DATA_ERR316 book delpage $1 -key state PROG_ERR317 book delpage $1 -key state CONFIG_ERR318 book delpage $1 -key state UNKNOWN_ERR319 end 313 book delpage $1 -key pantaskState DONE 314 book delpage $1 -key pantaskState SYS_ERR 315 book delpage $1 -key pantaskState DATA_ERR 316 book delpage $1 -key pantaskState PROG_ERR 317 book delpage $1 -key pantaskState CONFIG_ERR 318 book delpage $1 -key pantaskState UNKNOWN_ERR 319 end -
trunk/ippTasks/register.pro
r14041 r14042 105 105 end 106 106 107 # delete existing entries in the appropriate states107 # delete existing entries in the appropriate pantaskStates 108 108 process_cleanup regPendingImfile 109 109 end … … 132 132 133 133 # look for new images in regPendingImfile 134 book getpage regPendingImfile 0 -var pageName -key state NULL134 book getpage regPendingImfile 0 -var pageName -key pantaskState NULL 135 135 if ($pageName == NULL) break 136 136 137 book setword regPendingImfile $pageName state RUN137 book setword regPendingImfile $pageName pantaskState RUN 138 138 139 139 book getword regPendingImfile $pageName exp_id -var EXP_ID … … 183 183 task.exit timeout 184 184 showcommand timeout 185 book setword regPendingImfile $options:0 state TIMEOUT185 book setword regPendingImfile $options:0 pantaskState TIMEOUT 186 186 end 187 187 end … … 219 219 end 220 220 221 # delete existing entries in the appropriate states221 # delete existing entries in the appropriate pantaskStates 222 222 process_cleanup regPendingExp 223 223 end … … 245 245 if ($network == 0) break 246 246 247 # look for new images in regPendingExp ( state == NULL)248 book getpage regPendingExp 0 -var pageName -key state NULL247 # look for new images in regPendingExp (pantaskState == NULL) 248 book getpage regPendingExp 0 -var pageName -key pantaskState NULL 249 249 if ($pageName == NULL) break 250 250 251 book setword regPendingExp $pageName state RUN251 book setword regPendingExp $pageName pantaskState RUN 252 252 book getword regPendingExp $pageName exp_id -var EXP_ID 253 253 book getword regPendingExp $pageName tmp_exp_name -var TMP_EXP_NAME … … 294 294 task.exit timeout 295 295 showcommand timeout 296 book setword regPendingExp $options:0 state TIMEOUT296 book setword regPendingExp $options:0 pantaskState TIMEOUT 297 297 end 298 298 end -
trunk/ippTasks/stack.pro
r12697 r14042 95 95 end 96 96 97 # delete existing entries in the appropriate states97 # delete existing entries in the appropriate pantaskStates 98 98 process_cleanup stackSumSkyfile 99 99 end … … 122 122 if ($network == 0) break 123 123 124 # look for new images in stackSumSkyfile ( state == NULL)125 book getpage stackSumSkyfile 0 -var pageName -key state NULL124 # look for new images in stackSumSkyfile (pantaskState == NULL) 125 book getpage stackSumSkyfile 0 -var pageName -key pantaskState NULL 126 126 if ($pageName == NULL) break 127 127 128 book setword stackSumSkyfile $pageName state RUN128 book setword stackSumSkyfile $pageName pantaskState RUN 129 129 book getword stackSumSkyfile $pageName stack_id -var STACK_ID 130 130 book getword stackSumSkyfile $pageName workdir -var WORKDIR … … 175 175 task.exit timeout 176 176 showcommand timeout 177 book setword stackSumSkyfile $options:0 state TIMEOUT177 book setword stackSumSkyfile $options:0 pantaskState TIMEOUT 178 178 end 179 179 end -
trunk/ippTasks/warp.pro
r13153 r14042 111 111 end 112 112 113 # delete existing entries in the appropriate states113 # delete existing entries in the appropriate pantaskStates 114 114 process_cleanup warpInputExp 115 115 end … … 138 138 if ($network == 0) break 139 139 140 # look for new images in warpInputExp ( state == NULL)141 book getpage warpInputExp 0 -var pageName -key state NULL140 # look for new images in warpInputExp (pantaskState == NULL) 141 book getpage warpInputExp 0 -var pageName -key pantaskState NULL 142 142 if ("$pageName" == "NULL") break 143 143 144 book setword warpInputExp $pageName state RUN144 book setword warpInputExp $pageName pantaskState RUN 145 145 book getword warpInputExp $pageName warp_id -var WARP_ID 146 146 book getword warpInputExp $pageName camera -var CAMERA … … 192 192 task.exit timeout 193 193 showcommand timeout 194 book setword warpInputExp $options:0 state TIMEOUT194 book setword warpInputExp $options:0 pantaskState TIMEOUT 195 195 end 196 196 end … … 231 231 end 232 232 233 # delete existing entries in the appropriate states233 # delete existing entries in the appropriate pantaskStates 234 234 process_cleanup warpPendingSkyCell 235 235 end … … 258 258 if ($network == 0) break 259 259 260 # look for new images in warpPendingSkyCell ( state == NULL)261 book getpage warpPendingSkyCell 0 -var pageName -key state NULL260 # look for new images in warpPendingSkyCell (pantaskState == NULL) 261 book getpage warpPendingSkyCell 0 -var pageName -key pantaskState NULL 262 262 if ("$pageName" == "NULL") break 263 263 264 book setword warpPendingSkyCell $pageName state RUN264 book setword warpPendingSkyCell $pageName pantaskState RUN 265 265 book getword warpPendingSkyCell $pageName warp_id -var WARP_ID 266 266 book getword warpPendingSkyCell $pageName skycell_id -var SKYCELL_ID … … 314 314 task.exit timeout 315 315 showcommand timeout 316 book setword warpPendingSkyCell $options:0 state TIMEOUT317 end 318 end 319 316 book setword warpPendingSkyCell $options:0 pantaskState TIMEOUT 317 end 318 end 319
Note:
See TracChangeset
for help on using the changeset viewer.
