Changeset 38840

Timestamp:

Oct 10, 2015, 1:40:43 PM (11 years ago)

Author:

eugene

Message:

fix typo and and handle exit failure

Location:

trunk/ippToPsps/test

Files:

• fulltest.sh (modified) (1 diff)
• mkgpc1data.dvo (modified) (3 diffs)

trunk/ippToPsps/test/fulltest.sh

@@ -147 +147 @@
   echo " ---- mkgpc1data.dvo : creating the dvo & gpc1 database entries ----"
   mkgpc1data.dvo
+  if ($status) then
+    echo "failed to generate the data & dvo, quitting"
+    exit 2
+  endif
 endif
 

trunk/ippToPsps/test/mkgpc1data.dvo

@@ -14 +14 @@
 # imagedata describes the full fake exposure set.  the fields are
 list imagedata
-# exp_id filebase         M_off date       time
-   1     $OUTDIR/test.01  0.000 2010/01/01 01:00:00
-   2     $OUTDIR/test.02 -0.025 2010/01/01 02:00:00
-   3     $OUTDIR/test.03  0.025 2010/01/01 03:00:00
-   4     $OUTDIR/test.04  0.010 2010/01/01 04:00:00
-   5     $OUTDIR/test.05  0.000 2010/01/01 05:00:00
-   6     $OUTDIR/test.06 -0.025 2010/01/01 06:00:00
-   7     $OUTDIR/test.07  0.025 2010/01/01 07:00:00
-   8     $OUTDIR/test.08  0.010 2010/01/01 08:00:00
-   9     $OUTDIR/test.09  0.000 2010/01/01 09:00:00
-  10     $OUTDIR/test.10 -0.025 2010/01/01 10:00:00
-  11     $OUTDIR/test.11  0.025 2010/01/01 11:00:00
-  12     $OUTDIR/test.12  0.010 2010/01/01 12:00:00
+# exp_id stk_id filebase         M_off date       time
+   1     1      $OUTDIR/test.01  0.000 2010/01/01 01:00:00
+   2     1      $OUTDIR/test.02 -0.025 2010/01/01 02:00:00
+   3     1      $OUTDIR/test.03  0.025 2010/01/01 03:00:00
+   4     1      $OUTDIR/test.04  0.010 2010/01/01 04:00:00
+   5     2      $OUTDIR/test.05  0.000 2010/01/01 05:00:00
+   6     2      $OUTDIR/test.06 -0.025 2010/01/01 06:00:00
+   7     2      $OUTDIR/test.07  0.025 2010/01/01 07:00:00
+   8     2      $OUTDIR/test.08  0.010 2010/01/01 08:00:00
+   9     3      $OUTDIR/test.09  0.000 2010/01/01 09:00:00
+  10     3      $OUTDIR/test.10 -0.025 2010/01/01 10:00:00
+  11     3      $OUTDIR/test.11  0.025 2010/01/01 11:00:00
+  12     3      $OUTDIR/test.12  0.010 2010/01/01 12:00:00
 end
 
@@ -104 +104 @@
     list word -split $imagedata:$i
     $ID = $word:0
-    $rawfile = $word:1\.txt
-    $cmffile = $word:1\.smf
-    $offset = $word:2
-
-    sprintf myDATE "%s" $word:3
-    sprintf myTIME "%s" $word:4
+    $rawfile = $word:2\.txt
+    $cmffile = $word:2\.smf
+    $offset = $word:3
+
+    sprintf myDATE "%s" $word:4
+    sprintf myTIME "%s" $word:5
     echo ctimes -abs $myDATE,$myTIME -var mjd
     ctimes -abs $myDATE,$myTIME -var mjd
@@ -412 +412 @@
   end
   mkfull
+  if (not($STATUS)) exit 1
   exit 0
 end