Changeset 37129 for branches/eam_branches/ipp-20140717/ippToPsps/test/mkgpc1data.dvo

Timestamp:

Jul 28, 2014, 6:20:27 AM (12 years ago)

Author:

eugene

Message:

dropping options for stilts dvo import methods; fixing a number of previously ignored errors (eg, dropping non-existent tables); allowing queue questions to strip leading and trailing spaces (so we can read from an input file); echo back the response so input from a file is clearer; re-write big sql blocks with new sql utility code; updating names in MeanObject, ObjectThin to be more consistent; add a new test code program; update detection fields to match new schema; drop the code for the old now-unused tables (detecitonCalib, SkinnyObject, etc)

Location:

branches/eam_branches/ipp-20140717/ippToPsps

Files:

• . (modified) (1 prop)
• test/mkgpc1data.dvo (modified) (4 diffs)

branches/eam_branches/ipp-20140717/ippToPsps/test/mkgpc1data.dvo

@@ -39 +39 @@
   # mkcatdir.cam PS1_V3 PS1_V4
   # mkcatdir.stk PS1_V3 PS1_V4
-  mkcatdir.cam PS1_V4 PS1_V4
-  mkcatdir.stk PS1_V4 PS1_V4
+  # mkcatdir.cam PS1_V4 PS1_V4
+  # mkcatdir.stk PS1_V4 PS1_V4
+  mkcatdir.cam PS1_V5 PS1_V5
+  mkcatdir.stk PS1_V5 PS1_V5
   insert.stack.set
 end
@@ -203 +205 @@
     end
 
-    if ($i == 5)
+    if (0 && ($i == 5))
       echo "NOTE: adding image $i 2x to DVO, but without detections : this simulates a failure in LAP dvo"
 
-      echo addstar -D CATDIR $catdir -D CAMERA simtest $cmffile -D CATFORMAT $2 -quick-airmass -image -dup-images
-      exec addstar -D CATDIR $catdir -D CAMERA simtest $cmffile -D CATFORMAT $2 -quick-airmass -image -dup-images
+      echo addstar -D SKY_DEPTH 4 -D CATDIR $catdir -D CAMERA simtest $cmffile -D CATFORMAT $2 -quick-airmass -image -dup-images
+      exec addstar -D SKY_DEPTH 4 -D CATDIR $catdir -D CAMERA simtest $cmffile -D CATFORMAT $2 -quick-airmass -image -dup-images
     end
 
-    if ($i == 7)
+    if (0 && ($i == 7))
       echo "NOTE: adding detections from image $i 2x to DVO, but with wrong photcode and duplicate image ID : this simulates a failure in LAP dvo"
-      echo addstar -D CATDIR $catdir -D CAMERA simtest $cmffile -D CATFORMAT $2 -quick-airmass -dup-images -image-id-override 7 -photcode 2MASS_J
-      exec addstar -D CATDIR $catdir -D CAMERA simtest $cmffile -D CATFORMAT $2 -quick-airmass -dup-images -image-id-override 7 -photcode 2MASS_J
+      echo addstar -D SKY_DEPTH 4 -D CATDIR $catdir -D CAMERA simtest $cmffile -D CATFORMAT $2 -quick-airmass -dup-images -image-id-override 7 -photcode 2MASS_J
+      exec addstar -D SKY_DEPTH 4 -D CATDIR $catdir -D CAMERA simtest $cmffile -D CATFORMAT $2 -quick-airmass -dup-images -image-id-override 7 -photcode 2MASS_J
     end
 
-    echo addstar -D CATDIR $catdir -D CAMERA simtest $cmffile -D CATFORMAT $2 -quick-airmass
-    exec addstar -D CATDIR $catdir -D CAMERA simtest $cmffile -D CATFORMAT $2 -quick-airmass
-  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
+
+  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
 
   if ($PARALLEL)
@@ -264 +269 @@
     $offset = $word:2
 
+    ## this is not generating photcodes recognized as stack by relphot
+
     mkinput $offset $rawfile
     exec mkcmf $rawfile $cmffile -extname SkyChip -date 2008/1/1 -time $i\:00:00 -radec $RA $DEC -type $1 -imageID $ID -sourceID 1
@@ -271 +278 @@
     exec fits_insert $cmffile tmp.hdr
 
-    exec addstar -D CATDIR $catdir -D CAMERA simtest $cmffile -D CATFORMAT $2 -quick-airmass
-  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
+
+  echo relphot -D CATDIR $catdir.stk -region 8 12 18 22 -images g,r,i,z,y -update
+  exec relphot -D CATDIR $catdir.stk -region 8 12 18 22 -images g,r,i,z,y -update
 
   if ($PARALLEL)