Expand mode exclusion in conversion.py

bilby/gw/conversion.py

@@ -816,13 +816,17 @@ def lambda_tilde_to_lambda_1_lambda_2(
     lambda_2 = lambda_1 / q**5
     return lambda_1, lambda_2
 
+MODE_KEYS = []
+for l in range(2, 9):
+    for m in range(-l, l+1):
+        MODE_KEYS.append(f'h{l}{m}')
 
 def _generate_all_cbc_parameters(sample, defaults, base_conversion,
                                  likelihood=None, priors=None, npool=1):
     """Generate all cbc parameters, helper function for BBH/BNS"""
     output_sample = sample.copy()
     waveform_defaults = defaults
-    for rm_key in ["h22", "h20", "h32", "h33"]:
+    for rm_key in MODE_KEYS:
             waveform_defaults.pop(rm_key, None)
     for key in waveform_defaults:
         try: