Merge pull request #45626 from slowmoyang/UpdateRPCRecHits_from-CMSSW…

…_14_1_0_pre6 Update validation for RPC hit reconstruction
cms-sw · Aug 13, 2024 · 8e27618 · 8e27618
2 parents 76a4f99 + d1f30af
commit 8e27618
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 271 deletions.
diff --git a/Validation/RPCRecHits/interface/RPCRecHitValid.h b/Validation/RPCRecHits/interface/RPCRecHitValid.h
@@ -62,17 +62,12 @@ class RPCRecHitValid : public DQMEDAnalyzer {
   MEP h_recoMuonBarrel_phi, h_recoMuonOverlap_phi, h_recoMuonEndcap_phi, h_recoMuonNoRPC_phi;
   MEP h_simParticleType, h_simParticleTypeBarrel, h_simParticleTypeEndcap;
 
-  MEP h_refPunchOccupancyBarrel_wheel, h_refPunchOccupancyEndcap_disk, h_refPunchOccupancyBarrel_station;
-  MEP h_refPunchOccupancyBarrel_wheel_station, h_refPunchOccupancyEndcap_disk_ring;
-  MEP h_recPunchOccupancyBarrel_wheel, h_recPunchOccupancyEndcap_disk, h_recPunchOccupancyBarrel_station;
-  MEP h_recPunchOccupancyBarrel_wheel_station, h_recPunchOccupancyEndcap_disk_ring;
-
   MEP h_matchOccupancyBarrel_detId;
   MEP h_matchOccupancyEndcap_detId;
   MEP h_refOccupancyBarrel_detId;
   MEP h_refOccupancyEndcap_detId;
-  MEP h_noiseOccupancyBarrel_detId;
-  MEP h_noiseOccupancyEndcap_detId;
+  MEP h_allOccupancyBarrel_detId;
+  MEP h_allOccupancyEndcap_detId;
   MEP h_rollAreaBarrel_detId;
   MEP h_rollAreaEndcap_detId;
 

diff --git a/Validation/RPCRecHits/python/postValidation_cfi.py b/Validation/RPCRecHits/python/postValidation_cfi.py
@@ -3,18 +3,18 @@
 
 def efficSet(nameIn, titleIn, numeratorIn, denominatorIn, typeIn="eff"):
     pset = cms.PSet(name=cms.untracked.string(nameIn),
-                    title=cms.untracked.string(titleIn), 
-                    numerator=cms.untracked.string(numeratorIn), 
+                    title=cms.untracked.string(titleIn),
+                    numerator=cms.untracked.string(numeratorIn),
                     denominator=cms.untracked.string(denominatorIn),
                     type=cms.untracked.string(typeIn))
     return pset
 
 rpcRecHitSimRecoClient = DQMEDHarvester("RPCRecHitValidClient",
-    subDir = cms.string("RPC/RPCRecHitV/SimVsReco"),
+    subDir = cms.string("RPC/RPCRecHitV"),
 )
 
 rpcRecHitPostValidation = DQMEDHarvester("DQMGenericClient",
-    subDirs = cms.untracked.vstring("RPC/RPCRecHitV/SimVsReco",),
+    subDirs = cms.untracked.vstring("RPC/RPCRecHitV",),
     #subDirs = cms.untracked.vstring("RPC/RPCRecHitV/SimVsReco",
     #                                "RPC/RPCRecHitV/SimVsDTExt",
     #                                "RPC/RPCRecHitV/SimVsCSCExt"),

diff --git a/Validation/RPCRecHits/python/rpcRecHitValidation_cfi.py b/Validation/RPCRecHits/python/rpcRecHitValidation_cfi.py
@@ -2,7 +2,7 @@
 
 from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer
 rpcRecHitV = DQMEDAnalyzer('RPCRecHitValid',
-    subDir = cms.string("RPC/RPCRecHitV/SimVsReco"),
+    subDir = cms.string("RPC/RPCRecHitV"),
     simHit = cms.InputTag("g4SimHits", "MuonRPCHits"),
     recHit = cms.InputTag("rpcRecHits"),
     simTrack = cms.InputTag("mix", "MergedTrackTruth"),