IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 34934


Ignore:
Timestamp:
Jan 15, 2013, 8:35:50 PM (14 years ago)
Author:
eugene
Message:

adding some notes, mod settings for local install, create a working gpc1 test database

Location:
branches/eam_branches/ipp-20121219/ippToPsps
Files:
3 added
3 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20121219/ippToPsps/config/settings.xml

    r33745 r34934  
    55
    66  <!-- path for storing logs -->
    7   <logPath>/data/ipp005.0/ipptopsps</logPath>
     7  <logPath>/home/kiawe/eugene/ipptopsps</logPath>
    88
    99  <!-- local scratch Db section -->
    … …  
    1111    <name>ipptopsps_scratch</name>
    1212    <host>localhost</host>
    13     <user>ipp</user>
    14     <password>ipp</password>
     13    <user>dvo</user>
     14    <password>dvo</password>
    1515  </localdatabase>
    1616
    1717  <!-- GPC1 Db section -->
    1818  <gpc1database>
    19     <name>gpc1</name>
    20     <host>ippdb01</host>
    21     <user>ipp</user>
    22     <password>ipp</password>
     19    <name>gpc1test</name>
     20    <host>localhost</host>
     21    <user>dvo</user>
     22    <password>dvo</password>
    2323  </gpc1database>
    2424
    … …  
    2626  <ipptopspsdatabase>
    2727    <name>ipptopsps</name>
    28     <host>ippdb01</host>
    29     <user>ipp</user>
    30     <password>ipp</password>
     28    <host>localhost</host>
     29    <user>dvo</user>
     30    <password>dvo</password>
    3131  </ipptopspsdatabase>
    3232

  • branches/eam_branches/ipp-20121219/ippToPsps/jython/gpc1db.py

    r34902 r34934  
    112112        self.logger.debug("Querying GPC1 for image IDs for stack ID: " + str(stackID))
    113113
     114        # JOIN stackInputSkyfile shoule use stack_id as well as warp_id, right? (maybe not -- the join to warp is first)
    114115        sql = "SELECT DISTINCT CONCAT(exp_id, SUBSTR(class_id, 3, 4)) FROM ( \
    115116               SELECT DISTINCT exp_id,class_id \

  • branches/eam_branches/ipp-20121219/ippToPsps/test/mkgpc1.sh

    r34927 r34934  
    1818
    1919if ("$1" == "create") then
    20   if ($#argv != 4) goto usage;
     20  if ($#argv < 4) goto usage;
    2121  set dbhost = $2
    2222  set dbname = $3
    2323  set dbuser = $4
     24  if ($#argv == 5) then
     25    set dbpass = "-p$5"
     26  else
     27    set dbpass = "-p"
     28  endif
    2429
    2530  # create a database with completely minimal tables needed to test
    26   mysql -h $dbhost -u $dbuser -p <<EOF
     31  mysql -h $dbhost -u $dbuser $dbpass <<EOF
    2732   CREATE DATABASE $dbname;
    2833   USE $dbname;
    29   CREATE TABLE addRun (
    30     stage CHAR 64,
    31     state CHAR 64,
    32     stage_id INT,
    33     minidvodb_name CHAR 64
     34  CREATE TABLE ippToPspsFake (
     35    my_id INT
    3436  );
    35   CREATE TABLE camProcessedExp (
    36     path_base CHAR 255,
    37     cam_id INT
    38   );
    39   CREATE TABLE camRun (
    40     cam_id INT,
    41     chip_id INT,
    42     dist_group CHAR 64,
    43     software_ver CHAR 16
    44   );
    45   CREATE TABLE chipRun (
    46     exp_id INT,
    47     chip_id INT
    48   );
    49   CREATE TABLE fakeRun (
    50     fake_id INT,
    51     cam_id INT
    52   );
    53   CREATE TABLE mergedvodbProcessed (
    54    merge_id INT,
    55    fault INT
    56   );
    57   CREATE TABLE mergedvodbRun (
    58    minidvodb_id INT,
    59    merge_id INT,
    60    state CHAR 64,
    61    mergedvodb CHAR 64
    62   );
    63   CREATE TABLE minidvodbProcessed (
    64    minidvodb_id INT,
    65    fault INT
    66   );
    67   CREATE TABLE minidvodbRun (
    68    minidvodb_name CHAR 64,
    69    minidvodb_id INT,
    70    state CHAR 64
     37  CREATE TABLE skycell (
     38   radeg REAL,
     39   decdeg REAL,
     40   skycell_id CHAR(64)
    7141  );
    7242  CREATE TABLE rawExp (
    7343   exp_id INT,
    74    exp_name CHAR 64,
     44   exp_name CHAR(64),
    7545   exp_time REAL,
    7646   bg REAL,
    … …  
    7949   decl FLOAT
    8050  );
    81   CREATE TABLE skycalResult (
    82    path_base CHAR 255,
    83    skycal_id INT
     51  CREATE TABLE chipRun (
     52    exp_id INT,
     53    chip_id INT
     54  );
     55  CREATE TABLE camRun (
     56    chip_id INT,
     57    cam_id INT,
     58    dist_group CHAR(64),
     59    software_ver CHAR(16)
     60  );
     61  CREATE TABLE camProcessedExp (
     62    path_base CHAR(255),
     63    cam_id INT
     64  );
     65  CREATE TABLE fakeRun (
     66    fake_id INT,
     67    cam_id INT
     68  );
     69  CREATE TABLE warpRun (
     70   warp_id INT,
     71   fake_id INT
     72  );
     73  CREATE TABLE warpSkyCellMap (
     74   warp_id INT,
     75   skycell_id CHAR(64),
     76   class_id CHAR(64)
     77  );
     78  CREATE TABLE stackRun (
     79   stack_id INT,
     80   skycell_id CHAR(64),
     81   filter CHAR(64),
     82   software_ver CHAR(16)
     83  );
     84  CREATE TABLE stackInputSkyfile (
     85   stack_id INT,
     86   warp_id INT
     87  );
     88  CREATE TABLE stackSumSkyfile (
     89   stack_id INT
    8490  );
    8591  CREATE TABLE skycalRun (
    … …  
    8793   stack_id INT
    8894  );
    89   CREATE TABLE skycell (
    90    radec REAL,
    91    decdeg REAL,
    92    skycell_id CHAR 64
     95  CREATE TABLE skycalResult (
     96   path_base CHAR(255),
     97   skycal_id INT
    9398  );
    94   CREATE TABLE stackInputSkyfile (
    95    warp_id INT
     99  CREATE TABLE addRun (
     100    stage CHAR(64),
     101    state CHAR(64),
     102    stage_id INT,
     103    minidvodb_name CHAR(64)
    96104  );
    97   CREATE TABLE stackRun (
    98    stack_id INT,
    99    skycell_id CHAR 64,
    100    filter CHAR 64,
    101    software_ver CHAR 16
     105  CREATE TABLE minidvodbRun (
     106   minidvodb_name CHAR(64),
     107   minidvodb_id INT,
     108   state CHAR(64)
    102109  );
    103   CREATE TABLE stackSumSkyfile (
    104    stack_id INT
     110  CREATE TABLE minidvodbProcessed (
     111   minidvodb_id INT,
     112   fault INT
    105113  );
    106   CREATE TABLE warpRun (
    107    warp_id INT
     114  CREATE TABLE mergedvodbRun (
     115   minidvodb_id INT,
     116   merge_id INT,
     117   state CHAR(64),
     118   mergedvodb CHAR(64)
    108119  );
    109   CREATE TABLE warpSkyCellMap (
    110    warp_id INT,
    111    skycell_id CHAR 64,
    112    class_id CHAR 64
     120  CREATE TABLE mergedvodbProcessed (
     121   merge_id INT,
     122   fault INT
    113123  );
    114124EOF
    … …  
    117127
    118128if ("$1" == "delete") then
    119   if ($#argv != 4) goto usage;
     129  if ($#argv < 4) goto usage;
    120130  set dbhost = $2
    121131  set dbname = $3
    122132  set dbuser = $4
     133  if ($#argv == 5) then
     134    set dbpass = "-p$5"
     135  else
     136    set dbpass = "-p"
     137  endif
    123138
    124   mysql -h $dbhost -u $dbuser -p <<EOF > /dev/null
     139  mysql -h $dbhost -u $dbuser $dbpass <<EOF
    125140   USE $dbname;
    126    describe dvoDetection;
     141   describe ippToPspsFake;
    127142EOF
    128 
    129143  if ($status) then
    130     echo "database does not contain dvoDetections, not deleting"
     144    echo "database does not contain ippToPspsFake, not deleting"
    131145    exit 1;
    132146  endif
    133147
     148  set ntable = `echo "USE $dbname; show tables;" | mysql -h $dbhost -u $dbuser $dbpass | wc -l`
     149  echo ntable: $ntable
     150  if ($ntable != 20) then
     151    echo "expected 20 lines (19 tables), but got $ntable, not deleting"
     152    exit 2
     153  endif
     154
    134155  echo "database is valid, deleting"
    135   mysql -h $dbhost -u $dbuser -p <<EOF
     156  mysql -h $dbhost -u $dbuser $dbpass <<EOF
    136157   drop database $dbname;
    137158EOF
    … …  
    141162
    142163usage:
    143   echo "USAGE: dbadmin.sh (options)"
     164  echo "USAGE: mkgpc1.sh (options)"
    144165  echo ""
    145   echo "  dbadmin.sh create (dbhost) (dbname) (dbuser)"
     166  echo "  mkgpc1.sh create (dbhost) (dbname) (dbuser) [dbpass]"
    146167  echo "      create a new test db"
    147168  echo ""
    148   echo "  dbadmin.sh delete (dbhost) (dbname) (dbuser)"
    149   echo "      delete an existing test db (enter pass 2x)"
     169  echo "  mkgpc1.sh delete (dbhost) (dbname) (dbuser) [dbpass]"
     170  echo "      delete an existing test db (enter pass 3x)"
    150171  echo ""
    151   echo "  dbadmin.sh user (dbhost) (dbuser) (password)"
     172  echo "  mkgpc1.sh user (dbhost) (dbuser) (password)"
    152173  echo "      create a new user and password for the test db"
    153174  echo ""
Note: See TracChangeset for help on using the changeset viewer.