Adapt to update to RICH pixel background algorithm

Hlt/RecoConf/python/RecoConf/rich_reconstruction.py

@@ -125,6 +125,10 @@ def default_rich_reco_options(init_override_opts={}):
         # Maximum momentum cuts
         "MaxP": (9e90 * GeV, 9e90 * GeV, 9e90 * GeV),
 
+        # Minimum transverse momentum cut
+        "MinPt":
+        0 * GeV,
+
         #===========================================================
         # Photon treatment options
         #===========================================================
@@ -173,15 +177,21 @@ def default_rich_reco_options(init_override_opts={}):
         # Ignore the expected signals based on the track information
         "PDBackIgnoreExpSignals": [True, False, False, False],
 
+        # Ignore the hit data when computing backgrounds
+        "PDBackIgnoreHitData": [False, False, False, False],
+
         # Minimum allowed pixel background value (RICH1,RICH2)
         "PDBackMinPixBackground": [(0, 0), (0, 0), (0, 0), (0, 0)],
 
         # Maximum allowed pixel background value (RICH1,RICH2)
-        "PDBackMaxPixBackground": [(999, 999), (999, 999), (999, 999),
-                                   (999, 999)],
+        "PDBackMaxPixBackground": [(99, 99), (99, 99), (99, 99), (99, 99)],
+
+        # Threshold values for background values
+        "PDBackThresholds": [(0.005, 0.005), (0.005, 0.005), (0.005, 0.005),
+                             (0.005, 0.005)],
 
-        # Group Size for PDs  RICH1 RICH2
-        "PDGroupSize": (4, 4),
+        # Background weights for each RICH
+        "PDBckWeights": [(1.0, 1.0), (1.0, 1.0), (1.0, 1.0), (1.0, 1.0)],
 
         # Likelihood minimizer options
 
@@ -351,6 +361,7 @@ def make_rich_tracks(track_name, input_tracks, options):
         MaxTracks=options["MaxTracks"],
         MinP=options["MinP"],
         MaxP=options["MaxP"],
+        MinPt=options["MinPt"],
         TrackExtrapolator=options["TrackExtrapolator"](),
         Detectors=det_opts,
         Radiators=rad_opts)
@@ -675,10 +686,12 @@ def make_rich_pids(track_name,
             # Settings
             Detectors=det_opts,
             Radiators=rad_opts,
-            PDGroupSize=options["PDGroupSize"],
             IgnoreExpectedSignals=options["PDBackIgnoreExpSignals"][it],
             MinPixelBackground=options["PDBackMinPixBackground"][it],
             MaxPixelBackground=options["PDBackMaxPixBackground"][it],
+            IgnoreHitData=options["PDBackIgnoreHitData"][it],
+            PDBckWeights=options["PDBckWeights"][it],
+            ThresholdBackground=options["PDBackThresholds"][it],
             # Input data
             TrackPIDHyposLocation=PIDs[it],
             TrackToSegmentsLocation=track_conf["SelectedTrackToSegments"],