IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Mar 15, 2016, 2:16:07 PM (10 years ago)
Author:
heather
Message:

old changes from Gene for ForcedWarp related problems as well as fixes to FW batches - these are non-empty FW for SAS42

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippToPsps/jython/dvo.py

    r39153 r39467  
    9595        self.correctDvo = True
    9696        if not self.loadSkyTable():
    97             self.correctDvo = False
    98             return
     97            os._exit(1)
     98
    9999        if not self.loadPhotcodes():
    100             self.correctDvo = False
    101             return
     100            os._exit(1)
     101
    102102        if not self.loadImages():
    103             self.correctDvo = False
    104             return
     103            os._exit(1)
     104
    105105
    106106    '''
    … …  
    108108    '''
    109109    def loadPhotcodes(self):
    110 
    111         # go no further if we've already partly ingested a different DVO
    112         if not self.correctDvo: return
    113110
    114111        if (self.skychunk.dvoLocation == 'none'):
    115112            # print "do not load Photcodes for place-holder DVO " + self.skychunk.dvoLocation
    116             return False
     113            return True
    117114
    118115        # check if we have up-to-date version
    … …  
    120117        if self.scratchDb.alreadyImportedThisDvoTable(path):
    121118            self.logger.debugPair("DVO Photcodes.dat file", "up-to-date")
    122             return
     119            return True
    123120       
    124121        self.logger.infoSeparator()
    … …  
    132129
    133130        self.scratchDb.setImportedThisDvoTable(path)
     131        return True
    134132
    135133    '''
    … …  
    137135    '''
    138136    def loadImages(self):
    139 
    140         # go no further if we've already partly ingested a different DVO
    141         if not self.correctDvo: return
    142137
    143138        # check if we have up-to-date version
    … …  
    145140        if self.scratchDb.alreadyImportedThisDvoTable(path):
    146141            self.logger.debugPair("DVO Images.dat file", "up-to-date")
    147             return
     142            return True
    148143       
    149144        self.logger.infoSeparator()
    … …  
    158153
    159154        self.scratchDb.setImportedThisDvoTable(path)
     155        return True
    160156
    161157    '''
    … …  
    227223    def loadSkyTable(self):
    228224       
    229         # go no further if we've already partly ingested a different DVO
    230         if not self.correctDvo: return False
    231 
    232225        if (self.skychunk.dvoLocation == 'none'):
    233226            # print "do not load SkyTable for place-holder DVO " + self.skychunk.dvoLocation
    234             return False
     227            return True
    235228
    236229        path =  self.skychunk.dvoLocation + "/SkyTable.fits"
    237230        if self.scratchDb.alreadyImportedThisDvoTable(path):
    238231            self.logger.debugPair("DVO SkyTable.fits file", "up-to-date")       
    239             return False
     232            return True
    240233
    241234        # self.logger.infoSeparator()
    … …  
    296289    def setSkyArea(self, minRa=-1., maxRa=361., minDec=-91., maxDec=91):
    297290   
    298         # go no further if we've already partly ingested a different DVO
    299         if not self.correctDvo: return
    300 
    301291        if (maxRa - minRa <= 0) or (maxDec - minDec) <= 0:
    302292            self.logger.errorPair("Zero range in either RA or Dec",
Note: See TracChangeset for help on using the changeset viewer.