Changeset 38965
- Timestamp:
- Oct 26, 2015, 5:25:43 PM (11 years ago)
- Location:
- trunk/ippToPsps
- Files:
-
- 2 edited
-
config/tables.FG.vot (modified) (5 diffs)
-
jython/forcedgalaxybatch.py (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ippToPsps/config/tables.FG.vot
r38964 r38965 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>88 76 <FIELD name="gGalChisq" arraysize="1" datatype="float" unit="dimensionless" default="-999"> 89 77 <DESCRIPTION>Reduced chi squared value for g filter measurement.</DESCRIPTION> … … 114 102 <DESCRIPTION>Error in galaxy fit magnitude for r filter measurement.</DESCRIPTION> 115 103 </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>128 104 <FIELD name="rGalChisq" arraysize="1" datatype="float" unit="dimensionless" default="-999"> 129 105 <DESCRIPTION>Reduced chi squared value for r filter measurement.</DESCRIPTION> … … 154 130 <DESCRIPTION>Error in galaxy fit magnitude for i filter measurement.</DESCRIPTION> 155 131 </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>168 132 <FIELD name="iGalChisq" arraysize="1" datatype="float" unit="dimensionless" default="-999"> 169 133 <DESCRIPTION>Reduced chi squared value for i filter measurement.</DESCRIPTION> … … 194 158 <DESCRIPTION>Error in galaxy fit magnitude for z filter measurement.</DESCRIPTION> 195 159 </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>208 160 <FIELD name="zGalChisq" arraysize="1" datatype="float" unit="dimensionless" default="-999"> 209 161 <DESCRIPTION>Reduced chi squared value for z filter measurement.</DESCRIPTION> … … 233 185 <FIELD name="yGalMagErr" arraysize="1" datatype="float" unit="AB magnitudes" default="-999"> 234 186 <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>247 187 </FIELD> 248 188 <FIELD name="yGalChisq" arraysize="1" datatype="float" unit="dimensionless" default="-999"> -
trunk/ippToPsps/jython/forcedgalaxybatch.py
r38964 r38965 142 142 for filter in filters: 143 143 filterID = self.scratchDb.getFilterId(filter[1]) 144 144 photcode = self.scratchDb.getPhotoCalID("GPC1." + filter[1] + ".ForcedWarp") 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 # 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 168 189 169 190 try: self.scratchDb.execute(sql) … … 215 236 216 237 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
Note:
See TracChangeset
for help on using the changeset viewer.
