Changeset 38806

Timestamp:

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

Author:

watersc1

Message:

Fix analysisVer issues in forced warp and diff batches.

Location:

trunk/ippToPsps/jython

Files:

• diffbatch.py (modified) (4 diffs)
• forcedwarpbatch.py (modified) (3 diffs)

trunk/ippToPsps/jython/diffbatch.py

@@ -72 +72 @@
        self.negImageID = {}
        self.skycellName = {}
-       self.analVer = {}
+       self.analysisVer = {}
        self.expTime = {}
        self.obsTime = {}
@@ -114 +114 @@
            self.negImageID[num] = meta[3];
            self.skycellName[num] = meta[4];
-           self.analVer[num] =  meta[5];
+           self.analysisVer[num] =  meta[5];
            self.expTime[num] = meta[6];
            self.obsTime[num] = meta[7];
@@ -152 +152 @@
            self.dropTableVerbose("DiffDetection_"+str(num))
 
-           if not self.analVer[num]: self.analVer[num] = -999
+           if not self.analysisVer[num]: self.analysisVer[num] = -999
            self.logger.infoPair("getPhotoCalID",diffSkyFileID)
            self.photoCalID[num] = str(self.scratchDb.getPhotoCalID(int(diffSkyFileID)))
@@ -211 +211 @@
         sqlLine.group("skycellID",             self.skycellID[num]);
         sqlLine.group("photoCalID",            self.photoCalID[num]);
-        sqlLine.group("analVer",               str(self.analVer[num]));
+        sqlLine.group("analysisVer",           str(self.analysisVer[num]));
         sqlLine.group("expTime",               self.expTime[num]);
         sqlLine.group("ctype1",                self.getKeyValue(self.header[num], 'CTYPE1'));

trunk/ippToPsps/jython/forcedwarpbatch.py

@@ -111 +111 @@
            self.expID[num] = meta[0]
            self.expTime[num] = meta[1]
-           self.analysisVer[num] = meta[2]
+# 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]
@@ -123 +124 @@
        #tessName = self.getKeyValue(self.header, 'TESS_ID')
        #self.tessID = self.scratchDb.getTessID(tessName)
+
+           # As the database doesn't have the software_ver entry, pull the photometry version as the analysis version.
+           self.analysisVer[num] = self.getKeyValue(self.header[num],"PHOT_V")
 
            if not self.analysisVer[num]: self.analysisVer[num] = -999
@@ -241 +245 @@
       
 #        self.logger.infoPair("building sql ","3")
-        sqlLine.group("analVer",           str(self.analysisVer[num]))
+        sqlLine.group("analysisVer",           str(self.analysisVer[num]))
  #       self.logger.infoPair("building sql ","3")