Changeset 35018

Timestamp:

Jan 22, 2013, 10:21:41 AM (13 years ago)

Author:

eugene

Message:

add a complete test suite using real gpc1 data

Location:

branches/eam_branches/ipp-20121219/ippToPsps/test

Files:

• mksasdata.dvo (modified) (4 diffs)
• sas12.test.psps (added)
• sas12.test.psps/RINGS.V3.skycell.1225.070.stk.1032983.skycal.40531.cmf (added)
• sas12.test.psps/o5745g0620o.356996.cm.473458.smf (added)
• sastest.sh (modified) (4 diffs)

branches/eam_branches/ipp-20121219/ippToPsps/test/mksasdata.dvo

@@ -18 +18 @@
   $dbpass = dvo
 
-  $RA = 10.0
-  $DEC = 20.0
+  $RA = 333.8
+  $DEC = 1.6
 
   break -auto off
@@ -35 +35 @@
 # create a populated catdir with a set of cmf files, save the filenames in list for use by insert.exp
 macro mkcatdir
-  if ($0 != 3)
-    echo "mkcatdir.cam (cmftype) (dvotype)"
+  if ($0 != 1)
+    echo "mkcatdir"
     break
   end
@@ -43 +43 @@
 
   local catdir
-  $catdir = $OUTDIR/catdir.sas12
+  $catdirbase = catdir.sas12
+  $catdir = $OUTDIR/$catdirbase
   exec rm -rf $catdir
 
-  addstar -D CAMERA gpc1 sas12.test.psps/o5745g0620o.356996.cm.473458.smf -D CATDIR $catdir
+  $expfile = sas12.test.psps/o5745g0620o.356996.cm.473458
+  exec addstar -D CAMERA gpc1 -D CATDIR $catdir $expfile.smf
+
+  # are these used to find the exposures in any way?
+  $RA = 333.8
+  $DEC = 1.6
 
   # a single exposure
-  dbinsert rawExp (exp_id, exp_name, exp_time, bg, bg_stdev, ra, decl) values ($myID, "test.$myID", 10.0, 100.0, 2.0, {$RA*3.1415/180.0}, {$DEC*3.1415/180.0})
-  dbinsert chipRun (exp_id, chip_id) values ($myID, $myID)
-  dbinsert camRun (chip_id, cam_id, dist_group, software_ver) values ($myID, $myID, "testgroup", "testsoft")
-  dbinsert camProcessedExp (cam_id, path_base) values ($myID, "$filename")
-  dbinsert fakeRun (fake_id, cam_id) values ($myID, $myID)
-  dbinsert warpRun (warp_id, fake_id) values ($myID, $myID)
-  dbinsert warpSkyCellMap (warp_id, skycell_id, class_id) values ($myID, "skycell.0000.000", "XY00")
-  dbinsert addRun (stage, state, stage_id, minidvodb_name) values ("cam", "full", $myID, "catdir.cam")
+  $expID = 1
+  dbinsert rawExp (exp_id, exp_name, exp_time, bg, bg_stdev, ra, decl) values ($expID, "o5745g0620o", 10.0, 100.0, 2.0, {$RA*3.1415/180.0}, {$DEC*3.1415/180.0})
+  dbinsert chipRun (exp_id, chip_id) values ($expID, $expID)
+  dbinsert camRun (chip_id, cam_id, dist_group, software_ver) values ($expID, $expID, "testgroup", "testsoft")
+  dbinsert camProcessedExp (cam_id, path_base) values ($expID, "$expfile")
+  dbinsert fakeRun (fake_id, cam_id) values ($expID, $expID)
+  dbinsert warpRun (warp_id, fake_id) values ($expID, $expID)
+  dbinsert warpSkyCellMap (warp_id, skycell_id, class_id) values ($expID, "skycell.0000.000", "XY00")
+  dbinsert addRun (stage, state, stage_id, minidvodb_name) values ("cam", "full", $expID, "$catdirbase")
 
