Changeset 39153

Timestamp:

Nov 17, 2015, 4:59:36 PM (11 years ago)

Author:

eugene

Message:

pass the batchType into nativeIngestDetections; disallow use of multiple batchTypes in a detection-style batch

Location:

trunk/ippToPsps/jython

Files:

• dvo.py (modified) (3 diffs)
• loader.py (modified) (1 diff)

trunk/ippToPsps/jython/dvo.py

@@ -676 +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
@@ -709 +709 @@
 
         # ST and FW need to use just a skycell
-        if self.batchType == "ST" :
+        if myBatchType == "ST" :
             myBorder = self.skychunk.BORDER_SKYCELL
-        if self.batchType == "FW" :
+        if myBatchType == "FW" :
             myBorder = self.skychunk.BORDER_SKYCELL
 
@@ -796 +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?

trunk/ippToPsps/jython/loader.py

@@ -172 +172 @@
                     if (batchType == "P2" or batchType == "ST" or batchType =="DF" or batchType == "FW"):
                         if self.config.resetDvo or not self.ippToPspsDb.isBoxIngested(boxId, self.scratchDb.dbHost):
-                            if not self.dvo.nativeIngestDetections(boxId, boxDim):
+                            if not self.dvo.nativeIngestDetections(boxId, boxDim, batchType):
                                 self.logger.error("Unable to ingest detections with nativeIngest")
                                 return False