Changeset 39224 for branches/eam_branches/ipp-20151113/ippToPsps/jython/dvo.py

Timestamp:

Dec 3, 2015, 4:14:24 PM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20151113

Files:

• . (modified) (1 prop)
• ippToPsps (modified) (1 prop)
• ippToPsps/jython/dvo.py (modified) (8 diffs)

branches/eam_branches/ipp-20151113/ippToPsps

@@ -14 +14 @@
 install-sh
 Doxyfile
+compile

@@ -14 +14 @@
 install-sh
 Doxyfile
+compile

branches/eam_branches/ipp-20151113/ippToPsps/jython/dvo.py

@@ -72 +72 @@
             #     response = raw_input("(y/n) ")
             #     if response == "y":
-            self.resetAllTables()
+            self.resetAllTables() ## called if we need to change DVOs
 
     '''
@@ -95 +95 @@
         self.correctDvo = True
         if not self.loadSkyTable():
+            self.correctDvo = False
+            return
+        if not self.loadPhotcodes():
+            self.correctDvo = False
+            return
+        if not self.loadImages():
             self.correctDvo = False
             return
@@ -298 +304 @@
             return False        
 
-        # update the two meta tables, Images and SkyTable
-        self.loadSkyTable()
+        # update the SkyTable
+        self.loadSkyTable() ## in setSkyArea
 
         # set bounding-box coords
@@ -508 +514 @@
     def sync(self):
 
-        # go no further if we've already partly ingested a different DVO
-        if not self.correctDvo: return False
-
-        # check we have something to do
-        if len(self.regionsToPurge) < 1 and len(self.regionsToIngest) < 1:
-            self.logger.infoPair("Nothing to ingest or purge", "finished ingest")
-            return True
-
-        # make sure we have an up-to-date Images table
-        self.loadImages()
-
-        # purge stuff
-        self.purgeRegions(self.regionsToPurge)
-
-        totalRegions = len(self.regionsToIngest)
-        if totalRegions > 0: self.logger.infoSeparator()
-
-        # now loop through all regions and ingest to MySQL
-        ingestedRegionsCount = 0
-        regionCount = 1
-        for region in self.regionsToIngest:
-
-           self.logger.infoTitle("Region %d of %d: %s" % (regionCount, totalRegions, region))
-           if self.ingestRegion(region): ingestedRegionsCount += 1
-           regionCount += 1
-
-        self.logger.infoSeparator()
-        self.logger.infoPair("Ingested", "%d DVO regions (out of %d)" % (ingestedRegionsCount, len(self.regionsToIngest)))
-
-        # update lists after attempted sync
-        self.setSkyArea(self.minRa, self.maxRa, self.minDec, self.maxDec)
-        self.printSummary()
+        print "---- sync is disabled ----"
+        os._exit(3)
+
+        ### XXX # go no further if we've already partly ingested a different DVO
+        ### XXX if not self.correctDvo: return False
+        ### XXX 
+        ### XXX # check we have something to do
+        ### XXX if len(self.regionsToPurge) < 1 and len(self.regionsToIngest) < 1:
+        ### XXX     self.logger.infoPair("Nothing to ingest or purge", "finished ingest")
+        ### XXX     return True
+        ### XXX 
+        ### XXX # make sure we have an up-to-date Images table
+        ### XXX self.loadImages()
+        ### XXX 
+        ### XXX # purge stuff
+        ### XXX self.purgeRegions(self.regionsToPurge)
+        ### XXX 
+        ### XXX totalRegions = len(self.regionsToIngest)
+        ### XXX if totalRegions > 0: self.logger.infoSeparator()
+        ### XXX 
+        ### XXX # now loop through all regions and ingest to MySQL
+        ### XXX ingestedRegionsCount = 0
+        ### XXX regionCount = 1
+        ### XXX for region in self.regionsToIngest:
+        ### XXX 
+        ### XXX    self.logger.infoTitle("Region %d of %d: %s" % (regionCount, totalRegions, region))
+        ### XXX    if self.ingestRegion(region): ingestedRegionsCount += 1
+        ### XXX    regionCount += 1
+        ### XXX 
+        ### XXX self.logger.infoSeparator()
+        ### XXX self.logger.infoPair("Ingested", "%d DVO regions (out of %d)" % (ingestedRegionsCount, len(self.regionsToIngest)))
+        ### XXX 
+        ### XXX # update lists after attempted sync
+        ### XXX self.setSkyArea(self.minRa, self.maxRa, self.minDec, self.maxDec)
+        ### XXX self.printSummary()
 
         return True
@@ -667 +676 @@
     includes purging detections outside sky area
     '''
-    def nativeIngestDetections(self, boxId, boxDim):
+    def nativeIngestDetections(self, boxId, boxDim, myBatchType):
 
         # clear the 'ingested' field for all boxes owned by this host
@@ -688 +697 @@
 
         # make sure we have an up-to-date Images table
-        self.loadImages()
+        self.loadImages() # this is in nativeIngestDetections (remove?)
 
         # the box dimensions are the area used to select the items of
@@ -695 +704 @@
         # to grab all detections / objects which are contributed by an
         # item with the center in the given box
-        dR_border = self.skychunk.BORDER / math.cos(math.radians(boxDim['DEC']))
-        dD_border = self.skychunk.BORDER
-        
-        #This is a terrible hack but I'm tired of it taking a decade to ingest the FW skycells.
-
-        #if self.batchType == "ST":
-        #    dR_border = .4 / math.cos(math.radians(boxDim['DEC']))
-        #    dD_border = .4
-        #if self.batchType == "FW":
-        #    dR_border = .4 / math.cos(math.radians(boxDim['DEC']))
-        #    dD_border = .4
-
-
+
+        # P2 and DF need to use a full GPC1 exposure radius:
+        myBorder = self.skychunk.BORDER_GPC1
+
+        # ST and FW need to use just a skycell
+        if myBatchType == "ST" :
+            myBorder = self.skychunk.BORDER_SKYCELL
+        if myBatchType == "FW" :
+            myBorder = self.skychunk.BORDER_SKYCELL
+
+        dR_border = myBorder / math.cos(math.radians(boxDim['DEC']))
+        dD_border = myBorder
 
         minRA  = boxDim['minRA']  - dR_border
@@ -788 +796 @@
             else:
                 cmd += " -photcode-start 12000 -photcode-end 12500"
-        ## if (useFW == 1):
-        ##     if (self.config.camera == "simtest"):
-        ##         print "need photcodes for non gpc1 camera"
-        ##     else:
-        ##         print "need photcode for warp for gpc1 camera, default is no selection, should work, could be slow"
+
+        if (useST + useP2 + useDF + useFW > 1):
+            self.logger.errorPair("multiple batch types in a run", "NOW ILLEGAL")
+            os._exit(5)
                 
         ## dvopsps can take a very long time. try 2 or 3 times to re-establish communication with the db before proceeding?

@@ -14 +14 @@
 install-sh
 Doxyfile
+compile