Merge pull request #36565 from mmusich/furtherOptSiPixelLorentzAngleP…

…CLWorker Further optimization of the SiPixel LA PCL workflow
cms-sw · Jan 4, 2022 · 1445eda · 1445eda
2 parents ca33c02 + 753902a
commit 1445eda
Show file tree

Hide file tree

Showing 6 changed files with 395 additions and 274 deletions.
diff --git a/CalibTracker/SiPixelLorentzAngle/interface/SiPixelLorentzAngleCalibrationStruct.h b/CalibTracker/SiPixelLorentzAngle/interface/SiPixelLorentzAngleCalibrationStruct.h
@@ -13,7 +13,7 @@ struct SiPixelLorentzAngleCalibrationHistograms {
   int nlay;
   std::vector<int> nModules_;
   std::vector<std::string> BPixnewmodulename_;
-  std::vector<int> BPixnewDetIds_;
+  std::vector<unsigned int> BPixnewDetIds_;
   std::vector<int> BPixnewModule_;
   std::vector<int> BPixnewLayer_;
 
@@ -34,6 +34,15 @@ struct SiPixelLorentzAngleCalibrationHistograms {
   dqm::reco::MonitorElement* h_trackPhi_;
   dqm::reco::MonitorElement* h_trackPt_;
   dqm::reco::MonitorElement* h_trackChi2_;
+
+  // per-sector measurements
+  dqm::reco::MonitorElement* h_bySectOccupancy_;
+  dqm::reco::MonitorElement* h_bySectMeasLA_;
+  dqm::reco::MonitorElement* h_bySectSetLA_;
+  dqm::reco::MonitorElement* h_bySectRejectLA_;
+  dqm::reco::MonitorElement* h_bySectLA_;
+  dqm::reco::MonitorElement* h_bySectDeltaLA_;
+  dqm::reco::MonitorElement* h_bySectChi2_;
 };
 
 #endif
diff --git a/CalibTracker/SiPixelLorentzAngle/python/SiPixelLorentzAnglePCLHarvester_cfi.py b/CalibTracker/SiPixelLorentzAngle/python/SiPixelLorentzAnglePCLHarvester_cfi.py
@@ -1,11 +1,8 @@
 import FWCore.ParameterSet.Config as cms
-from DQMServices.Core.DQMEDHarvester import DQMEDHarvester
 from CalibTracker.SiPixelLorentzAngle.SiPixelLorentzAnglePCLWorker_cfi import SiPixelLorentzAnglePCLWorker as worker
+from CalibTracker.SiPixelLorentzAngle.siPixelLorentzAnglePCLHarvester_cfi import siPixelLorentzAnglePCLHarvester as _defaultHarvester
 
-SiPixelLorentzAnglePCLHarvester = DQMEDHarvester(
-    "SiPixelLorentzAnglePCLHarvester",
-    newmodulelist = cms.vstring(worker.newmodulelist.value()), # taken from worker configuration, need to stay in synch
-    dqmDir = cms.string(worker.folder.value()), # taken from worker configuration, need to stay in synch
-    record = cms.string("SiPixelLorentzAngleRcd"),
-    fitProbCut = cms.double(0.5)
+SiPixelLorentzAnglePCLHarvester = _defaultHarvester.clone(
+    newmodulelist = worker.newmodulelist.value(), # taken from worker configuration, need to stay in synch
+    dqmDir = worker.folder.value(), # taken from worker configuration, need to stay in synch
 )
diff --git a/CalibTracker/SiPixelLorentzAngle/python/SiPixelLorentzAnglePCLWorker_cfi.py b/CalibTracker/SiPixelLorentzAngle/python/SiPixelLorentzAnglePCLWorker_cfi.py
@@ -1,27 +1,26 @@
 import FWCore.ParameterSet.Config as cms
 
-from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer
-SiPixelLorentzAnglePCLWorker = DQMEDAnalyzer(
-    "SiPixelLorentzAnglePCLWorker",
-    folder = cms.string('AlCaReco/SiPixelLorentzAngle'),
-    notInPCL = cms.bool(False),
-    fileName = cms.string('testrun.root'),
-    newmodulelist = cms.vstring("BPix_BmI_SEC7_LYR2_LDR12F_MOD1",
-                                "BPix_BmI_SEC8_LYR2_LDR14F_MOD1",
-                                "BPix_BmO_SEC3_LYR2_LDR5F_MOD1",
-                                "BPix_BmO_SEC3_LYR2_LDR5F_MOD2",
-                                "BPix_BmO_SEC3_LYR2_LDR5F_MOD3",
-                                "BPix_BpO_SEC1_LYR2_LDR1F_MOD1",
-                                "BPix_BpO_SEC1_LYR2_LDR1F_MOD2",
-                                "BPix_BpO_SEC1_LYR2_LDR1F_MOD3"),
-    src = cms.InputTag("TrackRefitter"),
-    binsDepth    = cms.int32(50),
-    binsDrift =    cms.int32(200),
-    ptMin = cms.double(3),
-    normChi2Max = cms.double(2),
-    clustSizeYMin = cms.int32(4),
-    clustSizeYMinL4 = cms.int32(3),
-    clustSizeXMax = cms.int32(5),
-    residualMax = cms.double(0.005),
-    clustChargeMaxPerLength = cms.double(50000)
-)
+from CalibTracker.SiPixelLorentzAngle.siPixelLorentzAnglePCLWorker_cfi import siPixelLorentzAnglePCLWorker as _defaultWorker
+SiPixelLorentzAnglePCLWorker = _defaultWorker.clone()
+
+## modules replaced over 2017/2018 EOY shutdown, "new" in 2018
+from Configuration.Eras.Modifier_run2_SiPixel_2018_cff import run2_SiPixel_2018
+run2_SiPixel_2018.toModify(SiPixelLorentzAnglePCLWorker, newmodulelist = ["BPix_BpO_SEC1_LYR1_LDR1F_MOD3", # 303054876
+                                                                          "BPix_BpO_SEC4_LYR1_LDR3F_MOD3", # 303063068
+                                                                          "BPix_BmO_SEC2_LYR1_LDR1F_MOD1", # 303054864
+                                                                          "BPix_BmO_SEC1_LYR1_LDR1F_MOD3", # 303054856
+                                                                          "BPix_BmO_SEC4_LYR1_LDR3F_MOD1", # 303063056
+                                                                          "BPix_BmO_SEC7_LYR1_LDR5F_MOD1"  # 303071248
+                                                                          ])
+
+## modules replaced over LS2 ("new from 2021 onwards)
+from Configuration.Eras.Modifier_run3_common_cff import run3_common
+run3_common.toModify(SiPixelLorentzAnglePCLWorker, newmodulelist = ["BPix_BmI_SEC7_LYR2_LDR12F_MOD1", # 304185360
+                                                                    "BPix_BmI_SEC8_LYR2_LDR14F_MOD1", # 304177168
+                                                                    "BPix_BmO_SEC3_LYR2_LDR5F_MOD1",  # 304136208
+                                                                    "BPix_BmO_SEC3_LYR2_LDR5F_MOD2",  # 304136204
+                                                                    "BPix_BmO_SEC3_LYR2_LDR5F_MOD3",  # 304136200
+                                                                    "BPix_BpO_SEC1_LYR2_LDR1F_MOD1",  # 304119828
+                                                                    "BPix_BpO_SEC1_LYR2_LDR1F_MOD2",  # 304119832
+                                                                    "BPix_BpO_SEC1_LYR2_LDR1F_MOD3"   # 304119836
+                                                                    ])
diff --git a/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.cc b/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.cc
@@ -29,7 +29,6 @@
 #include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
 #include "TrackingTools/TransientTrack/interface/TransientTrack.h"
 #include "SiPixelLorentzAngle.h"
-int lower_bin_;
 
 using namespace std;
 using namespace edm;