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

@@ -659,7 +659,6 @@ class triggerList:
     def parse_cwb_trigger_list(self, cp, cwb_trigger_file, rho_threshold=-1.0,
             keep_frac=1.0):
 
-
         # Get rho threshold
         try:
             rho_threshold = cp.getfloat('input', 'rho-threshold')
@@ -668,6 +667,10 @@ class triggerList:
 
         # Determine network
         ifo_list = ast.literal_eval(cp.get('input', 'ifo-list'))
+        if len(ifo_list) > 3:
+            # TODO: need to update for arbitrary number of ifos.
+            print("This functionality not currently supported beyond the HLV network.")
+            sys.exit(1)
         if 'H1' in ifo_list:
             network='H'
             if 'L1' in ifo_list:
@@ -959,7 +962,7 @@ def condor_job_config(job_type, condor_job, config_parser):
      * job_type='bayeswave_post'
      * job_type='bayeswave_fpeak'
      * job_type='bayeswave_clean_frame'
-     * job_type='megaplot.py'
+     * job_type='megaplot'
 
     This identifies the site (OSG vs LDG) and set properties of the condor job
     (file transfers, executable location etc) accordingly
@@ -1010,8 +1013,9 @@ def condor_job_config(job_type, condor_job, config_parser):
         if singularityImage[-1]!='"':  singularityImage += '"'
         condor_job.add_condor_cmd('+SingularityImage', singularityImage)
         
-    else:
-        condor_job.add_condor_cmd('getenv',True)
+    # No longer supported
+    # else:
+    #     condor_job.add_condor_cmd('getenv',True)
 
     #
     # File Transfer configuration
@@ -1068,8 +1072,9 @@ def condor_job_config(job_type, condor_job, config_parser):
     #
     if config_parser.getboolean('condor', 'igwn-pool'):
         # --- Force downstream jobs to run locally
+        print("jobtype=",job_type)
         if job_type in ['bayeswave_post', 'bayeswave_fpeak',
-                         'megaplot.py']:
+                         'megaplot']:
             condor_job.add_condor_cmd('+flock_local', 'True')
             condor_job.add_condor_cmd('+DESIRED_Sites', '\"nogrid\"')
 
@@ -2074,7 +2079,8 @@ class submitToGraceDB(pipeline.CondorDAGJob,pipeline.AnalysisJob):
         if cp.has_option('condor', 'accounting-group'):
             self.add_condor_cmd('accounting_group', cp.get('condor', 'accounting-group'))   
 
-        self.add_condor_cmd('getenv', 'True')
+        # No longer supported
+        # self.add_condor_cmd('getenv', 'True')
 
         self.set_stdout_file('gdb_submitter_$(cluster)-$(process)-$(node).out')
         self.set_stderr_file('gdb_submitter_$(cluster)-$(process)-$(node).err')