Changeset 38964
- Timestamp:
- Oct 26, 2015, 5:24:35 PM (11 years ago)
- Location:
- trunk/ippToPsps
- Files:
-
- 9 edited
-
config/settings.xml (modified) (36 diffs)
-
config/tables.FG.vot (modified) (5 diffs)
-
jython/forcedgalaxybatch.py (modified) (3 diffs)
-
test/fulltest.sh (modified) (3 diffs)
-
test/mkgpc1.sh (modified) (1 diff)
-
test/mkgpc1data.dvo (modified) (2 diffs)
-
test/partest.sh (modified) (3 diffs)
-
test/sastest.sh (modified) (3 diffs)
-
test/widetest.sh (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ippToPsps/config/settings.xml
r38963 r38964 12 12 <name>ipptopsps2_scratch</name> 13 13 <host>ipp006</host> 14 <user> czw</user>15 <password> czw</password>14 <user>dvo</user> 15 <password>dvo</password> 16 16 <memory>16</memory> 17 17 </loader> … … 19 19 <name>ipptopsps2_scratch</name> 20 20 <host>stare00</host> 21 <user> czw</user>22 <password> czw</password>21 <user>dvo</user> 22 <password>dvo</password> 23 23 <memory>64</memory> 24 24 </loader> … … 26 26 <name>ipptopsps2_scratch</name> 27 27 <host>stare01</host> 28 <user> czw</user>29 <password> czw</password>28 <user>dvo</user> 29 <password>dvo</password> 30 30 <memory>64</memory> 31 31 </loader> … … 33 33 <name>ipptopsps2_scratch</name> 34 34 <host>stare02</host> 35 <user> czw</user>36 <password> czw</password>35 <user>dvo</user> 36 <password>dvo</password> 37 37 <memory>64</memory> 38 38 </loader> … … 40 40 <name>ipptopsps2_scratch</name> 41 41 <host>stare03</host> 42 <user> czw</user>43 <password> czw</password>42 <user>dvo</user> 43 <password>dvo</password> 44 44 <memory>64</memory> 45 45 </loader> … … 47 47 <name>ipptopsps2_scratch</name> 48 48 <host>stare04</host> 49 <user> czw</user>50 <password> czw</password>49 <user>dvo</user> 50 <password>dvo</password> 51 51 <memory>64</memory> 52 52 </loader> … … 54 54 <name>ipptopsps2_scratch</name> 55 55 <host>stsci00</host> 56 <user> czw</user>57 <password> czw</password>56 <user>dvo</user> 57 <password>dvo</password> 58 58 <memory>32</memory> 59 59 </loader> … … 61 61 <name>ipptopsps2_scratch</name> 62 62 <host>stsci01</host> 63 <user> czw</user>64 <password> czw</password>63 <user>dvo</user> 64 <password>dvo</password> 65 65 <memory>32</memory> 66 66 </loader> … … 68 68 <name>ipptopsps2_scratch</name> 69 69 <host>stsci02</host> 70 <user> czw</user>71 <password> czw</password>70 <user>dvo</user> 71 <password>dvo</password> 72 72 <memory>32</memory> 73 73 </loader> … … 75 75 <name>ipptopsps2_scratch</name> 76 76 <host>stsci03</host> 77 <user> czw</user>78 <password> czw</password>77 <user>dvo</user> 78 <password>dvo</password> 79 79 <memory>32</memory> 80 80 </loader> … … 82 82 <name>ipptopsps2_scratch</name> 83 83 <host>stsci04</host> 84 <user> czw</user>85 <password> czw</password>84 <user>dvo</user> 85 <password>dvo</password> 86 86 <memory>32</memory> 87 87 </loader> … … 89 89 <name>ipptopsps2_scratch</name> 90 90 <host>stsci05</host> 91 <user> czw</user>92 <password> czw</password>91 <user>dvo</user> 92 <password>dvo</password> 93 93 <memory>32</memory> 94 94 </loader> … … 96 96 <name>ipptopsps2_scratch</name> 97 97 <host>stsci06</host> 98 <user> czw</user>99 <password> czw</password>98 <user>dvo</user> 99 <password>dvo</password> 100 100 <memory>32</memory> 101 101 </loader> … … 103 103 <name>ipptopsps2_scratch</name> 104 104 <host>stsci07</host> 105 <user> czw</user>106 <password> czw</password>105 <user>dvo</user> 106 <password>dvo</password> 107 107 <memory>32</memory> 108 108 </loader> … … 110 110 <name>ipptopsps2_scratch</name> 111 111 <host>stsci08</host> 112 <user> czw</user>113 <password> czw</password>112 <user>dvo</user> 113 <password>dvo</password> 114 114 <memory>32</memory> 115 115 </loader> … … 117 117 <name>ipptopsps2_scratch</name> 118 118 <host>stsci09</host> 119 <user> czw</user>120 <password> czw</password>119 <user>dvo</user> 120 <password>dvo</password> 121 121 <memory>32</memory> 122 122 </loader> … … 124 124 <name>ipptopsps2_scratch</name> 125 125 <host>stsci10</host> 126 <user> czw</user>127 <password> czw</password>126 <user>dvo</user> 127 <password>dvo</password> 128 128 <memory>32</memory> 129 129 </loader> … … 131 131 <name>ipptopsps2_scratch</name> 132 132 <host>stsci11</host> 133 <user> czw</user>134 <password> czw</password>133 <user>dvo</user> 134 <password>dvo</password> 135 135 <memory>32</memory> 136 136 </loader> … … 138 138 <name>ipptopsps2_scratch</name> 139 139 <host>stsci12</host> 140 <user> czw</user>141 <password> czw</password>140 <user>dvo</user> 141 <password>dvo</password> 142 142 <memory>32</memory> 143 143 </loader> … … 145 145 <name>ipptopsps2_scratch</name> 146 146 <host>stsci13</host> 147 <user> czw</user>148 <password> czw</password>147 <user>dvo</user> 148 <password>dvo</password> 149 149 <memory>32</memory> 150 150 </loader> … … 152 152 <name>ipptopsps2_scratch</name> 153 153 <host>stsci14</host> 154 <user> czw</user>155 <password> czw</password>154 <user>dvo</user> 155 <password>dvo</password> 156 156 <memory>32</memory> 157 157 </loader> … … 159 159 <name>ipptopsps2_scratch</name> 160 160 <host>stsci15</host> 161 <user> czw</user>162 <password> czw</password>161 <user>dvo</user> 162 <password>dvo</password> 163 163 <memory>32</memory> 164 164 </loader> … … 166 166 <name>ipptopsps2_scratch</name> 167 167 <host>stsci16</host> 168 <user> czw</user>169 <password> czw</password>168 <user>dvo</user> 169 <password>dvo</password> 170 170 <memory>32</memory> 171 171 </loader> … … 173 173 <name>ipptopsps2_scratch</name> 174 174 <host>stsci17</host> 175 <user> czw</user>176 <password> czw</password>175 <user>dvo</user> 176 <password>dvo</password> 177 177 <memory>32</memory> 178 178 </loader> … … 180 180 <name>ipptopsps2_scratch</name> 181 181 <host>stsci18</host> 182 <user> czw</user>183 <password> czw</password>182 <user>dvo</user> 183 <password>dvo</password> 184 184 <memory>32</memory> 185 185 </loader> … … 187 187 <name>ipptopsps2_scratch</name> 188 188 <host>stsci19</host> 189 <user> czw</user>190 <password> czw</password>189 <user>dvo</user> 190 <password>dvo</password> 191 191 <memory>32</memory> 192 192 </loader> … … 198 198 <name>ipptopsps_scratch</name> 199 199 <host>localhost</host> 200 <user> czw</user>201 <password> czw</password>200 <user>dvo</user> 201 <password>dvo</password> 202 202 <memory>16</memory> 203 203 </loader> … … 210 210 <name>gpc1</name> 211 211 <host>ippdb05</host> 212 <user>ipp user</user>213 <password>ipp user</password>212 <user>ipp</user> 213 <password>ipp</password> 214 214 </gpc1database> 215 215 … … 218 218 <name>ipptopsps2</name> 219 219 <host>ipp006</host> 220 <user> czw</user>221 <password> czw</password>220 <user>dvo</user> 221 <password>dvo</password> 222 222 </ipptopspsdatabase> 223 223 … … 227 227 <name>ipptopsps_test_scratch</name> 228 228 <host>ipp006</host> 229 <user> czw</user>230 <password> czw</password>229 <user>dvo</user> 230 <password>dvo</password> 231 231 <memory>16</memory> 232 232 </loader> … … 234 234 <name>ipptopsps_test_scratch</name> 235 235 <host>ipp064</host> 236 <user> czw</user>237 <password> czw</password>236 <user>dvo</user> 237 <password>dvo</password> 238 238 <memory>32</memory> 239 239 </loader> … … 241 241 <name>ipptopsps_test_scratch</name> 242 242 <host>pikake</host> 243 <user> czw</user>244 <password> czw</password>243 <user>dvo</user> 244 <password>dvo</password> 245 245 <memory>2</memory> 246 246 </loader> … … 248 248 <name>ipptopsps_test_scratch</name> 249 249 <host>localhost</host> 250 <user> czw</user>251 <password> czw</password>250 <user>dvo</user> 251 <password>dvo</password> 252 252 <memory>2</memory> 253 253 </loader> … … 260 260 <name>gpc1test</name> 261 261 <host>localhost</host> 262 <user> czw</user>263 <password> czw</password>262 <user>dvo</user> 263 <password>dvo</password> 264 264 </gpc1database_test> 265 265 … … 268 268 <name>ipptopsps_test</name> 269 269 <host>localhost</host> 270 <user> czw</user>271 <password> czw</password>270 <user>dvo</user> 271 <password>dvo</password> 272 272 </ipptopspsdatabase_test> 273 273 … … 276 276 <name>czardb</name> 277 277 <host>ippdb05</host> 278 <user>ipp user</user>279 <password>ipp user</password>278 <user>ipp</user> 279 <password>ipp</password> 280 280 </czardatabase> 281 281 -
trunk/ippToPsps/config/tables.FG.vot
r38963 r38964 74 74 <DESCRIPTION>Error in galaxy fit magnitude for g filter measurement.</DESCRIPTION> 75 75 </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> 76 88 <FIELD name="gGalChisq" arraysize="1" datatype="float" unit="dimensionless" default="-999"> 77 89 <DESCRIPTION>Reduced chi squared value for g filter measurement.</DESCRIPTION> … … 102 114 <DESCRIPTION>Error in galaxy fit magnitude for r filter measurement.</DESCRIPTION> 103 115 </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> 104 128 <FIELD name="rGalChisq" arraysize="1" datatype="float" unit="dimensionless" default="-999"> 105 129 <DESCRIPTION>Reduced chi squared value for r filter measurement.</DESCRIPTION> … … 130 154 <DESCRIPTION>Error in galaxy fit magnitude for i filter measurement.</DESCRIPTION> 131 155 </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> 132 168 <FIELD name="iGalChisq" arraysize="1" datatype="float" unit="dimensionless" default="-999"> 133 169 <DESCRIPTION>Reduced chi squared value for i filter measurement.</DESCRIPTION> … … 158 194 <DESCRIPTION>Error in galaxy fit magnitude for z filter measurement.</DESCRIPTION> 159 195 </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> 160 208 <FIELD name="zGalChisq" arraysize="1" datatype="float" unit="dimensionless" default="-999"> 161 209 <DESCRIPTION>Reduced chi squared value for z filter measurement.</DESCRIPTION> … … 185 233 <FIELD name="yGalMagErr" arraysize="1" datatype="float" unit="AB magnitudes" default="-999"> 186 234 <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> 187 247 </FIELD> 188 248 <FIELD name="yGalChisq" arraysize="1" datatype="float" unit="dimensionless" default="-999"> -
trunk/ippToPsps/jython/forcedgalaxybatch.py
r38963 r38964 142 142 for filter in filters: 143 143 filterID = self.scratchDb.getFilterId(filter[1]) 144 photcode = self.scratchDb.getPhotoCalID("GPC1." + filter[1] + ".ForcedWarp") 144 145 145 146 146 # This is going to need to join elsewhere to get all the fields? … … 148 148 # Ra, Dec, RaErr, DecErr 149 149 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 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 " 189 168 190 169 try: self.scratchDb.execute(sql) … … 236 215 237 216 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 217 -
trunk/ippToPsps/test/fulltest.sh
r38963 r38964 1 1 #!/bin/csh -f 2 3 set dbuser = czw4 set dbpass = -pczw5 2 6 3 chmod +x mkgpc1data.dvo mkgpc1.sh … … 193 190 # does the database already exist? 194 191 # XXX this command will blow away an existing database!! 195 mysql -h localhost -u $dbuser $dbpass-e "create database if not exists ipptopsps_test" || exit 3196 mysql -h localhost -u $dbuser $dbpassipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql || exit 3192 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 197 194 echo " ---- init ipptopsps_test: done ----" 198 195 endif … … 204 201 205 202 # create the database (ignore failure if it already exists) 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"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" 208 205 ippjython setupScratchDb.py -test < /dev/null 209 206 if ($status) exit -
trunk/ippToPsps/test/mkgpc1.sh
r38963 r38964 59 59 echo ntable: $ntable 60 60 if ($ntable != 25) then 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." 61 echo "expected 25 lines (24 tables), but got $ntable, not deleting" 62 exit 2 66 63 endif 67 64 -
trunk/ippToPsps/test/mkgpc1data.dvo
r38963 r38964 3 3 input tap.dvo 4 4 5 opihi verbose on 6 if (not($?VERBOSE)) set VERBOSE = 1 5 if (not($?VERBOSE)) set VERBOSE = 0 7 6 if (not($?PARALLEL)) set PARALLEL = 0 8 7 … … 71 70 $dbhost = localhost 72 71 $dbname = gpc1test 73 $dbuser = czw74 $dbpass = czw72 $dbuser = dvo 73 $dbpass = dvo 75 74 76 75 $RA = 10.0 -
trunk/ippToPsps/test/partest.sh
r38963 r38964 1 1 #!/bin/csh -f 2 3 set dbuser = czw4 set dbpass = -pczw5 2 6 3 set stackqueuename = 0 … … 52 49 # does the database already exist? 53 50 # XXX this command will blow away an existing database!! 54 mysql -h localhost -u $dbuser $dbpass-e "create database ipptopsps_test"55 mysql -h localhost -u $dbuser $dbpassipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql51 mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test" 52 mysql -h localhost -u dvo -pdvo ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql 56 53 57 54 endif … … 91 88 92 89 # create the database (ignore failure if it already exists) 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"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" 100 97 101 98 ippjython setupScratchDb.py -test dummy ipptopsps_test_scratch1 -
trunk/ippToPsps/test/sastest.sh
r38963 r38964 1 1 #!/bin/csh -f 2 3 set dbuser = czw4 set dbpass = -pczw5 2 6 3 chmod +x mksasdata.dvo mkgpc1.sh … … 160 157 # does the database already exist? 161 158 # XXX this command will blow away an existing database!! 162 mysql -h localhost -u $dbuser $dbpass-e "create database ipptopsps_test"163 mysql -h localhost -u $dbuser $dbpassipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql159 mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test" 160 mysql -h localhost -u dvo -pdvo ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql 164 161 endif 165 162 … … 168 165 169 166 # create the database (ignore failure if it already exists) 170 mysql -h localhost -u $dbuser $dbpass-e "drop database ipptopsps_scratch"171 mysql -h localhost -u $dbuser $dbpass-e "create database ipptopsps_scratch"167 mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_scratch" 168 mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_scratch" 172 169 ippjython setupScratchDb.py -test < /dev/null 173 170 if ($status) exit -
trunk/ippToPsps/test/widetest.sh
r38963 r38964 1 1 #!/bin/csh -f 2 3 set dbuser = czw4 set dbpass = -pczw5 2 6 3 set stackqueuename = 0 … … 51 48 # does the database already exist? 52 49 # XXX this command will blow away an existing database!! 53 mysql -h localhost -u $dbuser $dbpass-e "create database ipptopsps_test"54 mysql -h localhost -u $dbuser $dbpassipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql50 mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test" 51 mysql -h localhost -u dvo -pdvo ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql 55 52 56 53 endif … … 60 57 61 58 # create the database (ignore failure if it already exists) 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"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" 64 61 ippjython setupScratchDb.py -test 65 62 endif
Note:
See TracChangeset
for help on using the changeset viewer.
