Add more flags for steering GNTau configuration

Add more flags for steering GNTau configuration

Reconstruction/tauRec/python/TauConfigFlags.py

@@ -57,7 +57,15 @@ def createTauConfigFlags():
     tau_cfg.addFlag("Tau.TauEleRNNWPfix", ["rnneveto_mc16d_flat_1p_fix.root", "rnneveto_mc16d_flat_3p_fix.root"])
     # GNTau ID tune file (need to add another version for noAux)
     tau_cfg.addFlag("Tau.TauGNNConfig", ["GNTau_noAux_simplified.onnx"])
-    tau_cfg.addFlag("Tau.TauGNNWP_v0", ["GNTauNA_flat_model_1p.root", "GNTauNA_flat_model_2p.root", "GNTauNA_flat_model_3p.root"])
+    tau_cfg.addFlag("Tau.TauGNNWP", ["GNTauNA_flat_model_1p.root", "GNTauNA_flat_model_2p.root", "GNTauNA_flat_model_3p.root"])
+    tau_cfg.addFlag("Tau.GNTauScoreName", "GNTauScore")
+    tau_cfg.addFlag("Tau.GNTauTransScoreName", "GNTauScoreSigTrans_v0")
+    tau_cfg.addFlag("Tau.GNTauMaxTracks", 30)
+    tau_cfg.addFlag("Tau.GNTauMaxClusters", 20)
+    tau_cfg.addFlag("Tau.GNTauNodeNameTau", "GN2TauNoAux_pb")
+    tau_cfg.addFlag("Tau.GNTauNodeNameJet", "GN2TauNoAux_pu")
+    tau_cfg.addFlag("Tau.GNTauDecorWPNames", ["GNTauVL_v0", "GNTauL_v0", "GNTauM_v0", "GNTauT_v0"])
+
 
     # PanTau config flags
     from PanTauAlgs.PanTauConfigFlags import createPanTauConfigFlags

Reconstruction/tauRec/python/TauToolHolder.py

@@ -787,11 +787,11 @@ def TauGNNEvaluatorCfg(flags):
     GNNConf = flags.Tau.TauGNNConfig
     myTauGNNEvaluator = TauGNNEvaluator(name = _name,
                                               NetworkFile = GNNConf[0],
-                                              OutputVarname = "GNTauScore",
+                                              OutputVarname = flags.Tau.GNTauScoreName,
                                               OutputPTau = "GNTauProbTau",
                                               OutputPJet = "GNTauProbJet",
-                                              MaxTracks = 30,
-                                              MaxClusters = 20,
+                                              MaxTracks = flags.Tau.GNTauMaxTracks, 
+                                              MaxClusters = flags.Tau.GNTauMaxClusters,
                                               MaxClusterDR = 15.0,
                                               MinTauPt = flags.Tau.MinPtDAOD,
                                               VertexCorrection = True,
@@ -799,8 +799,8 @@ def TauGNNEvaluatorCfg(flags):
                                               InputLayerScalar = "tau_vars",
                                               InputLayerTracks = "track_vars",
                                               InputLayerClusters = "cluster_vars",
-                                              NodeNameTau="GN2TauNoAux_pb",
-                                              NodeNameJet="GN2TauNoAux_pu")
+                                              NodeNameTau=flags.Tau.GNTauNodeNameTau,
+                                              NodeNameJet=flags.Tau.GNTauNodeNameJet)
 
     result.setPrivateTools(myTauGNNEvaluator)
     return result
@@ -810,20 +810,17 @@ def TauWPDecoratorGNNCfg(flags):
     _name = flags.Tau.ActiveConfig.prefix + 'TauWPDecoratorGNN'
 
     TauWPDecorator = CompFactory.getComp("TauWPDecorator")
-    WPConf = flags.Tau.TauGNNWP_v0
-    decorWPNames = ["GNTauVL_v0", "GNTauL_v0", "GNTauM_v0", "GNTauT_v0"]
-    scoreName = "GNTauScore"
-    newScoreName = "GNTauScoreSigTrans_v0"
+    WPConf = flags.Tau.TauGNNWP
     myTauWPDecorator = TauWPDecorator(name=_name,
                                       flatteningFile1Prong = WPConf[0],
                                       flatteningFile2Prong = WPConf[1],
                                       flatteningFile3Prong = WPConf[2],
-                                      DecorWPNames = decorWPNames,
+                                      DecorWPNames = flags.Tau.GNTauDecorWPNames,
                                       DecorWPCutEffs1P = [0.95, 0.85, 0.75, 0.60],
                                       DecorWPCutEffs2P = [0.95, 0.75, 0.60, 0.45],
                                       DecorWPCutEffs3P = [0.95, 0.75, 0.60, 0.45],
-                                      ScoreName = scoreName,
-                                      NewScoreName = newScoreName,
+                                      ScoreName = flags.Tau.GNTauScoreName,
+                                      NewScoreName = flags.Tau.GNTauTransScoreName,
                                       DefineWPs = True)
     result.setPrivateTools(myTauWPDecorator)
     return result