[Misc] Apply SonarCloud rule cpp:S1066

SonarCloud rule fix

• Rule name: Mergeable "if" statements should be combined
• Rule code: cpp:S1066
• Rule link: https://sonarcloud.io/organizations/cern-cta/rules?open=cpp%3AS1066&rule_key=cpp%3AS1066

Other comments