Changeset 39134 for trunk/ippToPsps/test/mksasdata.dvo

Timestamp:

Nov 13, 2015, 12:11:58 PM (11 years ago)

Author:

eugene

Message:

use sas40 inv.cmf / cmf files for diff test; use str(foo) to match column names

File:

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

trunk/ippToPsps/test/mksasdata.dvo

@@ -22 +22 @@
 list expfiles -glob sasdata.v39/*.smf
 list wrpfiles -glob sasdata.v39/*.wrp.*ff*.cmf
-list diffiles -glob sasdata.v39/*.WS.dif.*.cmf
+# list diffiles -glob sasdata.v39/*.WS.dif.*.cmf
+list diffiles -glob sasdata.v40/*.WS.dif.*.inv.cmf
 list stkfiles -glob sasdata.v39/*skycal*.cmf
 
@@ -192 +193 @@
 
 # create a populated catdir with a set of cmf files, save the filenames in list for use by insert.exp
-macro mkcatdir.dif
-  if ($0 != 1)
-    echo "mkcatdir.dif"
+macro mkcatdir.dif.old
+  if ($0 != 1)
+    echo "mkcatdir.dif.old"
     break
   end
 
   for i 0 $diffiles:n
-    $diffile = $diffiles:$i
+    $difffile = $diffiles:$i
     echo addstar -D SKY_DEPTH 4 -D CATDIR $catdir_diff -D CATFORMAT PS1_V5 -D CAMERA gpc1 -update $diffile -D ZERO_POINT_OPTION CHIP_HEADER -accept-astrom -D ZERO_POINT_KEYWORD FPA.ZP
     exec addstar -D SKY_DEPTH 4 -D CATDIR $catdir_diff -D CATFORMAT PS1_V5 -D CAMERA gpc1 -update $diffile -D ZERO_POINT_OPTION CHIP_HEADER -accept-astrom -D ZERO_POINT_KEYWORD FPA.ZP
+    # echo addstar -D CAMERA gpc1 -D CATDIR $catdir -D CATFORMAT PS1_V5 $stkfile -update -quick-airmass -D ZERO_POINT_OPTION CHIP_HEADER
+  end
+end
+
+# create a populated catdir with a set of cmf files, save the filenames in list for use by insert.exp
+macro mkcatdir.dif
+  if ($0 != 1)
+    echo "mkcatdir.dif"
+    break
+  end
+
+  for i 0 $diffiles:n
+    $negfile = $diffiles:$i
+    strsub $negfile inv.cmf cmf -var posfile
+    exec rm -f diff.list.txt
+    output diff.list.txt
+    echo $posfile
+    echo $negfile
+    output stdout
+    echo addstar -D SKY_DEPTH 4 -D CATDIR $catdir_diff -D CATFORMAT PS1_V5 -D CAMERA gpc1 -update -list diff.list.txt -D ZERO_POINT_OPTION CHIP_HEADER -accept-astrom -D ZERO_POINT_KEYWORD FPA.ZP -diff-inv
+    exec addstar -D SKY_DEPTH 4 -D CATDIR $catdir_diff -D CATFORMAT PS1_V5 -D CAMERA gpc1 -update -list diff.list.txt -D ZERO_POINT_OPTION CHIP_HEADER -accept-astrom -D ZERO_POINT_KEYWORD FPA.ZP -diff-inv
     # echo addstar -D CAMERA gpc1 -D CATDIR $catdir -D CATFORMAT PS1_V5 $stkfile -update -quick-airmass -D ZERO_POINT_OPTION CHIP_HEADER
   end
@@ -380 +402 @@
 
   for i 0 $diffiles:n
-    $filename = $diffiles:$i
-    strlen $filename Nchar
-    substr $filename 0 {$Nchar - 4} path_base; # the database needs the path without the extension (.smf/.cmf)
-
-    $diffSkyfileID = `echo $filename | fields IMAGEID | prcol 2`
+    $negfile = $diffiles:$i
+    strsub $negfile inv.cmf cmf -var posfile
+    strlen $posfile Nchar
+    substr $posfile 0 {$Nchar - 4} path_base; # the database needs the path without the extension (.smf/.cmf)
+
+    $diffSkyfileID = `echo $posfile | fields IMAGEID | prcol 2`
     $skycell = "skycell.1315.090"
-    $filter  = `echo $filename | fields FPA.FILTERID | prcol 2`
-    $mjd     = `echo $filename | fields MJD-OBS | prcol 2`
+    $filter  = `echo $posfile | fields FPA.FILTERID | prcol 2`
+    $mjd     = `echo $posfile | fields MJD-OBS | prcol 2`
     
     $wrpID = $i