Changeset 36725

Timestamp:

May 2, 2014, 11:40:43 AM (12 years ago)

Author:

heather

Message:

stackObject / stackMeta changes

File:

• trunk/ippToPsps/jython/stackbatch.py (modified) (6 diffs)

trunk/ippToPsps/jython/stackbatch.py

@@ -526 +526 @@
         # this should work : set header into (grizy)header and run from there
         if filterName == 'g.00000':
+            f = 'g'
             self.header = self.gheader
             tablename = 'gStackMeta'
             stackmetaid = self.gstackID
         if filterName == 'r.00000':
+            f = 'r'
             tablename = 'rStackMeta'
             self.header = self.rheader
             stackmetaid = self.rstackID
         if filterName == 'i.00000':
+            f = 'i'
             tablename = 'iStackMeta'
             self.header = self.iheader
             stackmetaid = self.istackID
         if filterName == 'z.00000':
+            f = 'z'
             tablename = 'zStackMeta'
             self.header = self.zheader
             stackmetaid = self.zstackID
         if filterName == 'y.00000':
+            f = 'y'
             tablename = 'yStackMeta'
             self.header = self.yheader
@@ -563 +568 @@
 
         sql = "INSERT INTO " + tablename + " (\
-        stackMetaID \
+        "+f+"stackMetaID \
         ,skyCellID \
         ,photoCalID \
@@ -590 +595 @@
         ," + self.header['EXPTIME'] + " \
         ,'" + self.psfmodel   + "' \
-        ," + str(self.fwhm_maj)    + " \
-        ," + str(self.fwhm_maj_uq) + " \
+        ," + str(self.header['FWHM_MAJ'])    + " \
+        ," + str(self.header['FW_MAJ_UQ']) + " \
         ,'" + self.header['CTYPE1'] + "' \
         ,'" + self.header['CTYPE2'] + "' \
@@ -646 +651 @@
 
         self.logger.infoPair("inserting filter dependent cmf items into", "StackObject")
-
+        filters = ['g','r','i','z','y']
         for f in filters:
           skip = 0
@@ -674 +679 @@
                   skip = 1
           if (f == "y"):
-              if self.ystackID > 0
+              if self.ystackID > 0:
                   stackid = self.ystackID
-                  exptime = self.yheader['EXPTIME']:
+                  exptime = self.yheader['EXPTIME']
               else:
                   skip = 1
@@ -1277 +1282 @@
             ##return False
         self.infoPair("finishing","populatePspsTables"); 
+        raise
         return True