IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 40232


Ignore:
Timestamp:
Dec 2, 2017, 9:59:00 AM (9 years ago)
Author:
eugene
Message:

stk, wrp, dif names need to include the tess, skycell to be correctly parsed in dvo

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippToPsps/test/mkgpc1data.dvo

    r40227 r40232  
    1717$RA = 10.0
    1818$DEC = 20.0
    19 $SKYCELL = "skycell.1133.081"
    20 $TESS_ID = "RINGS.V3"
     19$SKYCELL = skycell.1133.081
     20$TESS_ID = RINGS.V3
    2121$BAD_PSFQF_FRAC = 0.2
     22
     23# a note on double quotes and TESS_ID:
     24# since the variables TESS_ID and SKYCELL are used below to construct the list, their values should NOT be wrapped in double quotes
     25# or those double quotes are embedded in the strings in the list
     26# when TESS_ID and SKYCELL appear in mysql commands as values they need to be protected with double quotes so mysql does not
     27# interpret them as db table fields
    2228
    2329# imagedata describes the full fake exposure set.  the fields are
    2430list imagedata
    25 # exp_id stk_id filebase         M_off date       time      warpfile         filter  difffile
    26    1     1      $OUTDIR/test.01  0.000 2010/01/01 01:00:00  $OUTDIR/warp.01  g       $OUTDIR/diff.01
    27    2     1      $OUTDIR/test.02 -0.025 2010/01/01 02:00:00  $OUTDIR/warp.02  g       $OUTDIR/diff.02
    28    3     1      $OUTDIR/test.03  0.025 2010/01/01 03:00:00  $OUTDIR/warp.03  g       $OUTDIR/diff.03
    29    4     1      $OUTDIR/test.04  0.010 2010/01/01 04:00:00  $OUTDIR/warp.04  g       $OUTDIR/diff.04
    30    5     2      $OUTDIR/test.05  0.000 2010/01/01 05:00:00  $OUTDIR/warp.05  g       $OUTDIR/diff.05
    31    6     2      $OUTDIR/test.06 -0.025 2010/01/01 06:00:00  $OUTDIR/warp.06  g       $OUTDIR/diff.06
    32    7     2      $OUTDIR/test.07  0.025 2010/01/01 07:00:00  $OUTDIR/warp.07  g       $OUTDIR/diff.07
    33    8     2      $OUTDIR/test.08  0.010 2010/01/01 08:00:00  $OUTDIR/warp.08  g       $OUTDIR/diff.08
    34    9     3      $OUTDIR/test.09  0.000 2010/01/01 09:00:00  $OUTDIR/warp.09  g       $OUTDIR/diff.09
    35   10     3      $OUTDIR/test.10 -0.025 2010/01/01 10:00:00  $OUTDIR/warp.10  g       $OUTDIR/diff.10
    36   11     3      $OUTDIR/test.11  0.025 2010/01/01 11:00:00  $OUTDIR/warp.11  g       $OUTDIR/diff.11
    37   12     3      $OUTDIR/test.12  0.010 2010/01/01 12:00:00  $OUTDIR/warp.12  g       $OUTDIR/diff.12
    38   13     4      $OUTDIR/test.13 -0.025 2010/01/02 01:00:00  $OUTDIR/warp.13  r       $OUTDIR/diff.13
    39   14     4      $OUTDIR/test.14  0.025 2010/01/02 02:00:00  $OUTDIR/warp.14  r       $OUTDIR/diff.14
    40   15     4      $OUTDIR/test.15  0.010 2010/01/02 03:00:00  $OUTDIR/warp.15  r       $OUTDIR/diff.15
    41   16     4      $OUTDIR/test.16  0.000 2010/01/02 04:00:00  $OUTDIR/warp.16  r       $OUTDIR/diff.16
    42   17     5      $OUTDIR/test.17 -0.025 2010/01/02 05:00:00  $OUTDIR/warp.17  r       $OUTDIR/diff.17
    43   18     5      $OUTDIR/test.18  0.025 2010/01/02 06:00:00  $OUTDIR/warp.18  r       $OUTDIR/diff.18
    44   19     5      $OUTDIR/test.19  0.010 2010/01/02 07:00:00  $OUTDIR/warp.19  r       $OUTDIR/diff.19
    45   20     5      $OUTDIR/test.20  0.000 2010/01/02 08:00:00  $OUTDIR/warp.20  r       $OUTDIR/diff.20
    46   21     6      $OUTDIR/test.21 -0.025 2010/01/02 09:00:00  $OUTDIR/warp.21  r       $OUTDIR/diff.21
    47   22     6      $OUTDIR/test.22  0.025 2010/01/02 10:00:00  $OUTDIR/warp.22  r       $OUTDIR/diff.22
    48   23     6      $OUTDIR/test.23  0.010 2010/01/02 11:00:00  $OUTDIR/warp.23  r       $OUTDIR/diff.23
    49   24     6      $OUTDIR/test.24 -0.020 2010/01/02 12:00:00  $OUTDIR/warp.24  r       $OUTDIR/diff.24
     31# exp_id stk_id filebase          M_off date       time      warpfile                       filter  difffile
     32   1     1      $OUTDIR/test.cam  0.000 2010/01/01 01:00:00  $OUTDIR/$TESS_ID.$SKYCELL.wrp  g       $OUTDIR/$TESS_ID.$SKYCELL.diff
     33   2     1      $OUTDIR/test.cam -0.025 2010/01/01 02:00:00  $OUTDIR/$TESS_ID.$SKYCELL.wrp  g       $OUTDIR/$TESS_ID.$SKYCELL.diff
     34   3     1      $OUTDIR/test.cam  0.025 2010/01/01 03:00:00  $OUTDIR/$TESS_ID.$SKYCELL.wrp  g       $OUTDIR/$TESS_ID.$SKYCELL.diff
     35   4     1      $OUTDIR/test.cam  0.010 2010/01/01 04:00:00  $OUTDIR/$TESS_ID.$SKYCELL.wrp  g       $OUTDIR/$TESS_ID.$SKYCELL.diff
     36   5     2      $OUTDIR/test.cam  0.000 2010/01/01 05:00:00  $OUTDIR/$TESS_ID.$SKYCELL.wrp  g       $OUTDIR/$TESS_ID.$SKYCELL.diff
     37   6     2      $OUTDIR/test.cam -0.025 2010/01/01 06:00:00  $OUTDIR/$TESS_ID.$SKYCELL.wrp  g       $OUTDIR/$TESS_ID.$SKYCELL.diff
     38   7     2      $OUTDIR/test.cam  0.025 2010/01/01 07:00:00  $OUTDIR/$TESS_ID.$SKYCELL.wrp  g       $OUTDIR/$TESS_ID.$SKYCELL.diff
     39   8     2      $OUTDIR/test.cam  0.010 2010/01/01 08:00:00  $OUTDIR/$TESS_ID.$SKYCELL.wrp  g       $OUTDIR/$TESS_ID.$SKYCELL.diff
     40   9     3      $OUTDIR/test.cam  0.000 2010/01/01 09:00:00  $OUTDIR/$TESS_ID.$SKYCELL.wrp  g       $OUTDIR/$TESS_ID.$SKYCELL.diff
     41  10     3      $OUTDIR/test.cam -0.025 2010/01/01 10:00:00  $OUTDIR/$TESS_ID.$SKYCELL.wrp  g       $OUTDIR/$TESS_ID.$SKYCELL.diff
     42  11     3      $OUTDIR/test.cam  0.025 2010/01/01 11:00:00  $OUTDIR/$TESS_ID.$SKYCELL.wrp  g       $OUTDIR/$TESS_ID.$SKYCELL.diff
     43  12     3      $OUTDIR/test.cam  0.010 2010/01/01 12:00:00  $OUTDIR/$TESS_ID.$SKYCELL.wrp  g       $OUTDIR/$TESS_ID.$SKYCELL.diff
     44  13     4      $OUTDIR/test.cam -0.025 2010/01/02 01:00:00  $OUTDIR/$TESS_ID.$SKYCELL.wrp  r       $OUTDIR/$TESS_ID.$SKYCELL.diff
     45  14     4      $OUTDIR/test.cam  0.025 2010/01/02 02:00:00  $OUTDIR/$TESS_ID.$SKYCELL.wrp  r       $OUTDIR/$TESS_ID.$SKYCELL.diff
     46  15     4      $OUTDIR/test.cam  0.010 2010/01/02 03:00:00  $OUTDIR/$TESS_ID.$SKYCELL.wrp  r       $OUTDIR/$TESS_ID.$SKYCELL.diff
     47  16     4      $OUTDIR/test.cam  0.000 2010/01/02 04:00:00  $OUTDIR/$TESS_ID.$SKYCELL.wrp  r       $OUTDIR/$TESS_ID.$SKYCELL.diff
     48  17     5      $OUTDIR/test.cam -0.025 2010/01/02 05:00:00  $OUTDIR/$TESS_ID.$SKYCELL.wrp  r       $OUTDIR/$TESS_ID.$SKYCELL.diff
     49  18     5      $OUTDIR/test.cam  0.025 2010/01/02 06:00:00  $OUTDIR/$TESS_ID.$SKYCELL.wrp  r       $OUTDIR/$TESS_ID.$SKYCELL.diff
     50  19     5      $OUTDIR/test.cam  0.010 2010/01/02 07:00:00  $OUTDIR/$TESS_ID.$SKYCELL.wrp  r       $OUTDIR/$TESS_ID.$SKYCELL.diff
     51  20     5      $OUTDIR/test.cam  0.000 2010/01/02 08:00:00  $OUTDIR/$TESS_ID.$SKYCELL.wrp  r       $OUTDIR/$TESS_ID.$SKYCELL.diff
     52  21     6      $OUTDIR/test.cam -0.025 2010/01/02 09:00:00  $OUTDIR/$TESS_ID.$SKYCELL.wrp  r       $OUTDIR/$TESS_ID.$SKYCELL.diff
     53  22     6      $OUTDIR/test.cam  0.025 2010/01/02 10:00:00  $OUTDIR/$TESS_ID.$SKYCELL.wrp  r       $OUTDIR/$TESS_ID.$SKYCELL.diff
     54  23     6      $OUTDIR/test.cam  0.010 2010/01/02 11:00:00  $OUTDIR/$TESS_ID.$SKYCELL.wrp  r       $OUTDIR/$TESS_ID.$SKYCELL.diff
     55  24     6      $OUTDIR/test.cam -0.020 2010/01/02 12:00:00  $OUTDIR/$TESS_ID.$SKYCELL.wrp  r       $OUTDIR/$TESS_ID.$SKYCELL.diff
    5056end
    5157
    5258list stackdata
    53 # stk_id sky_id filename         M_off filter  forcedgalaxy         
    54   1      1      $OUTDIR/stack.01 0.010 g       $OUTDIR/fgal.01
    55   2      2      $OUTDIR/stack.02 0.020 g       $OUTDIR/fgal.02
    56   3      3      $OUTDIR/stack.03 0.030 g       $OUTDIR/fgal.03
    57   4      1      $OUTDIR/stack.04 0.025 r       $OUTDIR/fgal.04
    58   5      2      $OUTDIR/stack.05 0.035 r       $OUTDIR/fgal.05
    59   6      3      $OUTDIR/stack.06 0.045 r       $OUTDIR/fgal.06
     59# stk_id sky_id filename                      M_off filter  forcedgalaxy         
     60  1      1      $OUTDIR/$TESS_ID.$SKYCELL.stk 0.010 g       $OUTDIR/$TESS_ID.$SKYCELL.fgal
     61  2      2      $OUTDIR/$TESS_ID.$SKYCELL.stk 0.020 g       $OUTDIR/$TESS_ID.$SKYCELL.fgal
     62  3      3      $OUTDIR/$TESS_ID.$SKYCELL.stk 0.030 g       $OUTDIR/$TESS_ID.$SKYCELL.fgal
     63  4      1      $OUTDIR/$TESS_ID.$SKYCELL.stk 0.025 r       $OUTDIR/$TESS_ID.$SKYCELL.fgal
     64  5      2      $OUTDIR/$TESS_ID.$SKYCELL.stk 0.035 r       $OUTDIR/$TESS_ID.$SKYCELL.fgal
     65  6      3      $OUTDIR/$TESS_ID.$SKYCELL.stk 0.045 r       $OUTDIR/$TESS_ID.$SKYCELL.fgal
    6066end
    6167 
    … …  
    94100  # system-wide info
    95101  dbinsert ippToPspsFake (my_id) values (2)
    96   dbinsert skycell (radeg, decdeg, tess_id, skycell_id) values ($RA, $DEC, $TESS_ID, $SKYCELL)
     102  dbinsert skycell (radeg, decdeg, tess_id, skycell_id) values ($RA, $DEC, "$TESS_ID", "$SKYCELL")
    97103end
    98104
    … …  
    119125    $ID = $word:0
    120126    $stkID = $word:1
    121     $rawfile = $word:2\.txt
    122     $cmffile = $word:2\.smf
     127    sprintf rawfile "%s.%02d.txt" $word:2 $ID
     128    sprintf cmffile "%s.%02d.smf" $word:2 $ID
    123129    $offset = $word:3
    124130    sprintf myDATE "%s" $word:4
    … …  
    255261    $stkID = $word:0
    256262    $skyID = $word:1
    257     $rawfile = $word:2\.txt
    258     $cmffile = $word:2\.cmf
     263    sprintf rawfile "%s.%02d.txt" $word:2 $stkID
     264    sprintf cmffile "%s.%02d.cmf" $word:2 $stkID
    259265    $offset = $word:3
    260266    $filter = $word:4
    … …  
    324330    $ID = $word:0
    325331    $stkID = $word:1
    326     $rawfile = $word:2\.txt; # use the cam-stage rawfile
    327     $cmffile = $word:6\.cmf
     332    sprintf rawfile "%s.%02d.txt" $word:2 $ID; # use the cam-stage rawfile
     333    sprintf cmffile "%s.%02d.smf" $word:6 $ID
    328334    $offset = $word:3
    329335    sprintf myDATE "%s" $word:4
    … …  
    350356    list word -split $stackdata:$i
    351357    $stkID = $word:0
    352     $rawfile = $word:2\.txt
    353     $cmffile = $word:5\.cmf
     358    sprintf rawfile "%s.%02d.txt" $word:2 $stkID
     359    sprintf cmffile "%s.%02d.smf" $word:5 $stkID
    354360    $offset = $word:3
    355361    $filter = $word:4
    … …  
    415421  dbinsert camProcessedExp (cam_id, path_base, fault) values ($myID, "$filename", 0)
    416422  dbinsert fakeRun (fake_id, cam_id) values ($myID, $myID)
    417   dbinsert warpRun (warp_id, fake_id, tess_id, state) values ($myID, $myID, $TESS_ID, "full")
    418   dbinsert warpSkyCellMap (warp_id, skycell_id, class_id) values ($myID, $SKYCELL, "XY00")
    419   dbinsert warpImfile (warp_id, skycell_id, warp_skyfile_id) values ($myID, $SKYCELL, $myID)
     423  dbinsert warpRun (warp_id, fake_id, tess_id, state) values ($myID, $myID, "$TESS_ID", "full")
     424  dbinsert warpSkyCellMap (warp_id, skycell_id, class_id) values ($myID, "$SKYCELL", "XY00")
     425  dbinsert warpImfile (warp_id, skycell_id, warp_skyfile_id) values ($myID, "$SKYCELL", $myID)
    420426
    421427  dbinsert addRun (add_id, stage, state, stage_id, minidvodb_name) values ($myID, "cam", "full", $myID, "catdir.cam")
    … …  
    461467  $skycalID = $stkID + 20
    462468
    463   dbinsert stackRun (stack_id, skycell_id, filter, software_ver) values ($stkID, $SKYCELL, "$filter.00000", "37500")
     469  dbinsert stackRun (stack_id, skycell_id, filter, software_ver) values ($stkID, "$SKYCELL", "$filter.00000", "37500")
    464470
    465471  # we have a single fullForceRun for each stack, so we can match fullForceRun ids to stackRun ids
    … …  
    529535    $ID = $word:0
    530536    $stkID = $word:1
    531     $rawfile = $word:2\.txt
    532     $cmffile = $word:8\.cmf
    533     $invfile = $word:8\.inv.cmf
     537    sprintf rawfile "%s.%02d.txt" $word:2 $stkID
     538    sprintf cmffile "%s.%02d.smf" $word:8 $stkID
     539    sprintf invfile "%s.%02d.inv.smf" $word:8 $stkID
    534540    $offset = $word:3
    535541    sprintf myDATE "%s" $word:4
    … …  
    601607    $stkID = $word:0
    602608    $skyID = $word:1
    603     $cmffile = $word:2
     609    sprintf cmffile "%s.%02d.cmf" $word:2 $stkID
    604610    $filter = $word:4
    605611
    … …  
    661667  dbinsert addProcessedExp (add_id, fault) values ($addID, 0)
    662668
    663   dbinsert diffRun (diff_id, tess_id, state, diff_mode, software_ver) values ($difID, $TESS_ID, "full", 2, "38000M")
    664   dbinsert diffInputSkyfile (diff_id, warp1, stack2, diff_skyfile_id, tess_id, skycell_id) values ($difID, $wrpID, $stkID, $diffSkyfileID, $TESS_ID,  $SKYCELL )
    665   dbinsert diffSkyfile (diff_id, skycell_id, path_base) values ($difID, $SKYCELL, "$filename")
     669  dbinsert diffRun (diff_id, tess_id, state, diff_mode, software_ver) values ($difID, "$TESS_ID", "full", 2, "38000M")
     670  dbinsert diffInputSkyfile (diff_id, warp1, stack2, diff_skyfile_id, tess_id, skycell_id) values ($difID, $wrpID, $stkID, $diffSkyfileID, "$TESS_ID", "$SKYCELL" )
     671  dbinsert diffSkyfile (diff_id, skycell_id, path_base) values ($difID, "$SKYCELL", "$filename")
    666672end
    667673
Note: See TracChangeset for help on using the changeset viewer.