Merge branch 'tm_recomon' into 'master'

New Monitors requested from PbPb

See merge request !4027

Hlt/Hlt2Conf/python/Hlt2Conf/lines/monitoring/data_quality_pp.py

@@ -266,7 +266,6 @@ def _dq_tracking(name="Hlt2DQ_TrackMonitors", prescale=0.01):
         TrackMonitor(
             name="DQ_TrackMonitor",
             TracksInContainer=all_best_tracks,
-            StatesFor2DHits=["VELO", "UT", "FT"],
             allow_duplicate_instances_with_distinct_names=True,
         )
     )
@@ -339,7 +338,6 @@ def _dq_tracking_nobias(name="Hlt2DQ_TrackMonitors_NoBias", prescale=1):
         TrackMonitor(
             name="DQ_TrackMonitor_NoBias",
             TracksInContainer=all_best_tracks,
-            StatesFor2DHits=["VELO", "UT", "FT"],
             allow_duplicate_instances_with_distinct_names=True,
         )
     )

Hlt/RecoConf/options/hlt2_reco_magnet_off.py

@@ -16,6 +16,7 @@ from GaudiKernel.SystemOfUnits import GeV, MeV
 from PyConf.Algorithms import (
     PrKalmanFilter,
     PrKalmanFilter_noUT,
+    TrackCorrelationsMonitor,
     TrackMonitor,
     TracksFromProtoParticleSelection,
 )
