Changeset 39661

Timestamp:

Aug 23, 2016, 2:34:33 PM (10 years ago)

Author:

heather

Message:

fix for retries of smf/cmf files, unk what the object batch fix is, but it's clearly something that was used...

Location:

trunk/ippToPsps/jython

Files:

• fits.py (modified) (3 diffs)
• objectbatch.py (modified) (1 diff)

trunk/ippToPsps/jython/fits.py

@@ -5 +5 @@
 import shutil
 import hashlib
+import time 
 from subprocess import call, PIPE, Popen
 
@@ -20 +21 @@
     '''
     def __init__(self, logger, config, originalPath):
-
        # set class variables
        self.originalPath = originalPath
@@ -27 +27 @@
        self.header = None
 
+       numtries = 0
+       success = 0
+
+       while (numtries < 5 and success == 0):
+           numtries = numtries +1
+           self.logger.infoPair("Attempting to read file, attempt #",str(numtries))
+           if os.path.isfile(self.originalPath):
+               success = 1
+               self.logger.infoPair("success to read file", self.originalPath)
+           else:  #if it fails, wait 30 seconds before looping
+               time.sleep(30)
+
+       if success == 0:
+           self.logger.errorPair("Cannot read file", self.originalPath)
+           return           
+
        # does this file even exist?
-       if not os.path.isfile(self.originalPath): 
-           self.logger.errorPair("Cannot read file", self.originalPath)
-           return
+       #if not os.path.isfile(self.originalPath): 
+        #   self.logger.errorPair("Cannot read file", self.originalPath)
+         #  return
+
+
 
        # ok, we have a file, now copy it locally to save on NFS overhead

trunk/ippToPsps/jython/objectbatch.py

@@ -318 +318 @@
         sqlLine.group("decMeanErr",      "DEC_ERR")
         sqlLine.group("posMeanChisq",    "CHISQ_POS")
-        sqlLine.group("nStackObjectRows", "'0'") # XXX I need to add / define this in dvopsps
+        sqlLine.group("nStackObjectRows", "'-999'") # XXX I need to add / define this in dvopsps # HAF set to -999 as required for pv3
         sqlLine.group("nStackDetections", "'0'")
         sqlLine.group("nDetections",      "'0'")