Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Further optimization of the SiPixel LA PCL workflow #36565

Merged
merged 12 commits into from Jan 4, 2022
Merged

Further optimization of the SiPixel LA PCL workflow #36565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0d16b1a
memory optimization
mmusich Dec 19, 2021
7305fc5
make the list of new modules era-dependent
mmusich Dec 20, 2021
30597d1
fix bug in SiPixelLorentzAnglePCLHarvester, revert back to TH2D
mmusich Dec 20, 2021
91031d4
add monitoring by sector
mmusich Dec 21, 2021
de1a10b
remove std::endl; at the end of messageLogger statements
mmusich Dec 21, 2021
ad77839
spare two loops: move bin names setting to previous loop
mmusich Dec 21, 2021
50d7843
add some classes documentation
mmusich Dec 21, 2021
baa849b
silence complaint from SA
mmusich Dec 22, 2021
f3b565c
take parameters from fillDescriptions method
mmusich Dec 22, 2021
cf928c0
move booking of the sector monitoring histograms in the harvester, ch…
mmusich Dec 22, 2021
e7d8d71
reduce code-duplication in the SiPixelLorentzAnglePCLHarvester fitting
mmusich Dec 23, 2021
753902a
add monitoring of rejected / accepted measurements, delta w.r.t. default
mmusich Dec 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 10 additions & 1 deletion CalibTracker/SiPixelLorentzAngle/interface/SiPixelLorentzAngleCalibrationStruct.h
View file
Open in desktop
Expand Up @@ -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_;

Expand All @@ -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
11 changes: 4 additions & 7 deletions CalibTracker/SiPixelLorentzAngle/python/SiPixelLorentzAnglePCLHarvester_cfi.py
View file
Open in desktop
@@ -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
)
49 changes: 24 additions & 25 deletions CalibTracker/SiPixelLorentzAngle/python/SiPixelLorentzAnglePCLWorker_cfi.py
View file
Open in desktop
@@ -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
])
1 change: 0 additions & 1 deletion CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.cc
View file
Open in desktop
Expand Up @@ -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;
Expand Down