Changeset 38940

Timestamp:

Oct 22, 2015, 6:50:53 AM (11 years ago)

Author:

eugene

Message:

forcedwarp cannot get filter from header, has to get it from db; use a dictionary to return key/value pairs

Location:

trunk/ippToPsps/jython

Files:

• forcedwarpbatch.py (modified) (3 diffs)
• gpc1db.py (modified) (2 diffs)

trunk/ippToPsps/jython/forcedwarpbatch.py

@@ -107 +107 @@
            self.header[num] = self.fits[num].getPrimaryHeader()
            self.warpSkyFileID[num] = self.getKeyValue(self.header[num],"IMAGEID")
-           self.filterName[num] = self.getKeyValue(self.header[num],"FPA.FILTERID")
-           self.logger.infoPair("found filterName",self.filterName[num])
+
+           ## XXX: filter is not in the heade
+           ## self.filterName[num] = self.getKeyValue(self.header[num],"FPA.FILTERID")
+           ## self.logger.infoPair("found filterName",self.filterName[num])
+
            self.logger.infoPair("found warp_skyfile_id",self.warpSkyFileID[num])
 
            # get camera meta data from gpc1 database
-           # NOTE: this should all be in the header
-           meta ={}
+           # NOTE: this should all be in the header, but is not in at least some cases
            meta = self.gpc1Db.getForcedWarpStageMeta(forcedWarpID, self.warpSkyFileID[num])
 
@@ -120 +122 @@
                raise
 
-           self.expID[num] = meta[0]
-           self.expTime[num] = meta[1]
+           self.expID[num]       = meta['exp_id']
+           self.expTime[num]     = meta['exp_time']
+           self.filterName[num]  = meta['filter']
+           self.skycellName[num] = meta['skycell_id']
+           self.tessName[num]    = meta['tess_id']
+       
            # This isn't populated in the database (it's NULL).  The hack is below.
            # self.analysisVer[num] = meta[2]
-           self.skycellName[num] = meta[3]
-           self.tessName[num] = meta[4]
-       
-           self.logger.infoPair("found exp_id",str(self.expID[num]))
-           self.logger.infoPair("found exp_time",str(self.expTime[num]))
-           self.logger.infoPair("found skycell_id",self.skycellName[num])
-           self.logger.infoPair("found tess_id",self.tessName[num])
+
+           self.logger.infoPair("found exp_id",     str(self.expID[num]))
+           self.logger.infoPair("found exp_time",   str(self.expTime[num]))
+           self.logger.infoPair("found filter",     str(self.filterNam[num]))
+           self.logger.infoPair("found skycell_id", self.skycellName[num])
+           self.logger.infoPair("found tess_id",    self.tessName[num])
 
            self.tessID[num] = self.scratchDb.getTessID(self.tessName[num])
@@ -237 +242 @@
         header   = self.header[num]
         self.logger.infoPair("found header","ok")
-        photoCalID = str(self.scratchDb.getPhotoCalID(header['IMAGEID']))       
+
+        # photoCalID = str(self.scratchDb.getPhotoCalID(header['IMAGEID']))       
+
+        # XXX fix this:
+        photoCalID = GPC1.filtername.ForcedWarp
 
         # XXX hard-wired platescale : 0.25

trunk/ippToPsps/jython/gpc1db.py

@@ -388 +388 @@
         self.logger.debug("Querying GPC1 for forced warp meta data")
 
-        meta = []
+        meta = {}
 
         sql = "SELECT \
                exp_id, \
                exp_time, \
+               filter,
                fullForceResult.software_ver, \
                skycell_id, \
@@ -415 +416 @@
 
         try:
-            meta.append(rs.getString(1))
-            meta.append(rs.getString(2))
-            meta.append(rs.getString(3))
-            meta.append(rs.getString(4))
-            meta.append(rs.getString(5))
-
-        except:
-            self.logger.errorPair("getForcedWarpStageMeta()", "empty meta data")
+            meta['exp_id']       = rs.getString(1)
+            meta['exp_time']     = rs.getString(2)
+            meta['filter']       = rs.getString(3)
+            meta['software_ver'] = rs.getString(4)
+            meta['skycell_id']   = rs.getString(5)
+            meta['tess_id']      = rs.getString(6)
+        except:
+            self.logger.errorPair("getForcedWarpStageMeta()", "missing metadata entry")
 
         return meta
-
-
 
     '''