Changeset 37204 for branches/eam_branches/ipp-20140717/ippToPsps/jython/detectionbatch.py

Timestamp:

Aug 7, 2014, 2:27:23 PM (12 years ago)

Author:

eugene

Message:

only select Chip detections for simtest camera; only use XYnn for gpc1; fix insert for objects

File:

• branches/eam_branches/ipp-20140717/ippToPsps/jython/detectionbatch.py (modified) (2 diffs)

branches/eam_branches/ipp-20140717/ippToPsps/jython/detectionbatch.py

@@ -257 +257 @@
         sqlLine.group("pc002002",         self.getKeyValue(header, 'PC002002'))
         sqlLine.group("polyOrder",        self.getKeyValue(header, 'NPLYTERM'))
-        sqlLine.group("pca1x3y0",         self.getKeyValue(header, 'PCA1X3Y0'))
-        sqlLine.group("pca1x2y1",         self.getKeyValue(header, 'PCA1X2Y1'))
-        sqlLine.group("pca1x1y2",         self.getKeyValue(header, 'PCA1X1Y2'))
-        sqlLine.group("pca1x0y3",         self.getKeyValue(header, 'PCA1X0Y3'))
-        sqlLine.group("pca1x2y0",         self.getKeyValue(header, 'PCA1X2Y0'))
-        sqlLine.group("pca1x1y1",         self.getKeyValue(header, 'PCA1X1Y1'))
-        sqlLine.group("pca1x0y2",         self.getKeyValue(header, 'PCA1X0Y2'))
-        sqlLine.group("pca2x3y0",         self.getKeyValue(header, 'PCA2X3Y0'))
-        sqlLine.group("pca2x2y1",         self.getKeyValue(header, 'PCA2X2Y1'))
-        sqlLine.group("pca2x1y2",         self.getKeyValue(header, 'PCA2X1Y2'))
-        sqlLine.group("pca2x0y3",         self.getKeyValue(header, 'PCA2X0Y3'))
-        sqlLine.group("pca2x2y0",         self.getKeyValue(header, 'PCA2X2Y0'))
-        sqlLine.group("pca2x1y1",         self.getKeyValue(header, 'PCA2X1Y1'))
-        sqlLine.group("pca2x0y2",         self.getKeyValue(header, 'PCA2X0Y2'))
+
+        nPolyterm = int(self.getKeyValue(header, 'NPLYTERM'))
+        if nPolyterm > 1:
+            sqlLine.group("pca1x2y0",         self.getKeyValue(header, 'PCA1X2Y0'))
+            sqlLine.group("pca1x1y1",         self.getKeyValue(header, 'PCA1X1Y1'))
+            sqlLine.group("pca1x0y2",         self.getKeyValue(header, 'PCA1X0Y2'))
+            sqlLine.group("pca2x2y0",         self.getKeyValue(header, 'PCA2X2Y0'))
+            sqlLine.group("pca2x1y1",         self.getKeyValue(header, 'PCA2X1Y1'))
+            sqlLine.group("pca2x0y2",         self.getKeyValue(header, 'PCA2X0Y2'))
+        else:
+            sqlLine.group("pca1x2y0",         "-999")
+            sqlLine.group("pca1x1y1",         "-999")
+            sqlLine.group("pca1x0y2",         "-999")
+            sqlLine.group("pca2x2y0",         "-999")
+            sqlLine.group("pca2x1y1",         "-999")
+            sqlLine.group("pca2x0y2",         "-999")
+            
+        if nPolyterm > 2:
+            sqlLine.group("pca1x3y0",         self.getKeyValue(header, 'PCA1X3Y0'))
+            sqlLine.group("pca1x2y1",         self.getKeyValue(header, 'PCA1X2Y1'))
+            sqlLine.group("pca1x1y2",         self.getKeyValue(header, 'PCA1X1Y2'))
+            sqlLine.group("pca1x0y3",         self.getKeyValue(header, 'PCA1X0Y3'))
+            sqlLine.group("pca2x3y0",         self.getKeyValue(header, 'PCA2X3Y0'))
+            sqlLine.group("pca2x2y1",         self.getKeyValue(header, 'PCA2X2Y1'))
+            sqlLine.group("pca2x1y2",         self.getKeyValue(header, 'PCA2X1Y2'))
+            sqlLine.group("pca2x0y3",         self.getKeyValue(header, 'PCA2X0Y3'))
+        else:
+            sqlLine.group("pca1x3y0",         "-999")
+            sqlLine.group("pca1x2y1",         "-999")
+            sqlLine.group("pca1x1y2",         "-999")
+            sqlLine.group("pca1x0y3",         "-999")
+            sqlLine.group("pca2x3y0",         "-999")
+            sqlLine.group("pca2x2y1",         "-999")
+            sqlLine.group("pca2x1y2",         "-999")
+            sqlLine.group("pca2x0y3",         "-999")
 
         sql = sqlLine.make(") VALUES ( ", ")")
@@ -491 +512 @@
         self.logger.infoPair("Reading", "FITS headers")
         self.logger.infoPair("Populating table", "ImageMeta")
-        for x in range(self.startX, self.endX):
-            for y in range(self.startY, self.endY):
-               
-                # dodge the corners
-                if x==0 and y==0: continue
-                if x==0 and y==7: continue
-                if x==7 and y==0: continue
-                if x==7 and y==7: continue
-
-                ota = "XY%d%d" % (x, y)
+
+        if self.config.camera == "gpc1":
+            for x in range(self.startX, self.endX):
+                for y in range(self.startY, self.endY):
+                    
+                    # dodge the corners
+                    if x==0 and y==0: continue
+                    if x==0 and y==7: continue
+                    if x==7 and y==0: continue
+                    if x==7 and y==7: continue
+                    
+                    ota = "XY%d%d" % (x, y)
                 
-                self.alterPspsTablesChip(ota, ota + ".hdr", x, y)
-
-        # try the test Chip
-        self.alterPspsTablesChip("Chip", "Chip.hdr", 0, 0)
+                    self.alterPspsTablesChip(ota, ota + ".hdr", x, y)
+
+        if self.config.camera == "simtest":
+            # try the test Chip
+            self.alterPspsTablesChip("Chip", "Chip.hdr", 0, 0)
 
         # now run DVO code to get all IDs ( XXX deprecated, uses dvograbber)