Changeset 26070
- Timestamp:
- Nov 8, 2009, 11:56:57 AM (17 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
-
ippTasks/pantasks.pro (modified) (4 diffs)
-
ippTasks/survey.pro (modified) (11 diffs)
-
ippconfig/gpc1/ppImage.config (modified) (1 diff)
-
ippconfig/recipes/psastro.config (modified) (1 diff)
-
ippconfig/recipes/reductionClasses.mdc (modified) (1 diff)
-
operations/Makefile.in (modified) (2 diffs)
-
psModules/src/objects/pmSourceFitModel.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ippTasks/pantasks.pro
r26028 r26070 530 530 531 531 if ("$host" == "NULL") 532 strsub $template @HOST@ $default -var $varname 532 # we are modifying something like /data/@HOST@/foo/bar, 533 # but some implementations have multiple entries for the same host, 534 # like /data/@HOST@.0/foo/bar. 535 # try a couple of these first: 536 strsub $template @HOST@.0 $default -var $varname 537 strsub $$varname @HOST@.1 $default -var $varname 538 strsub $$varname @HOST@ $default -var $varname 533 539 else 534 540 strsub $template @HOST@ $host -var $varname … … 557 563 book getword ipphosts skycell count -var count 558 564 if ("$count" == "NULL") 559 strsub $template @HOST@ $default -var $varname 565 strsub $template @HOST@.0 $default -var $varname 566 strsub $$varname @HOST@.1 $default -var $varname 567 strsub $$varname @HOST@ $default -var $varname 560 568 return 561 569 end … … 568 576 $skyhash = $skyhash + $myValue 569 577 end 570 # strhash $skycellID $count -var skyhash 571 578 inthash $skyhash 46 -var skyhash 572 579 sprintf skyname "sky%02d" $skyhash 573 580 … … 576 583 577 584 if ("$host" == "NULL") 578 strsub $template @HOST@ $default -var $varname 585 strsub $template @HOST@.0 $default -var $varname 586 strsub $$varname @HOST@.1 $default -var $varname 587 strsub $$varname @HOST@ $default -var $varname 579 588 else 580 589 strsub $template @HOST@ $host -var $varname -
trunk/ippTasks/survey.pro
r26030 r26070 4 4 check.globals 5 5 6 book getbook SURVEY_DIFF -var isBook 7 if ("$isBook" == "NULL") 8 book create SURVEY_DIFF 9 end 10 book getbook SURVEY_MAGIC -var isBook 11 if ("$isBook" == "NULL") 12 book create SURVEY_MAGIC 13 end 14 book getbook SURVEY_DESTREAK -var isBook 15 if ("$isBook" == "NULL") 16 book create SURVEY_DESTREAK 17 end 18 book getbook SURVEY_DIST -var isBook 19 if ("$isBook" == "NULL") 20 book create SURVEY_DIST 6 # there is a bug in 'getbook', use a different method below 7 # book getbook SURVEY_DIFF -var isBook 8 # if ("$isBook" != "SURVEY_DIFF") 9 # book create SURVEY_DIFF 10 # end 11 # book getbook SURVEY_MAGIC -var isBook 12 # if ("$isBook" == "NULL") 13 # book create SURVEY_MAGIC 14 # end 15 # book getbook SURVEY_DESTREAK -var isBook 16 # if ("$isBook" == "NULL") 17 # book create SURVEY_DESTREAK 18 # end 19 # book getbook SURVEY_DIST -var isBook 20 # if ("$isBook" == "NULL") 21 # book create SURVEY_DIST 22 # end 23 24 if (not($?haveSurveyBooks)) 25 book create SURVEY_DIFF 26 book create SURVEY_MAGIC 27 book create SURVEY_DESTREAK 28 book create SURVEY_DIST 29 $haveSurveyBooks = TRUE 21 30 end 22 31 … … 29 38 $SURVEY_POLL = 10 30 39 $SURVEY_TIMEOUT = 600 31 32 40 33 41 # user functions to manipulate diff labels … … 171 179 # Select different database 172 180 $SURVEY_DIFF_DB ++ 173 if ($SURVEY_DIFF_DB >= $DB:n) 174 $SURVEY_DIFF_DB = 0 175 end 181 if ($SURVEY_DIFF_DB >= $DB:n) set SURVEY_DIFF_DB = 0 176 182 end 177 183 … … 183 189 $run = $run -input_label $label 184 190 $run = $run -template_label $label 185 $run = $run - dist_group $dist_group191 $run = $run -set_dist_group $dist_group 186 192 $run = $run -set_label $label 187 193 $run = $run -set_workdir $workdir/$label/ … … 251 257 # Select different database 252 258 $SURVEY_MAGIC_DB ++ 253 if ($SURVEY_MAGIC_DB >= $DB:n) 254 set $SURVEY_MAGIC_DB = 0 255 end 259 if ($SURVEY_MAGIC_DB >= $DB:n) set SURVEY_MAGIC_DB = 0 256 260 end 257 261 … … 259 263 book getword SURVEY_MAGIC $label WORKDIR -var workdir 260 264 261 $run = magictool - definebyquery -label $label -diff_label $label -workdir $workdir/$label/265 $run = magictool -rerun -definebyquery -label $label -diff_label $label -workdir $workdir/$label/ 262 266 263 267 if ($DB:n == 0) … … 268 272 end 269 273 270 #echo $run274 echo $run 271 275 command $run 272 276 end … … 299 303 periods -timeout $SURVEY_TIMEOUT 300 304 npending 1 301 302 active false303 305 304 306 stdout $LOGDIR/survey.destreak.log … … 325 327 # Select different database 326 328 $SURVEY_DESTREAK_DB ++ 327 if ($SURVEY_DESTREAK_DB >= $DB:n) 328 set $SURVEY_DESTREAK_DB = 0 329 end 329 if ($SURVEY_DESTREAK_DB >= $DB:n) set SURVEY_DESTREAK_DB = 0 330 330 end 331 331 … … 338 338 option DEFAULT 339 339 else 340 $run = $run - dbname $DB:$SURVEY_MAGIC_DB340 $run = $run --dbname $DB:$SURVEY_MAGIC_DB 341 341 option $DB:$SURVEY_MAGIC_DB 342 342 end … … 397 397 # Select different database 398 398 $SURVEY_DIST_DB ++ 399 if ($SURVEY_DIST_DB >= $DB:n) 400 set $SURVEY_DIST_DB = 0 401 end 399 if ($SURVEY_DIST_DB >= $DB:n) set SURVEY_DIST_DB = 0 402 400 end 403 401 -
trunk/ippconfig/gpc1/ppImage.config
r25827 r26070 155 155 MASK.BURNTOOL BOOL TRUE # Mask potential burntool trails 156 156 PATTERN BOOL TRUE # Subtract pattern noise 157 FRINGE BOOL FALSE # Fringe subtraction157 FRINGE BOOL TRUE # Fringe subtraction 158 158 BIN1.FITS BOOL TRUE # Save 1st binned chip image? 159 159 BIN2.FITS BOOL TRUE # Save 2nd binned chip image? -
trunk/ippconfig/recipes/psastro.config
r25909 r26070 159 159 ZERO.POINT.EDGE.FRACTION F32 0.2 160 160 161 ZPTEST METADATA 162 ZERO.POINT.BY.EXPOSURE BOOL TRUE 163 ZERO.POINT.USE.MEAN BOOL FALSE 164 ZERO.POINT.EDGE.FRACTION F32 0.1 165 END 166 161 167 PSASTRO.2MASS METADATA 162 168 PSASTRO.CATDIR STR 2MASS -
trunk/ippconfig/recipes/reductionClasses.mdc
r25537 r26070 152 152 # basic science analysis 153 153 STDSCIENCE_V0 METADATA 154 CHIP_PPIMAGE STR TILTY155 CHIP_PSPHOT STR CHIP 156 WARP_PSWARP STR WARP 157 STACK_PPSTACK STR STACK 158 STACK_PPSUB STR STACK 159 STACK_PSPHOT STR STACK 160 DIFF_PPSUB STR DIFF 161 DIFF_PSPHOT STR DIFF 162 JPEG_BIN1 STR PPIMAGE_J1 163 JPEG_BIN2 STR PPIMAGE_J2 164 FAKEPHOT STR FAKEPHOT 165 ADDSTAR STR ADDSTAR 166 PSASTRO STR DEFAULT_RECIPE 167 END 168 169 # basic science analysis : test of GPC1 with noisemap & no tiltystreak154 CHIP_PPIMAGE STR CHIP 155 CHIP_PSPHOT STR CHIP 156 WARP_PSWARP STR WARP 157 STACK_PPSTACK STR STACK 158 STACK_PPSUB STR STACK 159 STACK_PSPHOT STR STACK 160 DIFF_PPSUB STR DIFF 161 DIFF_PSPHOT STR DIFF 162 JPEG_BIN1 STR PPIMAGE_J1 163 JPEG_BIN2 STR PPIMAGE_J2 164 FAKEPHOT STR FAKEPHOT 165 ADDSTAR STR ADDSTAR 166 PSASTRO STR DEFAULT_RECIPE 167 END 168 169 # basic science analysis : test of GPC1 with alternate ZP analysis 170 170 STDSCIENCE_T0 METADATA 171 CHIP_PPIMAGE STR NOISY172 CHIP_PSPHOT STR CHIP 173 WARP_PSWARP STR WARP 174 STACK_PPSTACK STR STACK 175 STACK_PPSUB STR STACK 176 STACK_PSPHOT STR STACK 177 DIFF_PPSUB STR DIFF 178 DIFF_PSPHOT STR DIFF 179 JPEG_BIN1 STR PPIMAGE_J1 180 JPEG_BIN2 STR PPIMAGE_J2 181 FAKEPHOT STR FAKEPHOT 182 ADDSTAR STR ADDSTAR 183 PSASTRO STR DEFAULT_RECIPE171 CHIP_PPIMAGE STR CHIP 172 CHIP_PSPHOT STR CHIP 173 WARP_PSWARP STR WARP 174 STACK_PPSTACK STR STACK 175 STACK_PPSUB STR STACK 176 STACK_PSPHOT STR STACK 177 DIFF_PPSUB STR DIFF 178 DIFF_PSPHOT STR DIFF 179 JPEG_BIN1 STR PPIMAGE_J1 180 JPEG_BIN2 STR PPIMAGE_J2 181 FAKEPHOT STR FAKEPHOT 182 ADDSTAR STR ADDSTAR 183 PSASTRO STR ZPTEST 184 184 END 185 185 -
trunk/operations/Makefile.in
r26068 r26070 1 default: php1 default: install 2 2 help: 3 3 @echo "USAGE: make install" … … 24 24 install: $(INPUTS) $(PTOLEMYRC) 25 25 26 uninstall: 27 rm -f $(INPUTS) || exit 28 rm -f $(PTOLEMYRC) || exit 29 26 30 # dependency rules ######################### 27 31 $(DEST)/%/input: $(SRC)/%/input -
trunk/psModules/src/objects/pmSourceFitModel.c
r25754 r26070 91 91 if (!isfinite(source->pixels->data.F32[i][j])) { 92 92 continue; 93 } 94 95 // skip nan values in image 96 if (!isfinite(source->variance->data.F32[i][j])) { 97 fprintf (stderr, "impossible! %x vs %x\n", source->maskObj->data.PS_TYPE_IMAGE_MASK_DATA[i][j], maskVal); 98 continue; 93 99 } 94 100
Note:
See TracChangeset
for help on using the changeset viewer.
