Changeset 39922 for branches/czw_branch/20160809/ippToPsps/jython/stackbatch.py

Timestamp:

Jan 6, 2017, 11:16:30 AM (10 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/czw_branch/20160809/ippToPsps/jython/stackbatch.py (modified) (7 diffs)

branches/czw_branch/20160809/ippToPsps/jython/stackbatch.py

@@ -129 +129 @@
            self.zpImage[filter] = self.getKeyFloat(header, "%.8f", 'ZPT_OBS')
            self.zpError[filter] = self.getKeyFloat(header, "%.8f", 'ZPT_ERR')
-
-           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
-
-           self.magref[filter] = self.getKeyFloat(deteffHeader, "%.8f", 'DETEFF.MAGREF')
-           self.nInjected[filter] = int(self.getKeyInt(deteffHeader, 0, 'DETEFF.NUM'))
+           hasdeteff = 1           
+           try: deteffHeader = self.fits[filter].findAndReadHeader("SkyChip.deteff", self.config.test)
+           except:
+               hasdeteff = 0
+           #if not deteffHeader:
+           #    if self.config.test: self.logger.errorPair("No header found for Skychip.deteff for", filter)
+           #    return False
+               
+           if hasdeteff == 1:          
+               self.magref[filter] = self.getKeyFloat(deteffHeader, "%.8f", 'DETEFF.MAGREF')
+               self.nInjected[filter] = int(self.getKeyInt(deteffHeader, 0, 'DETEFF.NUM'))
 
            ## MEH -- md5sum test
@@ -733 +736 @@
         # sersic fit has an extra parameter
         if (ippModelType == "PS_MODEL_SERSIC"):
-            sqlLine.group("a." + filter + model + "Nu",    "1 / (2.0 * b.EXT_PAR_07)")
-            sqlLine.group("a." + filter + model + "NuErr", "'0.1'") # this is not measured at the moment
+            testSQL = 'show columns FROM rSkyChip_xfit LIKE "EXT_PAR_07"'
+            have_ext_par_07 = 1
+            try:
+                rs = self.scratchDb.execute(sql)
+            except:
+                have_ext_par_07 = 0
+            if have_ext_par_07 == 1:
+                sqlLine.group("a." + filter + model + "Nu",    "1 / (2.0 * b.EXT_PAR_07)")
+                sqlLine.group("a." + filter + model + "NuErr", "'0.1'") # this is not measured at the moment
+
+            ### I think, if ippModelType = PS_MODEL_SERSIC, and EXT_PAR_07 does not exist, then Nu, Nerr = null
+            
 
         # missing these two fields?
@@ -1170 +1183 @@
                 # search the words for the o....g....o part
                 for j in range(len(words)):
-                    match = re.search('o\d\d\d\dg\d\d\d\d\o', words[j])
-                    if (match != None):
+                    match1 = re.search('^\d\d\d\dg\d\d\d\d\o', words[j]) #remove leading  o: then ones with borked no os and cs will work now 
+                    match2 = re.search('\o\d\d\d\dg\d\d\d\d\o', words[j]) #remove leading  o: then ones with borked no os and cs will work now 
+                    match3 = re.search('\c\d\d\d\dg\d\d\d\d\o', words[j]) #remove leading  o: then ones with borked no os and cs will work now 
+                    if (match1 != None):
                         ogo=j
+                        ogoname = 'o'+words[ogo]
+                        break
+                    if (match2 != None):
+                        ogo=j
+                        ogoname = words[ogo]
+                        break
+                    if (match3 != None):
+                        ogo=j
+                        ogoname = words[ogo]
                         break
                     # did we find it? if so, are there are least 2 more elements past the ogo?
@@ -1178 +1202 @@
 
                 if ogo > -1:
-                    if (ogo +1) < len(words):
+                    if (ogo +2) < len(words): #this was the mistake before
                         # there is a o....g....o element, and the next 2 exist
                         frameID = words[ogo+1]
                         
-                    else: 
-                        self.logger.infoPair("unable to find exp_id from", inputName)
-                        raise
+                    else:
+                        #ogoname = "o"+words[ogo]
+                        try: frameID = self.gpc1Db.getExpIdFromExpName(ogoname)
+                        except:
+                            self.logger.error("cant get expid")
+                            raise
+                        
+#                        frameID = str(rs.getInt(1))
+        
+#                        self.logger.infoPair("unable to find exp_id from", inputName)
+#                        raise
                         # and then raise an error and stop the program. I expect this to mostly work fine
         # for the extra long label (?) - can probably get it from just the o g o (if exp_id
@@ -1216 +1248 @@
 
         self.tablesToExport.append("StackToFrame")
+        return True
 
     ''' 
@@ -1496 +1529 @@
             if self.stackIDs[filter] > 0:        
                 self.populateStackMeta(filter)
-
+                
         self.populateStackObjectThin()
 
@@ -1529 +1562 @@
         self.logger.infoPair("populating","StackToImage") 
         self.populateStackToImage()
-        
+       
+ 
+       
         self.logger.infoPair("populating","StackToFrame") 
-        self.populateStackToFrame()
-        
+
+#        self.populateStackToFrame()
+        if not self.populateStackToFrame():
+                    self.logger.errorPair("can't populate"," stack to frame")
+                    return False
+        self.logger.infoPair("removing frameID"," duplicates")
+        self.scratchDb.execute("ALTER IGNORE TABLE StackToFrame ADD UNIQUE INDEX(frameID)")
+
         self.setMinMaxObjID(["StackObjectThin"])