Merge branch 'only-configure-direct-dependencies' into 'master'

only configure direct dependencies, not indirect ones

See merge request !2115

Hlt/RecoConf/python/RecoConf/hlt1_muonid.py

@@ -9,7 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 from PyConf import configurable
-from PyConf.application import default_raw_banks, default_raw_event
+from PyConf.application import default_raw_banks
 from PyConf.Algorithms import (
     MuonRawToHits,
     MuonRawInUpgradeToHits,
@@ -20,15 +20,14 @@ from RecoConf.hlt1_tracking import make_hlt1_fitted_tracks, make_hlt1_tracks
 
 
 @configurable
-def make_muon_hits(geometry_version=2, make_raw=default_raw_event):
+def make_muon_hits(geometry_version=2):
 
     if geometry_version == 2: raw_to_hits = MuonRawToHits
     elif geometry_version == 3: raw_to_hits = MuonRawInUpgradeToHits
     else:
         raise ValueError("Unsupported muon decoding version")
 
-    return raw_to_hits(
-        RawBanks=default_raw_banks("Muon", make_raw)).HitContainer
+    return raw_to_hits(RawBanks=default_raw_banks("Muon")).HitContainer
 
 
 @configurable

Hlt/RecoConf/python/RecoConf/mc_checking.py

@@ -41,7 +41,6 @@ from RecoConf.hlt1_tracking import (
 
 from RecoConf.mc_checking_categories import get_mc_categories, get_hit_type_mask, categories
 from RecoConf.hlt1_muonid import make_muon_hits
-from PyConf.application import default_raw_event
 from .data_from_file import boole_links_digits_mcparticles, boole_links_digits_mchits, mc_unpackers
 import Functors as F
 
@@ -554,8 +553,7 @@ def check_track_resolution(
     return res_checker
 
 
-@configurable
-def vphits_resolution_checker(make_raw=default_raw_event):
+def vphits_resolution_checker():
     mcparticles = mc_unpackers()["MCParticles"]
     vphits = make_VeloClusterTrackingSIMD_hits()
     vpclusters = make_velo_full_clusters()
@@ -573,8 +571,7 @@ def vphits_resolution_checker(make_raw=default_raw_event):
     return vpchecker
 
 
-@configurable
-def uthits_resolution_checker(make_raw=default_raw_event):
+def uthits_resolution_checker():
     mcparticles = mc_unpackers()["MCParticles"]
     mcuthits = mc_unpackers()["MCUTHits"]
     uthits = make_PrStorePrUTHits_hits()
@@ -590,8 +587,7 @@ def uthits_resolution_checker(make_raw=default_raw_event):
     return utchecker
 
 
-@configurable
-def fthits_resolution_checker(make_raw=default_raw_event):
+def fthits_resolution_checker():
     mcparticles = mc_unpackers()["MCParticles"]
     fthits = make_PrStoreFTHit_hits()
     ftclusters = make_FTRawBankDecoder_clusters()
@@ -610,8 +606,7 @@ def fthits_resolution_checker(make_raw=default_raw_event):
 
 
 @configurable
-def hits_resolution_checkers(make_raw=default_raw_event,
-                             with_mc_hits=True,
+def hits_resolution_checkers(with_mc_hits=True,
                              with_VP=True,
                              with_UT=True,
                              with_FT=True):
@@ -619,13 +614,13 @@ def hits_resolution_checkers(make_raw=default_raw_event,
     hits_checkers = []
     if with_mc_hits:
         if with_VP:
-            vphits_checker = vphits_resolution_checker(make_raw)
+            vphits_checker = vphits_resolution_checker()
             hits_checkers.append(vphits_checker)
         if with_UT:
-            uthits_checker = uthits_resolution_checker(make_raw)
+            uthits_checker = uthits_resolution_checker()
             hits_checkers.append(uthits_checker)
         if with_FT:
-            fthits_checker = fthits_resolution_checker(make_raw)
+            fthits_checker = fthits_resolution_checker()
             hits_checkers.append(fthits_checker)
 
     return hits_checkers