Changeset 38795 for trunk

Timestamp:

Oct 6, 2015, 3:42:48 PM (11 years ago)

Author:

watersc1

Message:

Fix nx/ny in imageMeta to be less confusing, and to have the full chip image size instead of just a single cell.

Location:

trunk/ippToPsps

Files:

• config/tables.P2.vot (modified) (1 diff)
• jython/detectionbatch.py (modified) (1 diff)

trunk/ippToPsps/config/tables.P2.vot

@@ -196 +196 @@
         <DESCRIPTION>Number of photometric reference sources.</DESCRIPTION>
       </FIELD>
-      <FIELD name="nx" arraysize="1" datatype="short" unit="pixels" default="-999">
+      <FIELD name="nAxis1" arraysize="1" datatype="short" unit="pixels" default="-999">
         <DESCRIPTION>Image dimension in x.</DESCRIPTION>
       </FIELD>
-      <FIELD name="ny" arraysize="1" datatype="short" unit="pixels" default="-999">
+      <FIELD name="nAxis2" arraysize="1" datatype="short" unit="pixels" default="-999">
         <DESCRIPTION>Image dimension in y.</DESCRIPTION>
       </FIELD>

trunk/ippToPsps/jython/detectionbatch.py

@@ -220 +220 @@
         sqlLine.group("numAstroRef",      self.getKeyValue(header, 'NASTRO'))
         sqlLine.group("numPhotoRef",      self.getKeyValue(header, 'NASTRO'))
-        sqlLine.group("nx",               self.getKeyInt(header, 0, 'CNAXIS1'))
-        sqlLine.group("ny",               self.getKeyInt(header, 0, 'CNAXIS2'))
+        sqlLine.group("nAxis1",               self.getKeyInt(header, 0, 'NAXIS1'))
+        sqlLine.group("nAxis2",               self.getKeyInt(header, 0, 'NAXIS2'))
         sqlLine.group("psfModelID"        psfmodelID)
         sqlLine.group("psfFwhm",          str(psfFwhm))