Lalinference fix

Description

Fixes an issue introduced with this MR: !2131 (comment 686372) and noticed by @john-veitch (see comments below the MR). The condition is now triggered by any 2 of the queried parameters, instead of by all 3 of them simultaneously.

API Changes and Justification

Backwards Compatible Changes

• This change does not modify any class/function/struct/type definitions in a public C header file or any Python class/function definitions
• This change adds new classes/functions/structs/types to a public C header file or Python module

Backwards Incompatible Changes

• This change modifies an existing class/function/struct/type definition in a public C header file or Python module
• This change removes an existing class/function/struct/type from a public C header file or Python module

If any of the Backwards Incompatible check boxes are ticked please provide a justification why this change is necessary and why it needs to be done in a backwards incompatible way.

N/A

Review Status

No review has been performed here, but the change has been approved by @gregorio.carullo who chaired the LALinference portion of the review of the model.

lalinference/lib/LALInferenceInitCBC.c

@@ -2344,9 +2344,24 @@ static void LALInferenceInitNonGRParams(LALInferenceRunState *state, LALInferenc
     REAL8 correction_ncycles_taper = 1.0;
 
     /* check that the user does not request both a TaylorF2Test and a PPE waveform model */
-    if (LALInferenceGetProcParamVal(commandLine,"--grtest-parameters") && LALInferenceGetProcParamVal(commandLine,"--ppe-parameters") && LALInferenceGetProcParamVal(commandLine,"--qnmtest-parameters"))
-    {
-        fprintf(stderr,"--grtest-parameters and --ppe-parameters and --qnmtest-parameters are not simultaneously supported. Please choose one. Aborting\n");
+    UINT2 check_grtest_params = 0;
+    UINT2 check_ppe_params = 0;
+    UINT2 check_qnmtest_params = 0;
+
+    if (LALInferenceGetProcParamVal(commandLine, "--grtest-parameters")) {
+        check_grtest_params = 1;
+    }
+
+    if (LALInferenceGetProcParamVal(commandLine, "--ppe-parameters")) {
+        check_ppe_params = 1;
+    }
+
+    if (LALInferenceGetProcParamVal(commandLine,"--qnmtest-parameters")) {
+        check_qnmtest_params = 1;
+    }
+    
+    if (check_grtest_params + check_ppe_params + check_qnmtest_params >= 2) {
+        fprintf(stderr,"--grtest-parameters, --ppe-parameters and --qnmtest-parameters are not simultaneously supported. Please choose one. Aborting\n");
         exit(-1);
     }