-  addstar -D CAMERA gpc1 sas12.test.psps/RINGS.V3.skycell.1225.070.stk.1032983.skycal.40531.cmf -D CATDIR $catdir
+  # a single stack
+  $stkfile = sas12.test.psps/RINGS.V3.skycell.1225.070.stk.1032983.skycal.40531
+  exec addstar -D CAMERA gpc1 -D CATDIR $catdir $stkfile.cmf
 
+  $stkID = 1
   dbinsert stackRun (stack_id, skycell_id, filter, software_ver) values ($stkID, "skycell.0000.000", "g.00000", "testsoft")
   dbinsert stackInputSkyfile (stack_id, warp_id) values ($stkID, $expID)
@@ -65 +75 @@
   dbinsert skycalRun (skycal_id, stack_id) values ($stkID, $stkID)
   dbinsert skycalResult (skycal_id, path_base) values ($stkID, "$stkfile")
-  
-  dbinsert addRun (stage, state, stage_id, minidvodb_name) values ("skycal", "full", $stkID, "catdir.stk")
+  dbinsert addRun (stage, state, stage_id, minidvodb_name) values ("skycal", "full", $stkID, "$catdirbase")
 
   # catdirs for the exposures
-  dbinsert minidvodbRun (minidvodb_name, minidvodb_id, state) values ("catdir.cam", 1, "merged")
+  dbinsert minidvodbRun (minidvodb_name, minidvodb_id, state) values ("$catdirbase", 1, "merged")
   dbinsert minidvodbProcessed (minidvodb_id, fault) values (1, 0)
   
-  dbinsert mergedvodbRun (minidvodb_id, merge_id, state, mergedvodb) values (1, 1, "full", "catdir.cam")
+  dbinsert mergedvodbRun (minidvodb_id, merge_id, state, mergedvodb) values (1, 1, "full", "$catdirbase")
   dbinsert mergedvodbProcessed (merge_id, fault) values (1, 0)
 
   # catdirs for the stack
-  dbinsert minidvodbRun (minidvodb_name, minidvodb_id, state) values ("catdir.stk", 2, "merged")
+  dbinsert minidvodbRun (minidvodb_name, minidvodb_id, state) values ("$catdirbase", 2, "merged")
   dbinsert minidvodbProcessed (minidvodb_id, fault) values (2, 0)
   
-  dbinsert mergedvodbRun (minidvodb_id, merge_id, state, mergedvodb) values (2, 2, "full", "catdir.stk")
+  dbinsert mergedvodbRun (minidvodb_id, merge_id, state, mergedvodb) values (2, 2, "full", "$catdirbase")
   dbinsert mergedvodbProcessed (merge_id, fault) values (2, 0)
 end

branches/eam_branches/ipp-20121219/ippToPsps/test/sastest.sh

@@ -1 +1 @@
 #!/bin/csh -f
+
+set stackqueuename = 0
+if ($#argv > 0) then
+  set stackqueuename = $1
+  echo "stackqueue: $stackqueuename"
+endif
 
 # a bit crude : get the datadir path by interpolation of the PATH element for psconfig
@@ -23 +29 @@
 set stackbatch  = 1
 
-set OUTDIR = "testdata"
+set OUTDIR = "sas12"
 set queuename = "test"
 
 if ($mkgpc1) then
-  #addstar -D CAMERA gpc1 sas12.test.psps/o5745g0620o.356996.cm.473458.smf -D CATDIR catdir.sas12
-  #addstar -D CAMERA gpc1 sas12.test.psps/RINGS.V3.skycell.1225.070.stk.1032983.skycal.40531.cmf -D CATDIR catdir.sas12
   mksasdata.dvo
 endif
@@ -95 +99 @@
 IPP_PSPS
 0
-catdir.cam
-$OUTDIR/catdir.cam
-9
-11
-19
-21
+catdir.sas12
+$OUTDIR/catdir.sas12
+330
+340
+-8
+2
 1
 $OUTDIR
@@ -137 +141 @@
 IPP_PSPS
 0
-catdir.stk
-$OUTDIR/catdir.stk
-9
-11
-19
-21
+catdir.sas12
+$OUTDIR/catdir.sas12
+330
+340
+-8
+2
 1
 $OUTDIR