Changeset 39224 for branches/eam_branches/ipp-20151113/ippToPsps/jython/diffbatch.py

Timestamp:

Dec 3, 2015, 4:14:24 PM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20151113

Files:

• . (modified) (1 prop)
• ippToPsps (modified) (1 prop)
• ippToPsps/jython/diffbatch.py (modified) (5 diffs)

branches/eam_branches/ipp-20151113/ippToPsps

@@ -14 +14 @@
 install-sh
 Doxyfile
+compile

@@ -14 +14 @@
 install-sh
 Doxyfile
+compile

branches/eam_branches/ipp-20151113/ippToPsps/jython/diffbatch.py

@@ -141 +141 @@
 
            # look up the path base once
-           pathBase = gpc1Db.getDiffStagePathBase(skychunk.dvoLabel, int(diffSkyFileID))
+           pathBase = gpc1Db.getDiffStagePathBase(int(diffSkyFileID))
 
            # select the two (possible) cmf files (.cmf and .inv.cmf)
@@ -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

@@ -14 +14 @@
 install-sh
 Doxyfile
+compile