Some import tinkering

Author: leroy.42

phangsPipeline/casaCubeRoutines.py

@@ -18,7 +18,7 @@
 import analysisUtils as au
 
 # Pipeline versioning
-from pipelineVersion import version
+from .pipelineVersion import version as pipeVer
 
 # CASA stuff
 from . import casaStuff
@@ -268,7 +268,7 @@ def export_and_cleanup(
                     logger.info("... fractional deviation: "+str(frac_dev))
 
     # Never forget where you came from
-    hdr['COMMENT'] = 'Produced with PHANGS-ALMA pipeline version ' + version
+    hdr['COMMENT'] = 'Produced with PHANGS-ALMA pipeline version ' + pipeVer
 
     # Overwrite
     hdu.writeto(outfile, clobber=True)

phangsPipeline/casaFeatherRoutines.py

@@ -16,7 +16,7 @@
 import analysisUtils as au
 
 # Pipeline versionining
-from pipelineVersion import version as pipeVer
+from .pipelineVersion import version as pipeVer
 
 # CASA stuff
 from . import casaStuff

phangsPipeline/casaImagingRoutines.py

@@ -15,7 +15,7 @@
 import analysisUtils as au
 
 # Pipeline versionining
-from pipelineVersion import version as pipeVer
+from .pipelineVersion import version as pipeVer
 
 # CASA stuff
 from . import casaStuff

phangsPipeline/casaMaskingRoutines.py

@@ -24,7 +24,7 @@
 import analysisUtils as au
 
 # Pipeline versionining
-from pipelineVersion import version as pipeVer
+from .pipelineVersion import version as pipeVer
 
 # CASA stuff
 from . import casaStuff

phangsPipeline/casaMosaicRoutines.py

@@ -16,7 +16,7 @@
 import analysisUtils as au
 
 # Pipeline versionining
-from pipelineVersion import version as pipeVer
+from .pipelineVersion import version as pipeVer
 
 # CASA stuff
 from . import casaStuff

phangsPipeline/casaRoutineTests.py

@@ -20,7 +20,7 @@
 import analysisUtils as au
 
 # Pipeline versionining
-from pipelineVersion import version as pipeVer
+from .pipelineVersion import version as pipeVer
 
 # CASA stuff
 from . import casaStuff

phangsPipeline/casaVisRoutines.py

@@ -18,7 +18,7 @@
 import analysisUtils as au
 
 # Pipeline versionining
-from pipelineVersion import version as pipeVer
+from .pipelineVersion import version as pipeVer
 
 # CASA stuff
 from . import casaStuff

phangsPipeline/scDerivativeRoutines.py

@@ -6,7 +6,7 @@
 from astropy.io import fits
 from spectral_cube import SpectralCube, Projection
 
-from pipelineVersion import version, tableversion
+from .pipelineVersion import version, tableversion
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.DEBUG)

phangsPipeline/scMaskingRoutines.py

@@ -13,8 +13,8 @@
 from astropy.io import fits
 from spectral_cube import SpectralCube
 
-from pipelineVersion import version, tableversion
-from scNoiseRoutines import mad_zero_centered
+from .pipelineVersion import version, tableversion
+from .scNoiseRoutines import mad_zero_centered
 
 np.seterr(divide='ignore', invalid='ignore')
 
@@ -729,13 +729,13 @@ def recipe_phangs_broad_mask(
         mask = join_masks(mask, other_mask, operation='sum'
                           , order='fast_nearest_neighbor')
 
-    if recipe is 'anyscale':
+    if recipe == 'anyscale':
         mask_values = mask.filled_data[:].value > 0
         mask = SpectralCube(mask_values*1.0, wcs=mask.wcs, header=mask.header
                             , meta={'BUNIT': ' ', 'BTYPE': 'Mask'})
         mask.allow_huge_operations = True
 
-    if recipe is 'somescales':
+    if recipe == 'somescales':
         mask_values = mask.filled_data[:].value > (fraction_of_scales
                                                   * len(list_of_masks))
         mask = SpectralCube(mask_values*1.0, wcs=mask.wcs, header=mask.header

phangsPipeline/scNoiseRoutines.py

@@ -12,7 +12,7 @@
 from astropy.stats import mad_std
 from spectral_cube import SpectralCube
 
-from pipelineVersion import version, tableversion
+from .pipelineVersion import version, tableversion
 
 np.seterr(divide='ignore', invalid='ignore')