Changeset 39101 for trunk

Timestamp:

Nov 10, 2015, 5:29:57 PM (11 years ago)

Author:

watersc1

Message:

Commenting out deteff changes that require working code to read a named header.

Location:

trunk/ippToPsps/jython

Files:

• detectionbatch.py (modified) (1 diff)
• diffbatch.py (modified) (1 diff)
• stackbatch.py (modified) (2 diffs)

trunk/ippToPsps/jython/detectionbatch.py

@@ -372 +372 @@
         sqlLine = sqlUtility("INSERT INTO " + tableName + "(")
 
+        # CZW: 20151110 This needs to get the deteff header as well.
         nInjected = int(self.getKeyInt(header, 0, 'DETEFF.NUM'))
         detectionThreshold = self.getKeyFloat(header, "%.8f", 'DETEFF.MAGREF')

trunk/ippToPsps/jython/diffbatch.py

@@ -513 +513 @@
             self.logger.infoPair("CZW If this value for the zeropoint is zero, the getImageZeroPoint call is likely still broken", str(zpImage))
 
-
-        deteffHeader = self.posFits[num].findAndReadHeader("SkyChip.deteff", self.config.test)
-        if not deteffHeader:
-            if self.config.test: self.logger.errorPair("No header found for Skychip.deteff for", filter)
-            return False
-
+# CZW 20151110 This is broken due to findAndReadHeader being broken.
+#        deteffHeader = self.posFits[num].findAndReadHeader("SkyChip.deteff", self.config.test)
+#        if not deteffHeader:
+#            if self.config.test: self.logger.errorPair("No header found for Skychip.deteff for", filter)
+#            return False
+# This next line is a work around.
+        
+        deteffHeader = header
         magref = self.getKeyFloat(deteffHeader,"%.8f","DETEFF.MAGREF") + zpImage + 2.5 * math.log10(expTime)
         self.logger.infoPair("Found zeropoint and set magref", str(magref))

trunk/ippToPsps/jython/stackbatch.py

@@ -269 +269 @@
         # Convert detectionThreshold to appropriate magnitudes
         # Grab this from the appropriate extension.
-        deteffHeader = self.fits[filter].findAndReadHeader("SkyChip.deteff", self.config.test)
-        if not deteffHeader:
-            if self.config.test: self.logger.errorPair("No header found for Skychip.deteff for", filter)
-            return False
-
+
+# CZW 20151110 This is broken.
+#        deteffHeader = self.fits[filter].findAndReadHeader("SkyChip.deteff", self.config.test)
+#        if not deteffHeader:
+#            if self.config.test: self.logger.errorPair("No header found for Skychip.deteff for", filter)
+#            return False
+# CZW This is the workaround
+
+        deteffHeader = header
         detectionThreshold = self.getKeyFloat(deteffHeader, "%.8f", 'DETEFF.MAGREF')
         expTime = self.getKeyFloat(header, "%.8f", 'EXPTIME')
@@ -1184 +1188 @@
             # Convert detectionThreshold to appropriate magnitudes
             # Grab this from the appropriate extension.
-            deteffHeader = self.fits[filter].findAndReadHeader("SkyChip.deteff", self.config.test)
-            if not deteffHeader:
-                if self.config.test: self.logger.errorPair("No header found for Skychip.deteff for", filter)
-                return False
-
+# CZW 20151110 This is broken.
+#            deteffHeader = self.fits[filter].findAndReadHeader("SkyChip.deteff", self.config.test)
+#            if not deteffHeader:
+#                if self.config.test: self.logger.errorPair("No header found for Skychip.deteff for", filter)
+#                return False
+# CZW This is the workaround
+            
+            deteffHeader = header
             detectionThreshold = self.getKeyFloat(deteffHeader, "%.8f", 'DETEFF.MAGREF')
             expTime = self.getKeyFloat(header, "%.8f", 'EXPTIME')