Merge branch 'CPalgo-rename-jvt-selection' into 'main'

CP algorithms: rename the jvt selection name to something more explanatory

See merge request atlas/athena!69358

PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/data/for_compare.yaml

@@ -117,7 +117,7 @@ Output:
         met_: 'AnaMET'
         '': 'EventInfo'
     commands:
-      - 'disable jet_select_jvt.*'
+      - 'disable jet_select_baselineJvt.*'
       - 'disable el_select_loose.*'
       - 'disable mu_select_medium.*'
       - 'disable ph_select_tight.*'

PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/python/FullCPAlgorithmsTest.py

@@ -987,7 +987,7 @@ def makeSequenceBlocks (dataType, algSeq, forCompare, isPhyslite,
     disable_commands = []
     if forCompare:
         disable_commands += [
-            'disable jet_select_jvt.*',
+            'disable jet_select_baselineJvt.*',
             'disable mu_select_medium.*',
             'disable ph_select_tight.*',
             'disable tau_select_tight.*',

PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/python/JetAnalysisConfig.py

@@ -310,7 +310,7 @@ class SmallRJetAnalysisConfig (ConfigBlock) :
                 alg.jets = config.readName (self.containerName)
                 alg.preselection = config.getPreselection (self.containerName, '')
                 config.addOutputVar (self.containerName, alg.scaleFactorDecoration, 'jvtEfficiency')
-            config.addSelection (self.containerName, 'jvt', 'jvt_selection,as_char', preselection=False)
+            config.addSelection (self.containerName, 'baselineJvt', 'jvt_selection,as_char', preselection=False)
 
         if self.runFJvtSelection :
             alg = config.createAlgorithm('CP::AsgSelectionAlg', f'FJvtSelectionAlg{postfix}')
@@ -320,7 +320,7 @@ class SmallRJetAnalysisConfig (ConfigBlock) :
             alg.selectionDecoration = "fjvt_selection,as_char"
             alg.particles = config.readName(self.containerName)
             alg = config.createAlgorithm( 'CP::JvtEfficiencyAlg', 'ForwardJvtEfficiencyAlg' )
-            config.addSelection (self.containerName, 'fjvt', 'fjvt_selection,as_char', preselection=False)
+            config.addSelection (self.containerName, 'baselineFJvt', 'fjvt_selection,as_char', preselection=False)
 
             if self.runFJvtEfficiency and self.config.dataType() is not DataType.Data:
                 alg = config.createAlgorithm( 'CP::JvtEfficiencyAlg', 'FJvtEfficiencyAlg'+postfix )