uvcontsub version restored in casaVisRoutines.py

Author: thomaswilliamsastro

phangsPipeline/casaVisRoutines.py

@@ -9,6 +9,7 @@
 
 import analysisUtils as au
 import numpy as np
+from packaging import version
 from scipy.ndimage import label
 
 from . import casaStuff
@@ -445,12 +446,24 @@ def contsub(
         )
 
     # uvcontsub, this outputs infile+'.contsub'
-    uvcontsub_params = {
-        'vis': infile,
-        'outputvis': outfile,
-        'fitspec': spw_flagging_string,
-        'fitorder': fitorder,
-        'fitmethod': 'gsl'}  # or 'casacore'
+    # Pre 6.5.2
+    if version.parse(casaStuff.casa_version_str) < version.parse('6.5.2'):
+        uvcontsub_params = {
+            'vis': infile,
+            'fitspw': spw_flagging_string,
+            'excludechans': False,  # now uses complement for channel selection.
+            'combine': combine,
+            'fitorder': fitorder,
+            'solint': solint,
+            'want_cont': False}
+    # Post 6.5.2
+    else:
+        uvcontsub_params = {
+            'vis': infile,
+            'outputvis': outfile,
+            'fitspec': spw_flagging_string,
+            'fitorder': fitorder,
+            'fitmethod': 'gsl'}  # or 'casacore'
 
     logger.info(
         "... running CASA "+'uvcontsub(' +