Index: trunk/ippToPsps/test/mkgpc1data.dvo =================================================================== --- trunk/ippToPsps/test/mkgpc1data.dvo (revision 38939) +++ trunk/ippToPsps/test/mkgpc1data.dvo (revision 38950) @@ -5,4 +5,6 @@ if (not($?VERBOSE)) set VERBOSE = 0 if (not($?PARALLEL)) set PARALLEL = 0 + +$SMALLTEST = 1 ## this script must be run in this directory, output data goes to 'testdata' @@ -24,24 +26,24 @@ 3 1 $OUTDIR/test.03 0.025 2010/01/01 03:00:00 $OUTDIR/warp.03 g 4 1 $OUTDIR/test.04 0.010 2010/01/01 04:00:00 $OUTDIR/warp.04 g -# 5 2 $OUTDIR/test.05 0.000 2010/01/01 05:00:00 $OUTDIR/warp.05 g -# 6 2 $OUTDIR/test.06 -0.025 2010/01/01 06:00:00 $OUTDIR/warp.06 g -# 7 2 $OUTDIR/test.07 0.025 2010/01/01 07:00:00 $OUTDIR/warp.07 g -# 8 2 $OUTDIR/test.08 0.010 2010/01/01 08:00:00 $OUTDIR/warp.08 g -# 9 3 $OUTDIR/test.09 0.000 2010/01/01 09:00:00 $OUTDIR/warp.09 g -# 10 3 $OUTDIR/test.10 -0.025 2010/01/01 10:00:00 $OUTDIR/warp.10 g -# 11 3 $OUTDIR/test.11 0.025 2010/01/01 11:00:00 $OUTDIR/warp.11 g -# 12 3 $OUTDIR/test.12 0.010 2010/01/01 12:00:00 $OUTDIR/warp.12 g + 5 2 $OUTDIR/test.05 0.000 2010/01/01 05:00:00 $OUTDIR/warp.05 g + 6 2 $OUTDIR/test.06 -0.025 2010/01/01 06:00:00 $OUTDIR/warp.06 g + 7 2 $OUTDIR/test.07 0.025 2010/01/01 07:00:00 $OUTDIR/warp.07 g + 8 2 $OUTDIR/test.08 0.010 2010/01/01 08:00:00 $OUTDIR/warp.08 g + 9 3 $OUTDIR/test.09 0.000 2010/01/01 09:00:00 $OUTDIR/warp.09 g + 10 3 $OUTDIR/test.10 -0.025 2010/01/01 10:00:00 $OUTDIR/warp.10 g + 11 3 $OUTDIR/test.11 0.025 2010/01/01 11:00:00 $OUTDIR/warp.11 g + 12 3 $OUTDIR/test.12 0.010 2010/01/01 12:00:00 $OUTDIR/warp.12 g 13 4 $OUTDIR/test.13 -0.025 2010/01/02 01:00:00 $OUTDIR/warp.13 r 14 4 $OUTDIR/test.14 0.025 2010/01/02 02:00:00 $OUTDIR/warp.14 r 15 4 $OUTDIR/test.15 0.010 2010/01/02 03:00:00 $OUTDIR/warp.15 r 16 4 $OUTDIR/test.16 0.000 2010/01/02 04:00:00 $OUTDIR/warp.16 r -# 17 5 $OUTDIR/test.17 -0.025 2010/01/02 05:00:00 $OUTDIR/warp.17 r -# 18 5 $OUTDIR/test.18 0.025 2010/01/02 06:00:00 $OUTDIR/warp.18 r -# 19 5 $OUTDIR/test.19 0.010 2010/01/02 07:00:00 $OUTDIR/warp.19 r -# 20 5 $OUTDIR/test.20 0.000 2010/01/02 08:00:00 $OUTDIR/warp.20 r -# 21 6 $OUTDIR/test.21 -0.025 2010/01/02 09:00:00 $OUTDIR/warp.21 r -# 22 6 $OUTDIR/test.22 0.025 2010/01/02 10:00:00 $OUTDIR/warp.22 r -# 23 6 $OUTDIR/test.23 0.010 2010/01/02 11:00:00 $OUTDIR/warp.23 r -# 24 6 $OUTDIR/test.24 -0.020 2010/01/02 12:00:00 $OUTDIR/warp.24 r + 17 5 $OUTDIR/test.17 -0.025 2010/01/02 05:00:00 $OUTDIR/warp.17 r + 18 5 $OUTDIR/test.18 0.025 2010/01/02 06:00:00 $OUTDIR/warp.18 r + 19 5 $OUTDIR/test.19 0.010 2010/01/02 07:00:00 $OUTDIR/warp.19 r + 20 5 $OUTDIR/test.20 0.000 2010/01/02 08:00:00 $OUTDIR/warp.20 r + 21 6 $OUTDIR/test.21 -0.025 2010/01/02 09:00:00 $OUTDIR/warp.21 r + 22 6 $OUTDIR/test.22 0.025 2010/01/02 10:00:00 $OUTDIR/warp.22 r + 23 6 $OUTDIR/test.23 0.010 2010/01/02 11:00:00 $OUTDIR/warp.23 r + 24 6 $OUTDIR/test.24 -0.020 2010/01/02 12:00:00 $OUTDIR/warp.24 r end @@ -49,16 +51,16 @@ # stk_id sky_id filename M_off filter 1 1 $OUTDIR/stack.01 0.010 g -# 2 2 $OUTDIR/stack.02 0.020 g -# 3 3 $OUTDIR/stack.03 0.030 g + 2 2 $OUTDIR/stack.02 0.020 g + 3 3 $OUTDIR/stack.03 0.030 g 4 1 $OUTDIR/stack.04 0.025 r -# 5 2 $OUTDIR/stack.05 0.035 r -# 6 3 $OUTDIR/stack.06 0.045 r + 5 2 $OUTDIR/stack.05 0.035 r + 6 3 $OUTDIR/stack.06 0.045 r end macro mkfull init.db -# mkcatdir.cam PS1_V5 PS1_V5 + mkcatdir.cam PS1_V5 PS1_V5 mkcatdir.stk PS1_V5 PS1_V5 -# mkcatdir.wrp PS1_V5_Lensing PS1_V5 + mkcatdir.wrp PS1_V5_Lensing PS1_V5 insert.stack.set end @@ -95,5 +97,5 @@ mkdir $OUTDIR - local i catdir RA DEC ID rawfile cmffile offset + local i catdir RA DEC ID stkID rawfile cmffile offset $catdir = $OUTDIR/catdir.cam exec rm -rf $catdir @@ -108,4 +110,5 @@ list word -split $imagedata:$i $ID = $word:0 + $stkID = $word:1 $rawfile = $word:2\.txt $cmffile = $word:2\.smf @@ -114,4 +117,6 @@ sprintf myTIME "%s" $word:5 $filter = $word:7 + + if ($SMALLTEST && ($stkID != 1) && ($stdID != 4)) continue echo ctimes -abs $myDATE,$myTIME -var mjd @@ -292,5 +297,5 @@ mkdir $OUTDIR - local i catdir RA DEC ID rawfile cmffile offset + local i catdir RA DEC ID stkID rawfile cmffile offset $catdir = $OUTDIR/catdir.wrp exec rm -rf $catdir @@ -305,4 +310,5 @@ list word -split $imagedata:$i $ID = $word:0 + $stkID = $word:1 $rawfile = $word:2\.txt; # use the cam-stage rawfile $cmffile = $word:6\.cmf @@ -311,4 +317,6 @@ sprintf myTIME "%s" $word:5 $filter = $word:7 + + if ($SMALLTEST && ($stkID != 1) && ($stdID != 4)) continue echo ctimes -abs $myDATE,$myTIME -var mjd @@ -351,12 +359,13 @@ macro insert.exp - if ($0 != 3) - echo "USAGE: insert.exp (ID) (filename)" - break - end - - local myID filename + if ($0 != 4) + echo "USAGE: insert.exp (ID) (filename) (filter)" + break + end + + local myID filename filter $myID = $1 $filename = $2 + $filter = $3 # pwd -var cwd @@ -368,5 +377,5 @@ echo $myTIME - dbinsert rawExp (exp_id, exp_name, exp_time, bg, bg_stdev, ra, decl, dateobs) values ($myID, "test.$myID", 10.0, 100.0, 2.0, {$RA*3.1415/180.0}, {$DEC*3.1415/180.0}, '$myDATE $myTIME') + dbinsert rawExp (exp_id, exp_name, exp_time, filter, bg, bg_stdev, ra, decl, dateobs) values ($myID, "test.$myID", 10.0, "$filter.00000", 100.0, 2.0, {$RA*3.1415/180.0}, {$DEC*3.1415/180.0}, '$myDATE $myTIME') dbinsert chipRun (exp_id, chip_id) values ($myID, $myID) dbinsert camRun (chip_id, cam_id, dist_group, software_ver) values ($myID, $myID, "testgroup", "38000M") @@ -440,5 +449,10 @@ $expfile = $tmp:2 - insert.exp $expID $expfile + $myFilter = $tmp:7 + insert.exp $expID $expfile $myFilter + if ($myFilter != $filter) + echo "*** WARNING: filter mis-match between exp and stk: $myFilter vs $filter" + break + end $wrpfile = $tmp:6 @@ -472,4 +486,7 @@ $cmffile = $word:2 $filter = $word:4 + + if ($SMALLTEST && ($stkID != 1) && ($stdID != 4)) continue + insert.stack $stkID $skyID $cmffile $filter end