Changeset 39052 for trunk

Timestamp:

Nov 6, 2015, 8:41:07 AM (11 years ago)

Author:

eugene

Message:

generate inv.cmf; add -diff-inv to addstar; pass diff images as list; remove unneeded extra PHU data for diff

File:

• trunk/ippToPsps/test/mkgpc1data.dvo (modified) (3 diffs)

trunk/ippToPsps/test/mkgpc1data.dvo

@@ -394 +394 @@
   $filter = $3
 
-  # pwd -var cwd
-  # NOTE: the filename is an absolute path without cmf extension
-  # XXX: no longer true
-
   # a single exposure
   echo $myDATE
@@ -518 +514 @@
 
   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
+    list word -split $imagedata:$i
+    $ID = $word:0
+    $stkID = $word:1
+    $rawfile = $word:2\.txt
+    $cmffile = $word:8\.cmf
+    $invfile = $word:8\.inv.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
 
     mkinput $offset $rawfile
     $diff_skyfile_id = $ID + 25
-    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 $diff_skyfile_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 $diff_skyfile_id -sourceID 36 -bad-psfqf-frac $BAD_PSFQF_FRAC
-
+    echo mkcmf -diff -photcode SIMTEST.$filter.SkyChip -no-noise -extroot SkyChip $rawfile $cmffile -date $myDATE -time $myTIME -mjd $mjd -radec $RA $DEC -type $1 -imageID $diff_skyfile_id -sourceID 36 -bad-psfqf-frac $BAD_PSFQF_FRAC
+    exec mkcmf -diff -photcode SIMTEST.$filter.SkyChip -no-noise -extroot SkyChip $rawfile $cmffile -date $myDATE -time $myTIME -mjd $mjd -radec $RA $DEC -type $1 -imageID $diff_skyfile_id -sourceID 36 -bad-psfqf-frac $BAD_PSFQF_FRAC
+
+    echo mkcmf -diff -photcode SIMTEST.$filter.SkyChip -no-noise -extroot SkyChip $rawfile $invfile -date $myDATE -time $myTIME -mjd $mjd -radec $RA $DEC -type $1 -imageID $diff_skyfile_id -sourceID 36 -bad-psfqf-frac $BAD_PSFQF_FRAC
+    exec mkcmf -diff -photcode SIMTEST.$filter.SkyChip -no-noise -extroot SkyChip $rawfile $invfile -date $myDATE -time $myTIME -mjd $mjd -radec $RA $DEC -type $1 -imageID $diff_skyfile_id -sourceID 36 -bad-psfqf-frac $BAD_PSFQF_FRAC
 
     insert.dif $ID $ID $stkID $word:8
@@ -589 +544 @@
       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
+
+    exec rm -rf addstar.txt
+    output addstar.txt
+    echo $cmffile
+    echo $invfile
+    output stdout
+    echo addstar -diff-inv -D SKY_DEPTH 4 -D CATDIR $catdir -D CAMERA simtest -list addstar.txt -D CATFORMAT $2 -quick-airmass
+    exec addstar -diff-inv -D SKY_DEPTH 4 -D CATDIR $catdir -D CAMERA simtest -list addstar.txt -D CATFORMAT $2 -quick-airmass
   end
   if ($SMALLTEST)