Changeset 39170 for trunk

Timestamp:

Nov 20, 2015, 2:53:37 PM (11 years ago)

Author:

eugene

Message:

adjust inv cmf IPP_IDET by value depending on [num]

Location:

trunk/ippToPsps/jython

Files:

• diffbatch.py (modified) (4 diffs)
• scratchdb.py (modified) (1 diff)

trunk/ippToPsps/jython/diffbatch.py

@@ -336 +336 @@
         else:
             fluxScaleStr = "-1"
-            detIDoffset = self.posImageDetCount
+            detIDoffset = self.posImageDetCount[num]
 
         if isPosFile or self.haveNegFits[num]:
@@ -723 +723 @@
         self.haveSrcPos = {}
         self.haveNegFits = {}
-        self.posImageDetCount = 0
+        self.posImageDetCount = {}
 
         for num in self.number:
@@ -742 +742 @@
             ## if we have a negative image (inv.cmf), load that as well:
             self.haveNegFits[num] = 0
+            self.posImageDetCount[num] = 0
             if not self.negFits[num] == None:
                 fileNameNeg = self.negFits[num].getPath()
@@ -759 +760 @@
 
                 posTableName = "SkyChip_psf_" + str(num)
-                self.posImageDetCount = self.scratchDb.getRowCount(posTableName)
+                # self.posImageDetCount[num] = self.scratchDb.getMaxIPP_IDET(posTableName)
+                self.posImageDetCount[num] = self.scratchDb.getRowCount(posTableName)
 
             ## use stilts to get a list of the tables from the header

trunk/ippToPsps/jython/scratchdb.py

@@ -406 +406 @@
 
         return size
+
+    '''
+    Returns a row count for this table
+    '''
+    def getMaxIPP_IDET(self, table):
+
+        sql = "SELECT MAX(IPP_IDET) FROM " + table
+        rs = self.executeQuery(sql)  
+
+        if not rs.first():
+            self.logger.exception("Could not count rows for table: '" + table + "'")
+            return 0
+
+        return rs.getInt(1)
 
     '''