IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 38963 for trunk


Ignore:
Timestamp:
Oct 26, 2015, 5:17:19 PM (11 years ago)
Author:
watersc1
Message:

Dropping ra/dec fields from ForcedGalaxyShape, as these are inherited from the stack detection, and should be fixed to those values (as it's forced). 'Complete' version of the forcedgalaxybatch.py, which has all the things similar tables also have.

Location:
trunk/ippToPsps
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippToPsps/config/settings.xml

    r38083 r38963  
    1212      <name>ipptopsps2_scratch</name>
    1313      <host>ipp006</host>
    14       <user>dvo</user>
    15       <password>dvo</password>
     14      <user>czw</user>
     15      <password>czw</password>
    1616      <memory>16</memory>
    1717    </loader>
    … …  
    1919      <name>ipptopsps2_scratch</name>
    2020      <host>stare00</host>
    21       <user>dvo</user>
    22       <password>dvo</password>
     21      <user>czw</user>
     22      <password>czw</password>
    2323      <memory>64</memory>
    2424    </loader>
    … …  
    2626      <name>ipptopsps2_scratch</name>
    2727      <host>stare01</host>
    28       <user>dvo</user>
    29       <password>dvo</password>
     28      <user>czw</user>
     29      <password>czw</password>
    3030      <memory>64</memory>
    3131    </loader>
    … …  
    3333      <name>ipptopsps2_scratch</name>
    3434      <host>stare02</host>
    35       <user>dvo</user>
    36       <password>dvo</password>
     35      <user>czw</user>
     36      <password>czw</password>
    3737      <memory>64</memory>
    3838    </loader>
    … …  
    4040      <name>ipptopsps2_scratch</name>
    4141      <host>stare03</host>
    42       <user>dvo</user>
    43       <password>dvo</password>
     42      <user>czw</user>
     43      <password>czw</password>
    4444      <memory>64</memory>
    4545    </loader>
    … …  
    4747      <name>ipptopsps2_scratch</name>
    4848      <host>stare04</host>
    49       <user>dvo</user>
    50       <password>dvo</password>
     49      <user>czw</user>
     50      <password>czw</password>
    5151      <memory>64</memory>
    5252    </loader>
    … …  
    5454      <name>ipptopsps2_scratch</name>
    5555      <host>stsci00</host>
    56       <user>dvo</user>
    57       <password>dvo</password>
     56      <user>czw</user>
     57      <password>czw</password>
    5858      <memory>32</memory>
    5959    </loader>
    … …  
    6161      <name>ipptopsps2_scratch</name>
    6262      <host>stsci01</host>
    63       <user>dvo</user>
    64       <password>dvo</password>
     63      <user>czw</user>
     64      <password>czw</password>
    6565      <memory>32</memory>
    6666    </loader>
    … …  
    6868      <name>ipptopsps2_scratch</name>
    6969      <host>stsci02</host>
    70       <user>dvo</user>
    71       <password>dvo</password>
     70      <user>czw</user>
     71      <password>czw</password>
    7272      <memory>32</memory>
    7373    </loader>
    … …  
    7575      <name>ipptopsps2_scratch</name>
    7676      <host>stsci03</host>
    77       <user>dvo</user>
    78       <password>dvo</password>
     77      <user>czw</user>
     78      <password>czw</password>
    7979      <memory>32</memory>
    8080    </loader>
    … …  
    8282      <name>ipptopsps2_scratch</name>
    8383      <host>stsci04</host>
    84       <user>dvo</user>
    85       <password>dvo</password>
     84      <user>czw</user>
     85      <password>czw</password>
    8686      <memory>32</memory>
    8787    </loader>
    … …  
    8989      <name>ipptopsps2_scratch</name>
    9090      <host>stsci05</host>
    91       <user>dvo</user>
    92       <password>dvo</password>
     91      <user>czw</user>
     92      <password>czw</password>
    9393      <memory>32</memory>
    9494    </loader>
    … …  
    9696      <name>ipptopsps2_scratch</name>
    9797      <host>stsci06</host>
    98       <user>dvo</user>
    99       <password>dvo</password>
     98      <user>czw</user>
     99      <password>czw</password>
    100100      <memory>32</memory>
    101101    </loader>
    … …  
    103103      <name>ipptopsps2_scratch</name>
    104104      <host>stsci07</host>
    105       <user>dvo</user>
    106       <password>dvo</password>
     105      <user>czw</user>
     106      <password>czw</password>
    107107      <memory>32</memory>
    108108    </loader>
    … …  
    110110      <name>ipptopsps2_scratch</name>
    111111      <host>stsci08</host>
    112       <user>dvo</user>
    113       <password>dvo</password>
     112      <user>czw</user>
     113      <password>czw</password>
    114114      <memory>32</memory>
    115115    </loader>
    … …  
    117117      <name>ipptopsps2_scratch</name>
    118118      <host>stsci09</host>
    119       <user>dvo</user>
    120       <password>dvo</password>
     119      <user>czw</user>
     120      <password>czw</password>
    121121      <memory>32</memory>
    122122    </loader>
    … …  
    124124      <name>ipptopsps2_scratch</name>
    125125      <host>stsci10</host>
    126       <user>dvo</user>
    127       <password>dvo</password>
     126      <user>czw</user>
     127      <password>czw</password>
    128128      <memory>32</memory>
    129129    </loader>
    … …  
    131131      <name>ipptopsps2_scratch</name>
    132132      <host>stsci11</host>
    133       <user>dvo</user>
    134       <password>dvo</password>
     133      <user>czw</user>
     134      <password>czw</password>
    135135      <memory>32</memory>
    136136    </loader>
    … …  
    138138      <name>ipptopsps2_scratch</name>
    139139      <host>stsci12</host>
    140       <user>dvo</user>
    141       <password>dvo</password>
     140      <user>czw</user>
     141      <password>czw</password>
    142142      <memory>32</memory>
    143143    </loader>
    … …  
    145145      <name>ipptopsps2_scratch</name>
    146146      <host>stsci13</host>
    147       <user>dvo</user>
    148       <password>dvo</password>
     147      <user>czw</user>
     148      <password>czw</password>
    149149      <memory>32</memory>
    150150    </loader>
    … …  
    152152      <name>ipptopsps2_scratch</name>
    153153      <host>stsci14</host>
    154       <user>dvo</user>
    155       <password>dvo</password>
     154      <user>czw</user>
     155      <password>czw</password>
    156156      <memory>32</memory>
    157157    </loader>
    … …  
    159159      <name>ipptopsps2_scratch</name>
    160160      <host>stsci15</host>
    161       <user>dvo</user>
    162       <password>dvo</password>
     161      <user>czw</user>
     162      <password>czw</password>
    163163      <memory>32</memory>
    164164    </loader>
    … …  
    166166      <name>ipptopsps2_scratch</name>
    167167      <host>stsci16</host>
    168       <user>dvo</user>
    169       <password>dvo</password>
     168      <user>czw</user>
     169      <password>czw</password>
    170170      <memory>32</memory>
    171171    </loader>
    … …  
    173173      <name>ipptopsps2_scratch</name>
    174174      <host>stsci17</host>
    175       <user>dvo</user>
    176       <password>dvo</password>
     175      <user>czw</user>
     176      <password>czw</password>
    177177      <memory>32</memory>
    178178    </loader>
    … …  
    180180      <name>ipptopsps2_scratch</name>
    181181      <host>stsci18</host>
    182       <user>dvo</user>
    183       <password>dvo</password>
     182      <user>czw</user>
     183      <password>czw</password>
    184184      <memory>32</memory>
    185185    </loader>
    … …  
    187187      <name>ipptopsps2_scratch</name>
    188188      <host>stsci19</host>
    189       <user>dvo</user>
    190       <password>dvo</password>
     189      <user>czw</user>
     190      <password>czw</password>
    191191      <memory>32</memory>
    192192    </loader>
    … …  
    198198      <name>ipptopsps_scratch</name>
    199199      <host>localhost</host>
    200       <user>dvo</user>
    201       <password>dvo</password>
     200      <user>czw</user>
     201      <password>czw</password>
    202202      <memory>16</memory>
    203203    </loader>
    … …  
    210210    <name>gpc1</name>
    211211    <host>ippdb05</host>
    212     <user>ipp</user>
    213     <password>ipp</password>
     212    <user>ippuser</user>
     213    <password>ippuser</password>
    214214  </gpc1database>
    215215
    … …  
    218218    <name>ipptopsps2</name>
    219219    <host>ipp006</host>
    220     <user>dvo</user>
    221     <password>dvo</password>
     220    <user>czw</user>
     221    <password>czw</password>
    222222  </ipptopspsdatabase>
    223223
    … …  
    227227      <name>ipptopsps_test_scratch</name>
    228228      <host>ipp006</host>
    229       <user>dvo</user>
    230       <password>dvo</password>
     229      <user>czw</user>
     230      <password>czw</password>
    231231      <memory>16</memory>
    232232    </loader>
    … …  
    234234      <name>ipptopsps_test_scratch</name>
    235235      <host>ipp064</host>
    236       <user>dvo</user>
    237       <password>dvo</password>
     236      <user>czw</user>
     237      <password>czw</password>
    238238      <memory>32</memory>
    239239    </loader>
    … …  
    241241      <name>ipptopsps_test_scratch</name>
    242242      <host>pikake</host>
    243       <user>dvo</user>
    244       <password>dvo</password>
     243      <user>czw</user>
     244      <password>czw</password>
    245245      <memory>2</memory>
    246246    </loader>
    … …  
    248248      <name>ipptopsps_test_scratch</name>
    249249      <host>localhost</host>
    250       <user>dvo</user>
    251       <password>dvo</password>
     250      <user>czw</user>
     251      <password>czw</password>
    252252      <memory>2</memory>
    253253    </loader>
    … …  
    260260    <name>gpc1test</name>
    261261    <host>localhost</host>
    262     <user>dvo</user>
    263     <password>dvo</password>
     262    <user>czw</user>
     263    <password>czw</password>
    264264  </gpc1database_test>
    265265
    … …  
    268268    <name>ipptopsps_test</name>
    269269    <host>localhost</host>
    270     <user>dvo</user>
    271     <password>dvo</password>
     270    <user>czw</user>
     271    <password>czw</password>
    272272  </ipptopspsdatabase_test>
    273273
    … …  
    276276    <name>czardb</name>
    277277    <host>ippdb05</host>
    278     <user>ipp</user>
    279     <password>ipp</password>
     278    <user>ippuser</user>
     279    <password>ippuser</password>
    280280  </czardatabase>
    281281

  • trunk/ippToPsps/config/tables.FG.vot

    r38953 r38963  
    7474        <DESCRIPTION>Error in galaxy fit magnitude for g filter measurement.</DESCRIPTION>
    7575      </FIELD>
    76       <FIELD name="gGalRa" arraysize="1" datatype="float" unit="arcsec" default="-999">
    77         <DESCRIPTION>Right ascension offset of Sersic (1963) fit from PSF right ascension for g filter measurement.</DESCRIPTION>
    78       </FIELD>
    79       <FIELD name="gGalDec" arraysize="1" datatype="float" unit="arcsec" default="-999">
    80         <DESCRIPTION>Declination offset of Sersic (1963) fit from PSF declination for g filter measurement.</DESCRIPTION>
    81       </FIELD>
    82       <FIELD name="gGalRaErr" arraysize="1" datatype="float" unit="arcsec" default="-999">
    83         <DESCRIPTION>Error in right ascension offset of Sersic (1963) fit from PSF right ascension for g filter measurement.</DESCRIPTION>
    84       </FIELD>
    85       <FIELD name="gGalDecErr" arraysize="1" datatype="float" unit="arcsec" default="-999">
    86         <DESCRIPTION>Error in declination offset of Sersic (1963) fit from PSF declination for g filter measurement.</DESCRIPTION>
    87       </FIELD>
    8876      <FIELD name="gGalChisq" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    8977        <DESCRIPTION>Reduced chi squared value for g filter measurement.</DESCRIPTION>
    … …  
    114102        <DESCRIPTION>Error in galaxy fit magnitude for r filter measurement.</DESCRIPTION>
    115103      </FIELD>
    116       <FIELD name="rGalRa" arraysize="1" datatype="float" unit="arcsec" default="-999">
    117         <DESCRIPTION>Right ascension offset of Sersic (1963) fit from PSF right ascension for r filter measurement.</DESCRIPTION>
    118       </FIELD>
    119       <FIELD name="rGalDec" arraysize="1" datatype="float" unit="arcsec" default="-999">
    120         <DESCRIPTION>Declination offset of Sersic (1963) fit from PSF declination for r filter measurement.</DESCRIPTION>
    121       </FIELD>
    122       <FIELD name="rGalRaErr" arraysize="1" datatype="float" unit="arcsec" default="-999">
    123         <DESCRIPTION>Error in right ascension offset of Sersic (1963) fit from PSF right ascension for r filter measurement.</DESCRIPTION>
    124       </FIELD>
    125       <FIELD name="rGalDecErr" arraysize="1" datatype="float" unit="arcsec" default="-999">
    126         <DESCRIPTION>Error in declination offset of Sersic (1963) fit from PSF declination for r filter measurement.</DESCRIPTION>
    127       </FIELD>
    128104      <FIELD name="rGalChisq" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    129105        <DESCRIPTION>Reduced chi squared value for r filter measurement.</DESCRIPTION>
    … …  
    154130        <DESCRIPTION>Error in galaxy fit magnitude for i filter measurement.</DESCRIPTION>
    155131      </FIELD>
    156       <FIELD name="iGalRa" arraysize="1" datatype="float" unit="arcsec" default="-999">
    157         <DESCRIPTION>Right ascension offset of Sersic (1963) fit from PSF right ascension for i filter measurement.</DESCRIPTION>
    158       </FIELD>
    159       <FIELD name="iGalDec" arraysize="1" datatype="float" unit="arcsec" default="-999">
    160         <DESCRIPTION>Declination offset of Sersic (1963) fit from PSF declination for i filter measurement.</DESCRIPTION>
    161       </FIELD>
    162       <FIELD name="iGalRaErr" arraysize="1" datatype="float" unit="arcsec" default="-999">
    163         <DESCRIPTION>Error in right ascension offset of Sersic (1963) fit from PSF right ascension for i filter measurement.</DESCRIPTION>
    164       </FIELD>
    165       <FIELD name="iGalDecErr" arraysize="1" datatype="float" unit="arcsec" default="-999">
    166         <DESCRIPTION>Error in declination offset of Sersic (1963) fit from PSF declination for i filter measurement.</DESCRIPTION>
    167       </FIELD>
    168132      <FIELD name="iGalChisq" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    169133        <DESCRIPTION>Reduced chi squared value for i filter measurement.</DESCRIPTION>
    … …  
    194158        <DESCRIPTION>Error in galaxy fit magnitude for z filter measurement.</DESCRIPTION>
    195159      </FIELD>
    196       <FIELD name="zGalRa" arraysize="1" datatype="float" unit="arcsec" default="-999">
    197         <DESCRIPTION>Right ascension offset of Sersic (1963) fit from PSF right ascension for z filter measurement.</DESCRIPTION>
    198       </FIELD>
    199       <FIELD name="zGalDec" arraysize="1" datatype="float" unit="arcsec" default="-999">
    200         <DESCRIPTION>Declination offset of Sersic (1963) fit from PSF declination for z filter measurement.</DESCRIPTION>
    201       </FIELD>
    202       <FIELD name="zGalRaErr" arraysize="1" datatype="float" unit="arcsec" default="-999">
    203         <DESCRIPTION>Error in right ascension offset of Sersic (1963) fit from PSF right ascension for z filter measurement.</DESCRIPTION>
    204       </FIELD>
    205       <FIELD name="zGalDecErr" arraysize="1" datatype="float" unit="arcsec" default="-999">
    206         <DESCRIPTION>Error in declination offset of Sersic (1963) fit from PSF declination for z filter measurement.</DESCRIPTION>
    207       </FIELD>
    208160      <FIELD name="zGalChisq" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    209161        <DESCRIPTION>Reduced chi squared value for z filter measurement.</DESCRIPTION>
    … …  
    233185      <FIELD name="yGalMagErr" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
    234186        <DESCRIPTION>Error in galaxy fit magnitude for y filter measurement.</DESCRIPTION>
    235       </FIELD>
    236       <FIELD name="yGalRa" arraysize="1" datatype="float" unit="arcsec" default="-999">
    237         <DESCRIPTION>Right ascension offset of Sersic (1963) fit from PSF right ascension for y filter measurement.</DESCRIPTION>
    238       </FIELD>
    239       <FIELD name="yGalDec" arraysize="1" datatype="float" unit="arcsec" default="-999">
    240         <DESCRIPTION>Declination offset of Sersic (1963) fit from PSF declination for y filter measurement.</DESCRIPTION>
    241       </FIELD>
    242       <FIELD name="yGalRaErr" arraysize="1" datatype="float" unit="arcsec" default="-999">
    243         <DESCRIPTION>Error in right ascension offset of Sersic (1963) fit from PSF right ascension for y filter measurement.</DESCRIPTION>
    244       </FIELD>
    245       <FIELD name="yGalDecErr" arraysize="1" datatype="float" unit="arcsec" default="-999">
    246         <DESCRIPTION>Error in declination offset of Sersic (1963) fit from PSF declination for y filter measurement.</DESCRIPTION>
    247187      </FIELD>
    248188      <FIELD name="yGalChisq" arraysize="1" datatype="float" unit="dimensionless" default="-999">

  • trunk/ippToPsps/jython/forcedgalaxybatch.py

    r38945 r38963  
    142142        for filter in filters:
    143143            filterID = self.scratchDb.getFilterId(filter[1])
    144 
     144            photcode = self.scratchDb.getPhotoCalID("GPC1." + filter[1] + ".ForcedWarp")
    145145
    146146            # This is going to need to join elsewhere to get all the fields?
    … …  
    148148            # Ra, Dec, RaErr, DecErr
    149149           
    150             # Should GalChiSq fold in Npix somehow? 
    151             sql = "UPDATE ForcedGalaxyShape JOIN " \
    152                 + cpqTable + " AS cpq ON (cpq.row = (ForcedGalaxyShape.row* " + str(filterCount) + ")-(" + str(filterCount) + " - " + str(filter[0]) + ")) " \
    153                 + " SET " + \
    154                 + " ForcedGalaxyShape." + filter[1] + "ippDetectID                = DET_ID," \
    155                 + " ForcedGalaxyShape." + filter[1] + "forcedSummaryID            = IMAGE_ID," \
    156                 + " ForcedGalaxyShape." + filter[1] + "GalModelType               = MODEL_TYPE," \
    157                 + " ForcedGalaxyShape." + filter[1] + "GalMajor                   = MAJOR_AXIS," \
    158                 + " ForcedGalaxyShape." + filter[1] + "GalMajorErr                = MAJOR_AXIS_ERR," \
    159                 + " ForcedGalaxyShape." + filter[1] + "GalMinor                   = MINOR_AXIS," \
    160                 + " ForcedGalaxyShape." + filter[1] + "GalMinorErr                = MINOR_AXIS_ERR," \
    161                 + " ForcedGalaxyShape." + filter[1] + "GalMag                     = MAG," \
    162                 + " ForcedGalaxyShape." + filter[1] + "GalMagErr                  = MAG_ERR," \
    163                 + " ForcedGalaxyShape." + filter[1] + "GalRa                      = RA," \
    164                 + " ForcedGalaxyShape." + filter[1] + "GalDec                     = DEC," \
    165                 + " ForcedGalaxyShape." + filter[1] + "GalRaErr                   = RA_ERR," \
    166                 + " ForcedGalaxyShape." + filter[1] + "GalDecErr                  = DEC_ERR," \
    167                 + " ForcedGalaxyShape." + filter[1] + "GalChisq                   = CHISQ "
     150            # This won't work, as we need to join on modeltype/obj_id/filter
     151#                + cpqTable + " AS cpq ON (cpq.row = (ForcedGalaxyShape.row* " + str(filterCount) + ")-(" + str(filterCount) + " - " + str(filter[0]) + ")) " \
     152#                + " ForcedGalaxyShape." + filter[1] + "GalModelType               = MODEL_TYPE," \
     153
     154            # Should GalChiSq fold in Npix somehow?
     155#             sql = "UPDATE ForcedGalaxyShape JOIN " \
     156#                + cpqTable + " AS cpq ON (cpq.row = (ForcedGalaxyShape.row* " + str(filterCount) + ")-(" + str(filterCount) + " - " + str(filter[0]) + ")) " \
     157#                 + " SET " + \
     158#                 + " ForcedGalaxyShape." + filter[1] + "ippDetectID                = DET_ID," \
     159#                 + " ForcedGalaxyShape." + filter[1] + "forcedSummaryID            = IMAGE_ID," \
     160#                 + " ForcedGalaxyShape." + filter[1] + "GalMajor                   = MAJOR_AXIS," \
     161#                 + " ForcedGalaxyShape." + filter[1] + "GalMajorErr                = MAJOR_AXIS_ERR," \
     162#                 + " ForcedGalaxyShape." + filter[1] + "GalMinor                   = MINOR_AXIS," \
     163#                 + " ForcedGalaxyShape." + filter[1] + "GalMinorErr                = MINOR_AXIS_ERR," \
     164#                 + " ForcedGalaxyShape." + filter[1] + "GalMag                     = MAG," \
     165#                 + " ForcedGalaxyShape." + filter[1] + "GalMagErr                  = MAG_ERR," \
     166#                 + " ForcedGalaxyShape." + filter[1] + "GalRa                      = RA," \
     167#                 + " ForcedGalaxyShape." + filter[1] + "GalDec                     = DEC," \
     168#                 + " ForcedGalaxyShape." + filter[1] + "GalRaErr                   = RA_ERR," \
     169#                 + " ForcedGalaxyShape." + filter[1] + "GalDecErr                  = DEC_ERR," \
     170#                 + " ForcedGalaxyShape." + filter[1] + "GalChisq                   = CHISQ "
     171
     172            sqlLine = sqlUtility("UPDATE ForcedGalaxyShape AS a, " + cpqTable + " AS b SET")
     173            sqlLine.group("a." + filter[1] + "ippDetectID",     "b.DET_ID")
     174            sqlLine.group("a." + filter[1] + "forcedSummaryID", "b.IMAGE_ID")
     175            sqlLine.group("a." + filter[1] + "GalMajor",        "b.MAJOR_AXIS")
     176            sqlLine.group("a." + filter[1] + "GalMajorErr",     "b.MAJOR_AXIS_ERR")
     177            sqlLine.group("a." + filter[1] + "GalMinor",        "b.MINOR_AXIS")
     178            sqlLine.group("a." + filter[1] + "GalMinorErr",     "b.MINOR_AXIS_ERR")
     179            sqlLine.group("a." + filter[1] + "GalMag",          "b.MAG")
     180            sqlLine.group("a." + filter[1] + "GalMagErr",       "b.MAG_ERR")
     181# These fields don't exist.
     182#            sqlLine.group("a." + filter[1] + "GalRa",           "b.RA")
     183#            sqlLine.group("a." + filter[1] + "GalDec",          "b.DEC")
     184#            sqlLine.group("a." + filter[1] + "GalRaErr",        "b.RA_ERR")
     185#            sqlLine.group("a." + filter[1] + "GalDecErr",       "b.DEC_ERR")
     186            sqlLine.group("a." + filter[1] + "GalChisq",        "b.CHISQ")
     187            sql = sqlLine.makeEquals("WHERE a.objID = b.OBJ_ID AND a.galModelType = b.MODEL_TYPE AND b.Photcode = " + photcode)
     188           
    168189
    169190            try: self.scratchDb.execute(sql)
    … …  
    215236
    216237       
    217        
     238        self.logger.infoPair("Dropping row column from ", "ForcedGalaxyShape table")
     239        self.scratchDb.dropColumn("ForcedGalaxyShape", "row")
     240
     241        self.logger.infoPair("setting minmaxobjid for ", "ForcedGalaxyShape table")
     242        self.setMinMaxObjID(["ForcedGalaxyShape"])
     243        self.logger.infoPair("checking if we have detections", "ForcedGalaxyShape table")
     244        rowcount = self.scratchDb.getRowCount("ForcedGalaxyShape")
     245        if rowcount == 0:
     246            self.logger.infoPair("skipping this one", "ForcedGalaxyShape")
     247            self.skipBatch = False
     248            return True
     249        else:
     250            return True
     251
     252    '''
     253    Populate psps tables
     254    '''
     255    def populatePspsTables(self):
     256       
     257        if not self.populateForcedGalaxyShapeTable(): return False
     258
     259        # My example is removing objID duplicates.  Since ForcedGalaxyShape can have multiple models for a given object, I'm not doing that.
     260

  • trunk/ippToPsps/test/fulltest.sh

    r38949 r38963  
    11#!/bin/csh -f
     2
     3set dbuser = czw
     4set dbpass = -pczw
    25
    36chmod +x mkgpc1data.dvo mkgpc1.sh
    … …  
    190193  # does the database already exist?
    191194  # XXX this command will blow away an existing database!!
    192   mysql -h localhost -u dvo -pdvo -e "create database if not exists ipptopsps_test" || exit 3
    193   mysql -h localhost -u dvo -pdvo ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql || exit 3
     195  mysql -h localhost -u $dbuser $dbpass -e "create database if not exists ipptopsps_test" || exit 3
     196  mysql -h localhost -u $dbuser $dbpass ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql || exit 3
    194197  echo " ---- init ipptopsps_test: done ----"
    195198endif
    … …  
    201204
    202205  # create the database (ignore failure if it already exists)
    203   mysql -h localhost -u dvo -pdvo -e "drop database if exists ipptopsps_test_scratch"
    204   mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test_scratch"
     206  mysql -h localhost -u $dbuser $dbpass -e "drop database if exists ipptopsps_test_scratch"
     207  mysql -h localhost -u $dbuser $dbpass -e "create database ipptopsps_test_scratch"
    205208  ippjython setupScratchDb.py -test < /dev/null
    206209  if ($status) exit

  • trunk/ippToPsps/test/mkgpc1.sh

    r38888 r38963  
    5959  echo ntable: $ntable
    6060  if ($ntable != 25) then
    61     echo "expected 25 lines (24 tables), but got $ntable, not deleting"
    62     exit 2
     61    if ($ntable != 21) then
     62        echo "expected 25 lines (24 tables), but got $ntable, not deleting"
     63        exit 2
     64    endif
     65    echo "Found old style 21 line (20 table) version of the database, so not blocking deletion."
    6366  endif
    6467

  • trunk/ippToPsps/test/mkgpc1data.dvo

    r38952 r38963  
    33input tap.dvo
    44
    5 if (not($?VERBOSE)) set VERBOSE = 0
     5opihi verbose on
     6if (not($?VERBOSE)) set VERBOSE = 1
    67if (not($?PARALLEL)) set PARALLEL = 0
    78
    … …  
    7071  $dbhost = localhost
    7172  $dbname = gpc1test
    72   $dbuser = dvo
    73   $dbpass = dvo
     73  $dbuser = czw
     74  $dbpass = czw
    7475
    7576  $RA = 10.0

  • trunk/ippToPsps/test/partest.sh

    r35097 r38963  
    11#!/bin/csh -f
     2
     3set dbuser = czw
     4set dbpass = -pczw
    25
    36set stackqueuename = 0
    … …  
    4952  # does the database already exist?
    5053  # XXX this command will blow away an existing database!!
    51   mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test"
    52   mysql -h localhost -u dvo -pdvo ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql
     54  mysql -h localhost -u $dbuser $dbpass -e "create database ipptopsps_test"
     55  mysql -h localhost -u $dbuser $dbpass ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql
    5356
    5457endif
    … …  
    8891
    8992  # create the database (ignore failure if it already exists)
    90   mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_test_scratch1"
    91   # mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_scratch2"
    92   # mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_scratch3"
    93 
    94   mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test_scratch1"
    95   # mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_scratch2"
    96   # mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_scratch3"
     93  mysql -h localhost -u $dbuser $dbpass -e "drop database ipptopsps_test_scratch1"
     94  # mysql -h localhost -u $dbuser $dbpass -e "drop database ipptopsps_scratch2"
     95  # mysql -h localhost -u $dbuser $dbpass -e "drop database ipptopsps_scratch3"
     96
     97  mysql -h localhost -u $dbuser $dbpass -e "create database ipptopsps_test_scratch1"
     98  # mysql -h localhost -u $dbuser $dbpass -e "create database ipptopsps_scratch2"
     99  # mysql -h localhost -u $dbuser $dbpass -e "create database ipptopsps_scratch3"
    97100
    98101  ippjython setupScratchDb.py -test dummy ipptopsps_test_scratch1

  • trunk/ippToPsps/test/sastest.sh

    r37246 r38963  
    11#!/bin/csh -f
     2
     3set dbuser = czw
     4set dbpass = -pczw
    25
    36chmod +x mksasdata.dvo mkgpc1.sh
    … …  
    157160  # does the database already exist?
    158161  # XXX this command will blow away an existing database!!
    159   mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test"
    160   mysql -h localhost -u dvo -pdvo ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql
     162  mysql -h localhost -u $dbuser $dbpass -e "create database ipptopsps_test"
     163  mysql -h localhost -u $dbuser $dbpass ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql
    161164endif
    162165
    … …  
    165168
    166169  # create the database (ignore failure if it already exists)
    167   mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_scratch"
    168   mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_scratch"
     170  mysql -h localhost -u $dbuser $dbpass -e "drop database ipptopsps_scratch"
     171  mysql -h localhost -u $dbuser $dbpass -e "create database ipptopsps_scratch"
    169172  ippjython setupScratchDb.py -test < /dev/null
    170173  if ($status) exit

  • trunk/ippToPsps/test/widetest.sh

    r35204 r38963  
    11#!/bin/csh -f
     2
     3set dbuser = czw
     4set dbpass = -pczw
    25
    36set stackqueuename = 0
    … …  
    4851  # does the database already exist?
    4952  # XXX this command will blow away an existing database!!
    50   mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test"
    51   mysql -h localhost -u dvo -pdvo ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql
     53  mysql -h localhost -u $dbuser $dbpass -e "create database ipptopsps_test"
     54  mysql -h localhost -u $dbuser $dbpass ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql
    5255
    5356endif
    … …  
    5760
    5861  # create the database (ignore failure if it already exists)
    59   mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_test_scratch"
    60   mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test_scratch"
     62  mysql -h localhost -u $dbuser $dbpass -e "drop database ipptopsps_test_scratch"
     63  mysql -h localhost -u $dbuser $dbpass -e "create database ipptopsps_test_scratch"
    6164  ippjython setupScratchDb.py -test
    6265endif
Note: See TracChangeset for help on using the changeset viewer.