Changeset 38794

Timestamp:

Oct 6, 2015, 3:38:02 PM (11 years ago)

Author:

watersc1

Message:

Fix psfModelID type issue in ForcedWarpMeta/StackMeta, and implement psfModelID for ImageMeta. Added getFitModelID function to do the conversion of string to int.

Location:

trunk/ippToPsps

Files:

• config/tables.FW.vot (modified) (1 diff)
• config/tables.ST.vot (modified) (1 diff)
• jython/detectionbatch.py (modified) (2 diffs)
• jython/forcedwarpbatch.py (modified) (2 diffs)
• jython/scratchdb.py (modified) (1 diff)
• jython/stackbatch.py (modified) (2 diffs)

trunk/ippToPsps/config/tables.FW.vot

@@ -45 +45 @@
         <DESCRIPTION>Number of photometric reference sources.</DESCRIPTION>
       </FIELD>
-      <FIELD name="psfModelID" arraysize="100" datatype="char" unit="dimensionless" default="">
+      <FIELD name="psfModelID" arraysize="100" datatype="int" unit="dimensionless" default="-999">
         <DESCRIPTION>PSF model identifier.</DESCRIPTION>
       </FIELD>

trunk/ippToPsps/config/tables.ST.vot

@@ -59 +59 @@
         <DESCRIPTION>Number of photometric reference sources.</DESCRIPTION>
       </FIELD>
-      <FIELD name="psfModelID" arraysize="100" datatype="char" unit="dimensionless" default="">
+      <FIELD name="psfModelID" arraysize="100" datatype="int" unit="dimensionless" default="-999">
         <DESCRIPTION>PSF model identifier.</DESCRIPTION>
       </FIELD>

trunk/ippToPsps/jython/detectionbatch.py

@@ -198 +198 @@
         psfFwhm = 0.5*(float(psfFwhmMajor) + float(psfFwhmMinor))
 
+        psfmodel_name = self.getKeyValue(header, 'PSFMODEL')
+        psfmodelID    = self.scratchDb.getFitModelID(psfmodel_name)
+
         ast_cdx = self.getKeyFloat(header, "%.8f",'AST_CDX')
         ast_cdy = self.getKeyFloat(header, "%.8f",'AST_CDY')
@@ -219 +222 @@
         sqlLine.group("nx",               self.getKeyInt(header, 0, 'CNAXIS1'))
         sqlLine.group("ny",               self.getKeyInt(header, 0, 'CNAXIS2'))
+        sqlLine.group("psfModelID"        psfmodelID)
         sqlLine.group("psfFwhm",          str(psfFwhm))
         sqlLine.group("psfWidMajor",      psfFwhmMajor)

trunk/ippToPsps/jython/forcedwarpbatch.py

@@ -224 +224 @@
 #        photoCalID = str(self.scratchDb.getPhotoCalID(forcedWarpID))       
 
+        psfmodel_name = self.getKeyValue(header, 'PSFMODEL')
+        psfmodelID    = self.scratchDb.getFitModelID(psfmodel_name)
+
         sqlLine = sqlUtility("INSERT INTO ForcedWarpMeta_"+forcedWarpID+" (")
         #batchID (below)
@@ -249 +252 @@
 #        sqlLine.group("nAstroRef",      self.getKeyValue(header, 'NASTRO'))
 #        sqlLine.group("nPhotoRef",      self.getKeyValue(header, 'NASTRO'))
-        sqlLine.group("psfModelID",     self.getKeyValue(header, 'PSFMODEL'))
+        sqlLine.group("psfModelID",     psfmodelID)
         sqlLine.group("psfFwhm_mean",   self.getKeyFloat(header, "%.8f", 'FWHM_MAJ'))
         sqlLine.group("psfFwhm_max",    self.getKeyFloat(header, "%.8f", 'FW_MJ_UQ'))

trunk/ippToPsps/jython/scratchdb.py

@@ -130 +130 @@
 
         return filterID
+
+    '''
+    Get the fitModelID from FitModel table based on model name
+    '''
+    def getFitModelID(self, name):
+        
+        sql = "SELECT fitModelID FROM FitModel WHERE name = '" + name + "'"
+        try:
+            rs = self.executeQuery(sql)
+            rs.first()
+            fitModelID = rs.getInt(1)
+        except:
+            self.logger.errorPair("No fitModelID found for model name", name)
+            fitModelID = -1
+
+        return fitModelID
 
     '''

trunk/ippToPsps/jython/stackbatch.py

@@ -225 +225 @@
         fwhm_maj    = self.getKeyFloat(header, "%.8f", 'FWHM_MAJ')
         fwhm_maj_uq = self.getKeyFloat(header, "%.8f", 'FW_MJ_UQ')
-        psfmodel    = self.getKeyValue(header, 'PSFMODEL')
+        psfmodel_name    = self.getKeyValue(header, 'PSFMODEL')
+        psfmodelID  = self.scratchDb.getFitModelID(psfmodel_name)
 
         ast_cdx = self.getKeyFloat(header, "%.8f",'AST_CDX')
@@ -259 +260 @@
         sqlLine.group("completMag",       self.getKeyFloat(header, "%.8f", 'FLIMIT'))
         sqlLine.group("expTime",       self.getKeyFloat(header, "%.5f", 'EXPTIME'))  
-        sqlLine.group("psfModelID",    psfmodel)           
+        sqlLine.group("psfModelID",    psfmodelID)           
         sqlLine.group("psfFwhm_mean",  fwhm_maj)      
         sqlLine.group("psfFwhm_max",   fwhm_maj_uq)