Changes to BayesWaveCleanFrame (and bayeswave_pipe) to work with scitokens

Remove frame-srate from BayesWaveCleanFrame and from pipe commands (it can be gotten from the frame file itself!)

BayesWaveUtils/bayeswave_pipe/bayeswave_pipe_utils.py

@@ -1066,7 +1066,7 @@ def condor_job_config(job_type, condor_job, config_parser):
     #
     # OSG specific configuration
     #
-    if config_parser.getboolean('condor', 'osg-deploy'):
+    if config_parser.getboolean('condor', 'igwn-pool'):
         # --- Force downstream jobs to run locally
         if job_type in ['bayeswave_post', 'bayeswave_fpeak',
                          'megaplot.py']:
@@ -1094,12 +1094,12 @@ def condor_job_config(job_type, condor_job, config_parser):
             #
             # Accounting configurations
             #
-            if not config_parser.getboolean('condor','scitoken-auth'):
-                x509 = x509_manipulation(os.getcwd())
-                condor_job.add_condor_cmd('x509userproxy', x509)
+            if config_parser.getboolean('condor','igwn-scitoken'):
+                condor_job.add_condor_cmd('use_oauth_services','igwn')
+                # x509 = x509_manipulation(os.getcwd())
+                # condor_job.add_condor_cmd('x509userproxy', x509)
             else: # add stuff for using scitokens
-                condor_job.add_condor_cmd('use_oauth_services','igwn') # TODO -- would this ever need to be anything else?
-
+                condor_job.add_condor_cmd('use_oauth_services','scitokens') # TODO add extra warning about x509 not supported any more
     try:
         condor_job.add_condor_cmd('accounting_group',
                 config_parser.get('condor', 'accounting-group'))