IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Oct 30, 2015, 5:01:15 PM (11 years ago)
Author:
watersc1
Message:

Updates to make DF batches work. Test suite changes to implement that. There are still a few issues with header keywords not being respected completely, but I'm not fully sure if that's due to the simulated data or not. Change to fulltest.sh to move dbuser/pass into variables that can be changed easily.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/ippToPsps/test/fulltest.sh

    r39009 r39015  
    11#!/bin/csh -f
     2
     3set dbuser = 'dvo'
     4set dbpass = '-pdvo'
     5# set dbuser = 'czw'
     6# set dbpass = '-pczw'
    27
    38chmod +x mkgpc1data.dvo mkgpc1.sh
     
    2934set forcedobjqueue = 1
    3035set forcedobjbatch = 1
     36set diffqueue    = 1
     37set diffbatch    = 1
     38set diffobjqueue = 1
     39set diffobjbatch = 1
     40
    3141
    3242set options = "-test"
     
    4252    echo " -XX : turn off features"
    4353    echo " +XX : turn on features"
    44     echo "  features: all, mkgpc1, initdb, initscratch, initbatch, camera, stack, forcedwarp, object, forcedobject"
     54    echo "  features: all, mkgpc1, initdb, initscratch, initbatch, camera, stack, forcedwarp, object, forcedobject, diff, diffobj"
    4555    exit 2
    4656  case -all
     
    5969    set forcedobjqueue = 0
    6070    set forcedobjbatch = 0
     71    set diffqueue = 0
     72    set diffbatch = 0
     73    set diffobjqueue = 0
     74    set diffobjbatch = 0
    6175    breaksw;
    6276  case -mkgpc1
     
    91105    set forcedobjqueue = 0
    92106    set forcedobjbatch = 0
     107    breaksw;
     108  case -diff
     109    set diffqueue = 0
     110    set diffbatch = 0
     111    breaksw;
     112  case -diffobj
     113    set diffobjqueue = 0
     114    set diffobjbatch = 0
    93115    breaksw;
    94116  case -debug
     
    125147    set forcedobjqueue = 1
    126148    set forcedobjbatch = 1
     149    set diffqueue = 1
     150    set diffbatch = 1
     151    set diffobjqueue = 1
     152    set diffobjbatch = 1
    127153    breaksw;
    128154  case +mkgpc1
     
    157183    set forcedobjqueue = 1
    158184    set forcedobjbatch = 1
     185    breaksw;
     186  case +diff
     187    set diffqueue = 1
     188    set diffbatch = 1
     189    breaksw;
     190  case +diffobj
     191    set diffobjqueue = 1
     192    set diffobjbatch = 1
    159193    breaksw;
    160194  default:
     
    169203    echo " -XX : turn off features"
    170204    echo " +XX : turn on features"
    171     echo "  features: all, mkgpc1, initdb, initscratch, initbatch, camera, object, stack, forcedwarp, forcedobject"
     205    echo "  features: all, mkgpc1, initdb, initscratch, initbatch, camera, object, stack, forcedwarp, forcedobject, diff, diffobj"
    172206    exit 2
    173207endif
     
    179213set forcedwarpqueuename = $queuename\_wrp
    180214set forcedobjqueuename = $queuename\_fwo
     215set diffqueuename = $queuename\_dif
     216set diffobjqueuename = $queuename\_dio
     217
    181218
    182219if ($mkgpc1) then
     
    197234  # does the database already exist?
    198235  # XXX this command will blow away an existing database!!
    199   mysql -h localhost -u dvo -pdvo -e "create database if not exists ipptopsps_test" || exit 3
    200   mysql -h localhost -u dvo -pdvo ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql || exit 3
     236  mysql -h localhost -u $dbuser $dbpass -e "create database if not exists ipptopsps_test" || exit 3
     237  mysql -h localhost -u $dbuser $dbpass ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql || exit 3
    201238  echo " ---- init ipptopsps_test: done ----"
    202239endif
     
    208245
    209246  # create the database (ignore failure if it already exists)
    210   mysql -h localhost -u dvo -pdvo -e "drop database if exists ipptopsps_test_scratch"
    211   mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test_scratch"
     247  mysql -h localhost -u $dbuser $dbpass -e "drop database if exists ipptopsps_test_scratch"
     248  mysql -h localhost -u $dbuser $dbpass -e "create database ipptopsps_test_scratch"
    212249  echo ippjython setupScratchDb.py $options
    213250       ippjython setupScratchDb.py $options < /dev/null
     
    527564endif
    528565
     566
     567############################ DF batches ################################
     568
     569# this code is sensitive to a previously existing database?
     570if ($diffqueue) then
     571  echo ""
     572  echo " ---- queue DF batches ----"
     573
     574  echo "$diffqueuename  " >  diffbatch.dat # skychunk name
     575  echo "test_ds               " >> diffbatch.dat # datastore_product
     576  echo "IPP_PSPS              " >> diffbatch.dat # datastore_type
     577  echo "0                     " >> diffbatch.dat # datastore_publish
     578  echo "catdir.dif            " >> diffbatch.dat # dvo_label
     579  echo "$OUTDIR/catdir.dif    " >> diffbatch.dat # dvo_location
     580  echo "9                     " >> diffbatch.dat # min_ra
     581  echo "11                    " >> diffbatch.dat # max_ra
     582  echo "19                    " >> diffbatch.dat # min_dec
     583  echo "21                    " >> diffbatch.dat # max_dec
     584  echo "2                     " >> diffbatch.dat # box_size
     585  echo "$OUTDIR               " >> diffbatch.dat # base_path
     586  echo "0                     " >> diffbatch.dat # data_release
     587  echo "0                     " >> diffbatch.dat # delete_local
     588  echo "1                     " >> diffbatch.dat # delete_datastore
     589  echo "1                     " >> diffbatch.dat # delete_dxlayer
     590  echo "2012-12-10 00:00:00.0 " >> diffbatch.dat # epoch
     591  echo "3PI                   " >> diffbatch.dat # survey
     592  echo "3PI                   " >> diffbatch.dat # psps_survey
     593  echo "0                     " >> diffbatch.dat # queue_P2
     594  echo "0                     " >> diffbatch.dat # queue_ST
     595  echo "0                     " >> diffbatch.dat # queue_OB
     596  echo "1                     " >> diffbatch.dat # queue_DF
     597  echo "0                     " >> diffbatch.dat # queue_DO
     598  echo "0                     " >> diffbatch.dat # queue_FW
     599  echo "0                     " >> diffbatch.dat # queue_FO
     600  echo "1                     " >> diffbatch.dat # active
     601  echo "0                     " >> diffbatch.dat # parallel
     602  echo "use_new               " >> diffbatch.dat # P2_smf_version
     603  echo "any                   " >> diffbatch.dat # ST_cmf_version
     604  echo "2000-01-01 00:00:00.0 " >> diffbatch.dat # trange_start
     605  echo "2020-01-01 00:00:00.0 " >> diffbatch.dat # trange_end
     606  ippjython queue.py $options edit -simtest < diffbatch.dat
     607  if ($status) exit 1
     608endif
     609
     610if ($diffbatch) then
     611  echo ""
     612  echo " ---- load DF batches ----"
     613
     614  rm -rf $OUTDIR/FW
     615  ippjython loader.py $options $diffqueuename once -simtest < /dev/null
     616  if ($status) exit
     617endif
     618
     619############################ DO batches ################################
     620
     621# this code is sensitive to a previously existing database?
     622if ($diffobjqueue) then
     623  echo ""
     624  echo " ---- queue do batches ----"
     625
     626  echo "$diffobjqueuename   " >  diffobjbatch.dat # skychunk name
     627  echo "test_ds               " >> diffobjbatch.dat # datastore_product
     628  echo "IPP_PSPS              " >> diffobjbatch.dat # datastore_type
     629  echo "0                     " >> diffobjbatch.dat # datastore_publish
     630  echo "catdir.dif            " >> diffobjbatch.dat # dvo_label
     631  echo "$OUTDIR/catdir.dif    " >> diffobjbatch.dat # dvo_location
     632  echo "9                     " >> diffobjbatch.dat # min_ra
     633  echo "11                    " >> diffobjbatch.dat # max_ra
     634  echo "19                    " >> diffobjbatch.dat # min_dec
     635  echo "21                    " >> diffobjbatch.dat # max_dec
     636  echo "2                     " >> diffobjbatch.dat # box_size
     637  echo "$OUTDIR               " >> diffobjbatch.dat # base_path
     638  echo "0                     " >> diffobjbatch.dat # data_release
     639  echo "0                     " >> diffobjbatch.dat # delete_local
     640  echo "1                     " >> diffobjbatch.dat # delete_datastore
     641  echo "1                     " >> diffobjbatch.dat # delete_dxlayer
     642  echo "2012-12-10 00:00:00.0 " >> diffobjbatch.dat # epoch
     643  echo "3PI                   " >> diffobjbatch.dat # survey
     644  echo "3PI                   " >> diffobjbatch.dat # psps_survey
     645  echo "0                     " >> diffobjbatch.dat # queue_P2
     646  echo "0                     " >> diffobjbatch.dat # queue_ST
     647  echo "0                     " >> diffobjbatch.dat # queue_OB
     648  echo "0                     " >> diffobjbatch.dat # queue_DF
     649  echo "1                     " >> diffobjbatch.dat # queue_DO
     650  echo "0                     " >> diffobjbatch.dat # queue_FW
     651  echo "0                     " >> diffobjbatch.dat # queue_FO
     652  echo "1                     " >> diffobjbatch.dat # active
     653  echo "0                     " >> diffobjbatch.dat # parallel
     654  echo "use_new               " >> diffobjbatch.dat # P2_smf_version
     655  echo "any                   " >> diffobjbatch.dat # ST_cmf_version
     656  echo "2000-01-01 00:00:00.0 " >> diffobjbatch.dat # trange_start
     657  echo "2020-01-01 00:00:00.0 " >> diffobjbatch.dat # trange_end
     658  ippjython queue.py $options edit once -simtest < diffobjbatch.dat
     659  if ($status) exit
     660endif
     661
     662if ($diffobjbatch) then
     663  echo ""
     664  echo " ---- load LO batches ----"
     665
     666  rm -rf $OUTDIR/LO
     667
     668  ippjython loader.py $options $diffobjqueuename once -simtest < /dev/null
     669  if ($status) exit
     670endif
     671
Note: See TracChangeset for help on using the changeset viewer.