Changeset 37801 for branches/eam_branches/ipp-20140904/ippToPsps/jython/detectionbatch.py

Timestamp:

Jan 11, 2015, 1:31:50 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20140904/ippToPsps/jython/detectionbatch.py (modified) (4 diffs)

branches/eam_branches/ipp-20140904/ippToPsps/jython/detectionbatch.py

@@ -214 +214 @@
         sqlLine.group("completMag",       self.getKeyFloat(header, "%.8f", 'FLIMIT'))
         sqlLine.group("astroScat",        self.getKeyFloat(header, "%.8f", 'CERROR'))
-        sqlLine.group("photoScat",        self.getKeyFloat(self.header, "%.8f", 'ZPT_OBS'))
+        sqlLine.group("photoScat",        self.getKeyFloat(self.header, "%.8f", 'ZPT_ERR'))
         sqlLine.group("numAstroRef",      self.getKeyValue(header, 'NASTRO'))
         sqlLine.group("numPhotoRef",      self.getKeyValue(header, 'NASTRO'))
@@ -336 +336 @@
 
         sqlLine.group("ippDetectID",     "IPP_IDET")                                                
-        sqlLine.group("randomDetID",     "FLOOR(RAND()*9223372036854775807)")                       
+        sqlLine.group("randomDetID",     "FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)")                       
         sqlLine.group("filterID",        str(self.filterID))                                        
         sqlLine.group("surveyID",        str(self.surveyID))                                        
@@ -607 +607 @@
 
     '''
+    Updates table and generates pspsuniqueids
+    '''
+
+    def updatePspsUniqueIDs(self,table, ota):
+        sql = "UPDATE "+table+" join (select @r:=@r+1 rownum, objID from \
+        (select @r:=0) r, "+table+" t) as foo using (objID) set \
+        uniquePspsP2id = ((" +str(self.batchID)+ "*1000000000 ) \
+        + (" +str(ota) + "*10000000  )+rownum)"
+        try: self.scratchDb.execute(sql)
+        except:
+            self.logger.errorPair('failed sql',sql)
+            raise
+        
+    '''
     Does the processing, i.e. pulling stuff from IPP tables into PSPS tables
     '''
@@ -637 +651 @@
         results['NULLOBJID'] = self.scratchDb.reportAndDeleteRowsWithNULLS("Detection_" + chipname, "objID")
         #self.logger.info("deleted nulls")
+        self.logger.info("add psps unique p2 ids")
+        ota = x*10+y
+        self.updatePspsUniqueIDs("Detection_" + chipname, ota)
         self.updateImageID("Detection_" + chipname, x, y)
         #self.logger.info("updateImageId")