@@ -29,6 +30,7 @@ from RecoConf.hlt2_global_reco import (
 from RecoConf.hlt2_tracking import (
     make_PrKalmanFilter_noUT_tracks,
     make_PrKalmanFilter_tracks,
+    make_PrStoreSciFiHits_hits,
 )
 from RecoConf.mc_checking import (
     check_tracking_efficiency,
@@ -77,15 +79,19 @@ def my_reco_data(with_UT=True):
 
     data = [reco["LongTracks"], reco["VeloTracks"], reco["PVs"], my_filtered_tracks]
 
+    scifihits = make_PrStoreSciFiHits_hits()
+
     # monitoring
     for tracks, name in [(reco["LongTracks"], "Long"), (reco["VeloTracks"], "Velo")]:
         data += [
-            TrackMonitor(
-                name=f"TrackMonitor_{name}",
+            TrackMonitor(name=f"TrackMonitor_{name}", TracksInContainer=tracks),
+            TrackCorrelationsMonitor(
+                name=f"TrackCorrelationsMonitor_{name}",
                 TracksInContainer=tracks,
-                StatesFor2DHits=["Velo", "UT", "FT"],
+                SciFiHits=scifihits,
+                StatesFor2DHits=["VELO", "UT", "FT"],
                 Extrapolator=TrackLinearExtrapolator(),
-            )
+            ),
         ]
 
     # mc checking

Hlt/RecoConf/python/RecoConf/standalone.py

@@ -23,6 +23,7 @@ from PyConf.Algorithms import (
     LHCb__Phoenix__DumpVPHitEvent,
     MonitorDetectorCorrelations,
     MonitorECALEnergyRawEventSizeCorrelations,
+    MonitorTrackECALCorrelations,
     PrintProtoParticles,
     PrKalmanFilter,
     PrKalmanFilter_Downstream,
@@ -154,6 +155,7 @@ def reco_prefilters(
 def standalone_hlt2_global_reco(
     do_mc_checking: bool = False,
     do_data_monitoring: bool = False,
+    collisiontype="pp",
 ) -> Reconstruction:
     """Standalone reconstruction sequence as defined by <hlt2_global_reco.reconstruction>.
 
@@ -260,6 +262,14 @@ def standalone_hlt2_global_reco(
                 use_pr_kf=True,
             )
         ]
+        data += [
+            MonitorTrackECALCorrelations(
+                name="MonitorTrackECALCorrelations",
+                TracksInContainer=monitor_tracks,
+                ECALDigits=calo["digitsEcal"],
+                CollisionType=collisiontype,
+            )  # set pp for pp, PbPb for PbPb
+        ]
         monitors_outside_gec += monitor_detector_correlations(
             reco_handles["AllCaloHandles"]
         )
@@ -700,6 +710,14 @@ def standalone_hlt2_reco(
         ]
 
         data += [monitor_muon_PID(muon_pids)]
+        data += [
+            MonitorTrackECALCorrelations(
+                name="MonitorTrackECALCorrelations",
+                TracksInContainer=best_tracks["v1"],
+                ECALDigits=calo["digitsEcal"],
+                CollisionType=collisiontype,
+            )  # set pp for pp, PbPb for PbPb
+        ]
 
         monitors_outside_gec += monitor_detector_correlations(
             calo, collisiontype=collisiontype
@@ -920,6 +938,14 @@ def standalone_hlt2_light_reco(
                 use_pr_kf=use_pr_kf,
             )
         ]
+        data += [
+            MonitorTrackECALCorrelations(
+                name="MonitorTrackECALCorrelations",
+                TracksInContainer=monitor_tracks["v1"],
+                ECALDigits=calo["digitsEcal"],
+                CollisionType=collisiontype,
+            )  # set pp for pp, PbPb for PbPb
+        ]
         monitors_outside_gec += monitor_detector_correlations(
             calo, collisiontype=collisiontype
         )
@@ -1150,6 +1176,15 @@ def standalone_hlt2_light_reco_without_UT(
                 use_pr_kf=use_pr_kf,
             )
         ]
+        if not skip_Calo:
+            data += [
+                MonitorTrackECALCorrelations(
+                    name="MonitorTrackECALCorrelations",
+                    TracksInContainer=monitor_tracks["v1"],
+                    ECALDigits=calo["digitsEcal"],
+                    CollisionType=collisiontype,
+                )  # set pp for pp, PbPb for PbPb
+            ]
 
         if not skip_Muon:
             data += [monitor_muon_PID(muon_pids)]

Hlt/RecoConf/python/RecoConf/track_data_monitoring.py

@@ -16,6 +16,7 @@ from PyConf.Algorithms import (
     PrSciFiHitsMonitor,
     RandomTrackContainerSplitter,
     RandomVeloTrackContainerSplitter,
+    TrackCorrelationsMonitor,
     TrackFitMatchMonitor,
     TrackMonitor,
     TrackPV2HalfMonitor,
@@ -78,7 +79,7 @@ def monitor_tracking(
         SeedName="TrackMonitoringPrescaler",
         ODINLocation=make_odin(),
     )
-
+    scifihits = make_PrStoreSciFiHits_hits()
     vertex_moni = TrackVertexMonitor(
         name="TrackVertexMonitor", PVContainer=pvs, TrackContainer=tracks
     )
@@ -87,17 +88,17 @@ def monitor_tracking(
         name="TrackFitMatchMonitor", TrackContainer=tracks
     )
 
-    track_moni = TrackMonitor(
-        name="TrackMonitor",
+    track_corr_moni = TrackCorrelationsMonitor(
+        name="TrackCorrelationsMonitor",
         TracksInContainer=tracks,
+        SciFiHits=scifihits,
         StatesFor2DHits=["VELO", "UT", "FT"],
     )
 
+    track_moni = TrackMonitor(name="TrackMonitor", TracksInContainer=tracks)
+
     velo_track_moni = TrackMonitor(
-        name="VeloTrackMonitor",
-        TracksInContainer=velo_tracks,
-        typesToMonitor=["Velo", "VeloBackward"],
-        StatesFor2DHits=["VELO"],
+        name="VeloTrackMonitor", TracksInContainer=velo_tracks
     )
 
     vpoverlap_moni = TrackVPOverlapMonitor(
@@ -124,6 +125,7 @@ def monitor_tracking(
             vertex_moni,
             fitmatch_moni,
             track_moni,
+            track_corr_moni,
             velo_track_moni,
             vpoverlap_moni,
             pv2half_moni,