Index: trunk/ippToPsps/test/mkgpc1data.dvo =================================================================== --- trunk/ippToPsps/test/mkgpc1data.dvo (revision 38996) +++ trunk/ippToPsps/test/mkgpc1data.dvo (revision 39015) @@ -23,29 +23,29 @@ # imagedata describes the full fake exposure set. the fields are list imagedata -# exp_id stk_id filebase M_off date time warpfile filter - 1 1 $OUTDIR/test.01 0.000 2010/01/01 01:00:00 $OUTDIR/warp.01 g - 2 1 $OUTDIR/test.02 -0.025 2010/01/01 02:00:00 $OUTDIR/warp.02 g - 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 - 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 +# exp_id stk_id filebase M_off date time warpfile filter difffile + 1 1 $OUTDIR/test.01 0.000 2010/01/01 01:00:00 $OUTDIR/warp.01 g $OUTDIR/diff.01 + 2 1 $OUTDIR/test.02 -0.025 2010/01/01 02:00:00 $OUTDIR/warp.02 g $OUTDIR/diff.02 + 3 1 $OUTDIR/test.03 0.025 2010/01/01 03:00:00 $OUTDIR/warp.03 g $OUTDIR/diff.03 + 4 1 $OUTDIR/test.04 0.010 2010/01/01 04:00:00 $OUTDIR/warp.04 g $OUTDIR/diff.04 + 5 2 $OUTDIR/test.05 0.000 2010/01/01 05:00:00 $OUTDIR/warp.05 g $OUTDIR/diff.05 + 6 2 $OUTDIR/test.06 -0.025 2010/01/01 06:00:00 $OUTDIR/warp.06 g $OUTDIR/diff.06 + 7 2 $OUTDIR/test.07 0.025 2010/01/01 07:00:00 $OUTDIR/warp.07 g $OUTDIR/diff.07 + 8 2 $OUTDIR/test.08 0.010 2010/01/01 08:00:00 $OUTDIR/warp.08 g $OUTDIR/diff.08 + 9 3 $OUTDIR/test.09 0.000 2010/01/01 09:00:00 $OUTDIR/warp.09 g $OUTDIR/diff.09 + 10 3 $OUTDIR/test.10 -0.025 2010/01/01 10:00:00 $OUTDIR/warp.10 g $OUTDIR/diff.10 + 11 3 $OUTDIR/test.11 0.025 2010/01/01 11:00:00 $OUTDIR/warp.11 g $OUTDIR/diff.11 + 12 3 $OUTDIR/test.12 0.010 2010/01/01 12:00:00 $OUTDIR/warp.12 g $OUTDIR/diff.12 + 13 4 $OUTDIR/test.13 -0.025 2010/01/02 01:00:00 $OUTDIR/warp.13 r $OUTDIR/diff.13 + 14 4 $OUTDIR/test.14 0.025 2010/01/02 02:00:00 $OUTDIR/warp.14 r $OUTDIR/diff.14 + 15 4 $OUTDIR/test.15 0.010 2010/01/02 03:00:00 $OUTDIR/warp.15 r $OUTDIR/diff.15 + 16 4 $OUTDIR/test.16 0.000 2010/01/02 04:00:00 $OUTDIR/warp.16 r $OUTDIR/diff.16 + 17 5 $OUTDIR/test.17 -0.025 2010/01/02 05:00:00 $OUTDIR/warp.17 r $OUTDIR/diff.17 + 18 5 $OUTDIR/test.18 0.025 2010/01/02 06:00:00 $OUTDIR/warp.18 r $OUTDIR/diff.18 + 19 5 $OUTDIR/test.19 0.010 2010/01/02 07:00:00 $OUTDIR/warp.19 r $OUTDIR/diff.19 + 20 5 $OUTDIR/test.20 0.000 2010/01/02 08:00:00 $OUTDIR/warp.20 r $OUTDIR/diff.20 + 21 6 $OUTDIR/test.21 -0.025 2010/01/02 09:00:00 $OUTDIR/warp.21 r $OUTDIR/diff.21 + 22 6 $OUTDIR/test.22 0.025 2010/01/02 10:00:00 $OUTDIR/warp.22 r $OUTDIR/diff.22 + 23 6 $OUTDIR/test.23 0.010 2010/01/02 11:00:00 $OUTDIR/warp.23 r $OUTDIR/diff.23 + 24 6 $OUTDIR/test.24 -0.020 2010/01/02 12:00:00 $OUTDIR/warp.24 r $OUTDIR/diff.24 end @@ -65,4 +65,5 @@ mkcatdir.stk PS1_V5 PS1_V5 mkcatdir.wrp PS1_V5_Lensing PS1_V5 + mkcatdir.dif PS1_DV5 PS1_V5 insert.stack.set end @@ -72,6 +73,8 @@ $dbhost = localhost $dbname = gpc1test - $dbuser = dvo - $dbpass = dvo +# $dbuser = dvo +# $dbpass = dvo + $dbuser = czw + $dbpass = czw exec mkgpc1.sh delete $dbhost $dbname $dbuser $dbpass @@ -82,5 +85,5 @@ # system-wide info dbinsert ippToPspsFake (my_id) values (2) - dbinsert skycell (radeg, decdeg, skycell_id) values ($RA, $DEC, $SKYCELL) + dbinsert skycell (radeg, decdeg, tess_id, skycell_id) values ($RA, $DEC, $TESS_ID, $SKYCELL) end @@ -477,4 +480,122 @@ end +macro mkcatdir.dif + if ($0 != 3) + echo "mkcatdir.cam (cmftype) (dvotype)" + break + end + + # tapPLAN 4 + + mkdir $OUTDIR + + local i catdir ID stkID rawfile cmffile offset + $catdir = $OUTDIR/catdir.dif + exec rm -rf $catdir + + $TIMEFORMAT = mjd + $TIMEREF = 2001/01/01,00:00:00 + + for i 0 $imagedata:n + list word -split $imagedata:$i + $ID = $word:0 + $stkID = $word:1 + $rawfile = $word:2\.txt + $cmffile = $word:8\.cmf + $offset = $word:3 + sprintf myDATE "%s" $word:4 + sprintf myTIME "%s" $word:5 + $filter = $word:7 + + if ($SMALLTEST && ($stkID != 1) && ($stkID != 4)) continue + + echo ctimes -abs $myDATE,$myTIME -var mjd + ctimes -abs $myDATE,$myTIME -var mjd + + # create an empty header and populate with the desired keywords + mcreate dummy 0 0 + keyword dummy MJD-OBS -wf $mjd + keyword dummy FILTERID -w $filter.00000 + keyword dummy EXPTIME -wf 1.0 + +# keyword dummy ZPT_ERR -wf 0.01 +# keyword dummy EXPREQ -wf 1.0 + keyword dummy AIRMASS -wf 1.0 + keyword dummy RA -wf $RA + keyword dummy DEC -wf $DEC + keyword dummy CTYPE1 -w "RA---DIS" + keyword dummy CTYPE2 -w "DEC--DIS" + keyword dummy CRVAL1 -wf $RA + keyword dummy CRVAL2 -wf $DEC + keyword dummy CRPIX1 -wf 0.0 + keyword dummy CRPIX2 -wf 0.0 + keyword dummy CDELT1 -wf {1.0/3600} + keyword dummy CDELT2 -wf {1.0/3600} + keyword dummy PC001001 -wf 1.0 + keyword dummy PC001002 -wf 0.0 + keyword dummy PC002001 -wf 0.0 + keyword dummy PC002002 -wf 1.0 + keyword dummy NPLYTERM -wd 0 + keyword dummy PCA1X3Y0 -wf 0.0 + keyword dummy PCA1X2Y1 -wf 0.0 + keyword dummy PCA1X1Y2 -wf 0.0 + keyword dummy PCA1X0Y3 -wf 0.0 + keyword dummy PCA1X2Y0 -wf 0.0 + keyword dummy PCA1X1Y1 -wf 0.0 + keyword dummy PCA1X0Y2 -wf 0.0 + keyword dummy PCA2X3Y0 -wf 0.0 + keyword dummy PCA2X2Y1 -wf 0.0 + keyword dummy PCA2X1Y2 -wf 0.0 + keyword dummy PCA2X0Y3 -wf 0.0 + keyword dummy PCA2X2Y0 -wf 0.0 + keyword dummy PCA2X1Y1 -wf 0.0 + keyword dummy PCA2X0Y2 -wf 0.0 + + $zp = $offset + 23.0 + keyword dummy "HIERARCH FPA.ZP" -wf $zp + keyword dummy "HIERARCH DETEFF.MAGREF" -wf -5.8048040 + wd dummy $cmffile + + mkinput $offset $rawfile + echo mkcmf -diff -photcode SIMTEST.$filter.SkyChip -no-noise -extroot SkyChip -append $rawfile $cmffile -date $myDATE -time $myTIME -mjd $mjd -radec $RA $DEC -type $1 -imageID $ID -sourceID 36 -bad-psfqf-frac $BAD_PSFQF_FRAC + exec mkcmf -diff -photcode SIMTEST.$filter.SkyChip -no-noise -extroot SkyChip -append $rawfile $cmffile -date $myDATE -time $myTIME -mjd $mjd -radec $RA $DEC -type $1 -imageID $ID -sourceID 36 -bad-psfqf-frac $BAD_PSFQF_FRAC + + + insert.dif $ID $ID $stkID $word:8 + + if ($i == 3) + echo "NOTE: not adding image $i to DVO : this simulates images with poor astrometry" + continue + end + echo addstar -D SKY_DEPTH 4 -D CATDIR $catdir -D CAMERA simtest $cmffile -D CATFORMAT $2 -quick-airmass + exec addstar -D SKY_DEPTH 4 -D CATDIR $catdir -D CAMERA simtest $cmffile -D CATFORMAT $2 -quick-airmass + end + if ($SMALLTEST) + echo relphot -D CATDIR $catdir -region 8 12 18 22 -averages -update + exec relphot -D CATDIR $catdir -region 8 12 18 22 -averages -update + else + echo relphot -D CATDIR $catdir -region 8 12 18 22 -images g,r,i,z,y -update + exec relphot -D CATDIR $catdir -region 8 12 18 22 -images g,r,i,z,y -update + end + + if ($PARALLEL) + $hostname = `hostname` + exec rm -f $catdir/HostTable.dat + output $catdir/HostTable.dat + echo "# ID Hostname Catdir" + echo " 1 $hostname $catdir.p1" + echo " 2 $hostname $catdir.p2" + echo " 3 $hostname $catdir.p3" + output stdout + exec dvodist -out $catdir + end + + # for i 0 $offset:n + # tapOK {abs(Mcal[$i] - Mcal[0] - $offset:$i) < 0.001} "Mcal $i" + # end + + # tapDONE +end + macro insert.stack.set @@ -516,5 +637,42 @@ dbinsert mergedvodbRun (minidvodb_id, merge_id, state, mergedvodb) values (3, 3, "full", "catdir.wrp") dbinsert mergedvodbProcessed (merge_id, fault) values (3, 0) -end + + # catdirs for the diffs + dbinsert minidvodbRun (minidvodb_name, minidvodb_id, state) values ("catdir.dif", 4, "merged") + dbinsert minidvodbProcessed (minidvodb_id, fault) values (4, 0) + + dbinsert mergedvodbRun (minidvodb_id, merge_id, state, mergedvodb) values (4, 4, "full", "catdir.dif") + dbinsert mergedvodbProcessed (merge_id, fault) values (4, 0) + +end + +macro insert.dif + if ($0 != 5) + echo "USAGE: insert.dif (diffID) (warpID) (stackID) (filename)" + break + end + + local difID wrpID stkID filename + $difID = $1 + $wrpID = $2 + $stkID = $3 + $filename = $4 + + echo $myDATE + echo $myTIME + + $addID = $difID + 100 + $diffSkyfileID = $difID + 25; + dbinsert addRun (add_id, stage, state, stage_id, stage_extra1, minidvodb_name) values ($addID, "diff", "full", $difID, $diffSkyfileID, "catdir.dif") + dbinsert addProcessedExp (add_id, fault) values ($addID, 0) + + dbinsert diffRun (diff_id, tess_id, state, diff_mode, software_ver) values ($difID, $TESS_ID, "full", 2, "38000M") + dbinsert diffInputSkyfile (diff_id, warp1, stack2, diff_skyfile_id, tess_id, skycell_id) values ($difID, $wrpID, $stkID, $diffSkyfileID, $TESS_ID, $SKYCELL ) + dbinsert diffSkyfile (diff_id, diff_skyfile_id, tess_id, skycell_id, path_base) values ($difID, $diffSkyfileID, $TESS_ID, $SKYCELL, "$filename") +# dbinsert diffSkyfile (diff_id, + +# finish this up. +end +