Changeset 39071 for trunk

Timestamp:

Nov 7, 2015, 2:40:16 AM (11 years ago)

Author:

mhuber

Message:

adding more to DiffMeta (untested until keyword added in sim set)

Location:

trunk/ippToPsps

Files:

• config/tables.DF.vot (modified) (1 diff)
• jython/diffbatch.py (modified) (4 diffs)

trunk/ippToPsps/config/tables.DF.vot

@@ -56 +56 @@
       <FIELD name="expTime" arraysize="1" datatype="float" unit="seconds" default="-999">
         <DESCRIPTION>Exposure time of positive image.</DESCRIPTION>
+      </FIELD>
+      <FIELD name="psfModelID" arraysize="1" datatype="int" unit="dimensionless" default="-999">
+        <DESCRIPTION>PSF model identifier.</DESCRIPTION>
+      </FIELD>
+      <FIELD name="psfFWHM" arraysize="1" datatype="float" unit="arcsec" default="-999">
+        <DESCRIPTION>Mean PSF full width at half maximum at image center.</DESCRIPTION>
+      </FIELD>
+      <FIELD name="psfWidMajor" arraysize="1" datatype="float" unit="arcsec" default="-999">
+        <DESCRIPTION>PSF major axis FWHM at image center.</DESCRIPTION>
+      </FIELD>
+      <FIELD name="psfWidMinor" arraysize="1" datatype="float" unit="arcsec" default="-999">
+        <DESCRIPTION>PSF minor axis FWHM at image center.</DESCRIPTION>
+      </FIELD>
+      <FIELD name="psfTheta" arraysize="1" datatype="float" unit="degrees" default="-999">
+        <DESCRIPTION>PSF major axis orientation at image center.</DESCRIPTION>
+      </FIELD>
+      <FIELD name="numStamps" arraysize="1" datatype="int" unit="dimensionless" default="-999">
+        <DESCRIPTION>Number of stamps.</DESCRIPTION>
+      </FIELD>
+      <FIELD name="stampDevMean" arraysize="1" datatype="float" unit="dimensionless" default="-999">
+        <DESCRIPTION>Mean stamp deviation.</DESCRIPTION>
+      </FIELD>
+      <FIELD name="stampDevRMS" arraysize="1" datatype="float" unit="dimensionless" default="-999">
+        <DESCRIPTION>RMS stamp deviation.</DESCRIPTION>
+      </FIELD>
+      <FIELD name="normalization" arraysize="1" datatype="float" unit="dimensionless" default="-999">
+        <DESCRIPTION>Normalization.</DESCRIPTION>
+      </FIELD>
+      <FIELD name="convolveMax" arraysize="1" datatype="float" unit="dimensionless" default="-999">
+        <DESCRIPTION>Maxiumum convolution fraction.</DESCRIPTION>
+      </FIELD>
+      <FIELD name="deconvolveMax" arraysize="1" datatype="float" unit="dimensionless" default="-999">
+        <DESCRIPTION>Maximum deconvolution fraction.</DESCRIPTION>
       </FIELD>
       <FIELD name="ctype1" arraysize="100" datatype="char" unit="dimensionless" default="">

trunk/ippToPsps/jython/diffbatch.py

@@ -84 +84 @@
        self.projectionID ={}
        self.expID ={}
-
+       self.psfModelID = {}
+       self.psfFWHM = {}
+       self.psfFwhmMajor = {}
+       self.psfFwhmMinor = {}
+       
        # number is special - it is simply a list of diff skyfile IDs, used for
        # looping over things
@@ -168 +172 @@
            self.md5sum[num] = self.posFits[num].getMd5sum()
 
+           ## MEH adding psfFWHM info from header
+           ## -- XXX hard-wired platescale : 0.25
+           pltscale = 0.25
+           self.psfFwhmMajor[num] = pltscale * self.getKeyFloat(self.header[num], "%.8f", 'FWHM_MAJ')
+           self.psfFwhmMinor[num] = pltscale * self.getKeyFloat(self.header[num], "%.8f", 'FWHM_MIN')
+           self.psfFWHM[num] = 0.5*(self.psfFwhmMajor[num] + self.psfFwhmMinor[num])
+
+           self.psfmodel_name[num]    = self.getKeyValue(self.header[num], 'PSFMODEL')
+           self.psfmodelID[num]  = self.scratchDb.getFitModelID(self.psfmodel_name[num])
+
+
            # drop the existing tables    
 
@@ -218 +233 @@
         sqlLine.group("negImageID",            self.negImageID[num]);
         sqlLine.group("ippDiffID",             self.ippDiffID[num]);
-
-        ## MEH adding projectionID -- want str for pre-0 in both? 
         sqlLine.group("projectionID",          str(self.projectionID[num]))
         sqlLine.group("skycellID",             str(self.skycellID[num]))
@@ -226 +239 @@
         sqlLine.group("md5sum",                str(self.md5sum[num]))
         sqlLine.group("expTime",               self.expTime[num]);
+        sqlLine.group("psfModelID",            self.psfmodelID[num])
+        sqlLine.group("psfFWHM",               self.psfFWHM[num])
+        sqlLine.group("psfWidMajor",           self.psfFwhmMajor[num])
+        sqlLine.group("psfWidMinor",           self.psfFwhmMinor[num])
+        sqlLine.group("psfTheta",              self.getKeyFloat(header, "%.8f", 'ANGLE'))
+        sqlLine.group("numStamps",             self.getKeyValue(self.header[num], 'SUBTRACTION.STAMPS'))
+        sqlLine.group("stampDevMean",          self.getKeyFloat(self.header[num], "%.8e", 'SUBTRACTION.DEV.MEAN'))
+        sqlLine.group("stampDevRMS",           self.getKeyFloat(self.header[num], "%.8e", 'SUBTRACTION.DEV.RMS'))
+        sqlLine.group("normalization",         self.getKeyFloat(self.header[num], "%.8e", 'SUBTRACTION.NORM'))
+        sqlLine.group("convolveMax",           self.getKeyFloat(self.header[num], "%.8e", 'SUBTRACTION.CONV.MAX'))
+        sqlLine.group("deconvolveMax",         self.getKeyFloat(self.header[num], "%.8e", 'SUBTRACTION.DECONV.MAX'))
         sqlLine.group("ctype1",                self.getKeyValue(self.header[num], 'CTYPE1'));
         sqlLine.group("ctype2",                self.getKeyValue(self.header[num], 'CTYPE2'));