Changeset 38810

Timestamp:

Oct 7, 2015, 11:34:33 AM (11 years ago)

Author:

eugene

Message:

moments set to arcsec-based units instead of pixels; definitions of M3 and M4 moments fixed

File:

• trunk/ippToPsps/jython/detectionbatch.py (modified) (4 diffs)

trunk/ippToPsps/jython/detectionbatch.py

@@ -194 +194 @@
         else: ccdID = 0
 
-        psfFwhmMajor = self.getKeyFloat(header, "%.8f", 'FWHM_MAJ')
-        psfFwhmMinor = self.getKeyFloat(header, "%.8f", 'FWHM_MIN')
+        # XXX hard-wired platescale : 0.257
+        pltscale = 0.257
+        pltscale2 = pltscale * pltscale
+
+        psfFwhmMajor = pltscale * self.getKeyFloat(header, "%.8f", 'FWHM_MAJ')
+        psfFwhmMinor = pltscale * self.getKeyFloat(header, "%.8f", 'FWHM_MIN')
         psfFwhm = 0.5*(float(psfFwhmMajor) + float(psfFwhmMinor))
 
@@ -204 +208 @@
         ast_cdy = self.getKeyFloat(header, "%.8f",'AST_CDY')
         astroscat = sqrt(ast_cdx^2 + ast_cdy^2)
-                        
         
         # insert image metadata into table
@@ -222 +225 @@
         sqlLine.group("numAstroRef",      self.getKeyValue(header, 'NASTRO'))
         sqlLine.group("numPhotoRef",      self.getKeyValue(header, 'NASTRO'))
-        sqlLine.group("nAxis1",               self.getKeyInt(header, 0, 'NAXIS1'))
-        sqlLine.group("nAxis2",               self.getKeyInt(header, 0, 'NAXIS2'))
+        sqlLine.group("nAxis1",           self.getKeyInt(header, 0, 'NAXIS1'))
+        sqlLine.group("nAxis2",           self.getKeyInt(header, 0, 'NAXIS2'))
         sqlLine.group("psfModelID"        psfmodelID)
         sqlLine.group("psfFwhm",          str(psfFwhm))
@@ -229 +232 @@
         sqlLine.group("psfWidMinor",      psfFwhmMinor)
         sqlLine.group("psfTheta",         self.getKeyFloat(header, "%.8f", 'ANGLE'))
-        sqlLine.group("momentMajor",      self.getKeyFloat(header, "%.8f", 'IQ_FW1'))
-        sqlLine.group("momentMinor",      self.getKeyFloat(header, "%.8f", 'IQ_FW2'))
-        sqlLine.group("momentM2C",        self.getKeyFloat(header, "%.8f", 'IQ_M2C'))
-        sqlLine.group("momentM2S",        self.getKeyFloat(header, "%.8f", 'IQ_M2S'))
-        sqlLine.group("momentM3",         self.getKeyFloat(header, "%.8f", 'IQ_M3'))
-        sqlLine.group("momentM4",         self.getKeyFloat(header, "%.8f", 'IQ_M4'))
+        sqlLine.group("momentMajor",      pltscale * self.getKeyFloat(header, "%.8f", 'IQ_FW1'))
+        sqlLine.group("momentMinor",      pltscale * self.getKeyFloat(header, "%.8f", 'IQ_FW2'))
+        sqlLine.group("momentM2C",        pltscale2 * self.getKeyFloat(header, "%.8f", 'IQ_M2C'))
+        sqlLine.group("momentM2S",        pltscale2 * self.getKeyFloat(header, "%.8f", 'IQ_M2S'))
+        sqlLine.group("momentM3",         pltscale2 * self.getKeyFloat(header, "%.8f", 'IQ_M3'))
+        sqlLine.group("momentM4",         pltscale2 * self.getKeyFloat(header, "%.8f", 'IQ_M4'))
         sqlLine.group("apResid",          self.getKeyFloat(header, "%.8f", 'APMIFIT'))
         sqlLine.group("dapResid",         self.getKeyFloat(header, "%.8f", 'DAPMIFIT'))