Skip to content

Commit

Permalink
further improvements in CalibTracker/SiStripHit* plugins
Browse files Browse the repository at this point in the history
  • Loading branch information
@mmusich
mmusich committed May 29, 2024
1 parent 75a6c3d commit 45d22a4
Show file tree
Hide file tree
Showing 3 changed files with 122 additions and 85 deletions.
100 changes: 59 additions & 41 deletions CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEffFromCalibTree.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ class SiStripHitEffFromCalibTree : public ConditionDBWriter<SiStripBadStrip> {
void totalStatistics();
void makeSummary();
void makeSummaryVsBx();
void computeEff(vector<TH1F*>& vhfound, vector<TH1F*>& vhtotal, string name);
void computeEff(vector<TH1F*>& vhfound, vector<TH1F*>& vhtotal, string name, vector<TGraphAsymmErrors*> geff);
void makeSummaryVsLumi();
void makeSummaryVsCM();
TString getLayerSideName(Long_t k);
Expand Down Expand Up @@ -172,11 +172,11 @@ class SiStripHitEffFromCalibTree : public ConditionDBWriter<SiStripBadStrip> {
vector<hit> hits[::k_END_OF_LAYERS];
vector<TH2F*> HotColdMaps;
map<unsigned int, pair<unsigned int, unsigned int> > modCounter[::k_END_OF_LAYERS];
TrackerMap* tkmap;
TrackerMap* tkmapbad;
TrackerMap* tkmapeff;
TrackerMap* tkmapnum;
TrackerMap* tkmapden;
TrackerMap* tkmap{nullptr};
TrackerMap* tkmapbad{nullptr};
TrackerMap* tkmapeff{nullptr};
TrackerMap* tkmapnum{nullptr};
TrackerMap* tkmapden{nullptr};
long layerfound[::k_END_OF_LAYERS];
long layertotal[::k_END_OF_LAYERS];
map<unsigned int, vector<int> > layerfound_perBx;
Expand All @@ -189,6 +189,11 @@ class SiStripHitEffFromCalibTree : public ConditionDBWriter<SiStripBadStrip> {
vector<TH1F*> layertotal_vsCM;
vector<TH1F*> layerfound_vsBX;
vector<TH1F*> layertotal_vsBX;
vector<TGraphAsymmErrors*> geff_vsBX;
vector<TGraphAsymmErrors*> geff_avg_vsBX;
vector<TGraphAsymmErrors*> geff_avg_vsLumi;
vector<TGraphAsymmErrors*> geff_avg_vsPU;
vector<TGraphAsymmErrors*> geff_avg_vsCM;
int goodlayertotal[::k_END_OF_LAYS_AND_RINGS];
int goodlayerfound[::k_END_OF_LAYS_AND_RINGS];
int alllayertotal[::k_END_OF_LAYS_AND_RINGS];
Expand Down Expand Up @@ -239,6 +244,11 @@ SiStripHitEffFromCalibTree::SiStripHitEffFromCalibTree(const edm::ParameterSet&
layertotal_vsCM.reserve(::k_END_OF_LAYERS);
layerfound_vsBX.reserve(::k_END_OF_LAYERS);
layertotal_vsBX.reserve(::k_END_OF_LAYERS);
geff_vsBX.reserve(::k_END_OF_LAYERS);
geff_avg_vsBX.reserve(::k_END_OF_LAYERS);
geff_avg_vsLumi.reserve(::k_END_OF_LAYERS);
geff_avg_vsPU.reserve(::k_END_OF_LAYERS);
geff_avg_vsCM.reserve(::k_END_OF_LAYERS);
}

namespace utils {
Expand Down Expand Up @@ -296,8 +306,7 @@ SiStripHitEffFromCalibTree::~SiStripHitEffFromCalibTree() {
edm::LogPrint("") << __PRETTY_FUNCTION__ << " File has inconsistent hash: " << tFile.HasInconsistentHash()
<< std::endl;

bool debug{false};

bool debug{false}; // the following is only used for debugging purposes
if (!tFile.IsZombie() && tFile.IsWritable() && debug) {
// Delete all objects in the file recursively
utils::Recursion(&tFile, &tFile);
Expand Down Expand Up @@ -359,7 +368,7 @@ void SiStripHitEffFromCalibTree::algoAnalyze(const edm::Event& e, const edm::Eve

TH1F* resolutionPlots[::k_END_OF_LAYERS];
for (Long_t ilayer = 0; ilayer < ::k_END_OF_LAYERS; ilayer++) {
std::string lyrName = ::layerName(ilayer, showRings_, nTEClayers);
std::string lyrName = ::layerName(ilayer + 1, showRings_, nTEClayers);

resolutionPlots[ilayer] = fs->make<TH1F>(Form("resol_layer_%i", (int)(ilayer)), lyrName.c_str(), 125, -125, 125);
resolutionPlots[ilayer]->GetXaxis()->SetTitle("trajX-clusX [strip unit]");
Expand All @@ -378,11 +387,35 @@ void SiStripHitEffFromCalibTree::algoAnalyze(const edm::Event& e, const edm::Eve
layertotal_vsBX.push_back(fs->make<TH1F>(
Form("totalVsBx_layer%i", (int)ilayer), Form("layer %i", (int)ilayer), nBxInAnOrbit_, 0, nBxInAnOrbit_));

geff_vsBX.push_back(fs->make<TGraphAsymmErrors>(nBxInAnOrbit_ - 1));
geff_vsBX[ilayer]->SetName(Form("effVsBx_layer%i", (int)ilayer));
geff_vsBX[ilayer]->SetTitle(fmt::format("Hit Efficiency vs bx - {}", lyrName).c_str());

geff_avg_vsBX.push_back(fs->make<TGraphAsymmErrors>(nBxInAnOrbit_ - 1));
geff_avg_vsBX[ilayer]->SetName(Form("effVsBxAvg_layer%i", (int)ilayer));
geff_avg_vsBX[ilayer]->SetTitle(fmt::format("Hit Efficiency vs bx - {}", lyrName).c_str());
geff_avg_vsBX[ilayer]->SetMarkerStyle(20);

geff_avg_vsLumi.push_back(fs->make<TGraphAsymmErrors>(99));
geff_avg_vsLumi[ilayer]->SetName(Form("effVsLumiAvg_layer%i", (int)ilayer));
geff_avg_vsLumi[ilayer]->SetTitle(fmt::format("Hit Efficiency vs inst. lumi. - {}", lyrName).c_str());
geff_avg_vsLumi[ilayer]->SetMarkerStyle(20);

geff_avg_vsPU.push_back(fs->make<TGraphAsymmErrors>(44));
geff_avg_vsPU[ilayer]->SetName(Form("effVsPUAvg_layer%i", (int)ilayer));
geff_avg_vsPU[ilayer]->SetTitle(fmt::format("Hit Efficiency vs pileup - {}", lyrName).c_str());
geff_avg_vsPU[ilayer]->SetMarkerStyle(20);

if (useCM_) {
layerfound_vsCM.push_back(
fs->make<TH1F>(Form("layerfound_vsCM_layer_%i", (int)(ilayer)), lyrName.c_str(), 20, 0, 400));
layertotal_vsCM.push_back(
fs->make<TH1F>(Form("layertotal_vsCM_layer_%i", (int)(ilayer)), lyrName.c_str(), 20, 0, 400));

geff_avg_vsCM.push_back(fs->make<TGraphAsymmErrors>(19));
geff_avg_vsCM[ilayer]->SetName(Form("effVsCMAvg_layer%i", (int)ilayer));
geff_avg_vsCM[ilayer]->SetTitle(fmt::format("Hit Efficiency vs common Mode - {}", lyrName).c_str());
geff_avg_vsCM[ilayer]->SetMarkerStyle(20);
}
layertotal[ilayer] = 0;
layerfound[ilayer] = 0;
Expand Down Expand Up @@ -1528,7 +1561,7 @@ void SiStripHitEffFromCalibTree::makeSummaryVsBx() {
if (showRings_)
nLayers = 20;

for (unsigned int ilayer = 1; ilayer < nLayers; ilayer++) {
for (unsigned int ilayer = 0; ilayer <= nLayers; ilayer++) {
for (unsigned int ibx = 0; ibx <= nBxInAnOrbit_; ibx++) {
layerfound_vsBX[ilayer]->SetBinContent(ibx, 1e-6);
layertotal_vsBX[ilayer]->SetBinContent(ibx, 1);
Expand All @@ -1546,17 +1579,9 @@ void SiStripHitEffFromCalibTree::makeSummaryVsBx() {
layerfound_vsBX[ilayer]->Sumw2();
layertotal_vsBX[ilayer]->Sumw2();

TGraphAsymmErrors* geff = fs->make<TGraphAsymmErrors>(nBxInAnOrbit_ - 1);
geff->SetName(Form("effVsBx_layer%i", ilayer));

geff->SetTitle(fmt::format("Hit Efficiency vs bx - {}", ::layerName(ilayer, showRings_, nTEClayers)).c_str());
geff->BayesDivide(layerfound_vsBX[ilayer], layertotal_vsBX[ilayer]);
geff_vsBX[ilayer]->BayesDivide(layerfound_vsBX[ilayer], layertotal_vsBX[ilayer]);

//Average over trains
TGraphAsymmErrors* geff_avg = fs->make<TGraphAsymmErrors>();
geff_avg->SetName(Form("effVsBxAvg_layer%i", ilayer));
geff_avg->SetTitle(fmt::format("Hit Efficiency vs bx - {}", ::layerName(ilayer, showRings_, nTEClayers)).c_str());
geff_avg->SetMarkerStyle(20);
int ibx = 0;
int previous_bx = -80;
int delta_bx = 0;
Expand All @@ -1574,10 +1599,11 @@ void SiStripHitEffFromCalibTree::makeSummaryVsBx() {
if (delta_bx > (int)spaceBetweenTrains_ && nbx > 0 && total > 0) {
eff = found / (float)total;
//LOGPRINT<<"new train "<<ipt<<" "<<sum_bx/nbx<<" "<<eff<<endl;
geff_avg->SetPoint(ipt, sum_bx / nbx, eff);
geff_avg_vsBX[ilayer]->SetPoint(ipt, sum_bx / nbx, eff);
low = TEfficiency::Bayesian(total, found, .683, 1, 1, false);
up = TEfficiency::Bayesian(total, found, .683, 1, 1, true);
geff_avg->SetPointError(ipt, sum_bx / nbx - firstbx, previous_bx - sum_bx / nbx, eff - low, up - eff);
geff_avg_vsBX[ilayer]->SetPointError(
ipt, sum_bx / nbx - firstbx, previous_bx - sum_bx / nbx, eff - low, up - eff);
ipt++;
sum_bx = 0;
found = 0;
Expand All @@ -1595,22 +1621,25 @@ void SiStripHitEffFromCalibTree::makeSummaryVsBx() {
//last train
eff = found / (float)total;
//LOGPRINT<<"new train "<<ipt<<" "<<sum_bx/nbx<<" "<<eff<<endl;
geff_avg->SetPoint(ipt, sum_bx / nbx, eff);
geff_avg_vsBX[ilayer]->SetPoint(ipt, sum_bx / nbx, eff);
low = TEfficiency::Bayesian(total, found, .683, 1, 1, false);
up = TEfficiency::Bayesian(total, found, .683, 1, 1, true);
geff_avg->SetPointError(ipt, sum_bx / nbx - firstbx, previous_bx - sum_bx / nbx, eff - low, up - eff);
geff_avg_vsBX[ilayer]->SetPointError(ipt, sum_bx / nbx - firstbx, previous_bx - sum_bx / nbx, eff - low, up - eff);
}
}

void SiStripHitEffFromCalibTree::computeEff(vector<TH1F*>& vhfound, vector<TH1F*>& vhtotal, string name) {
void SiStripHitEffFromCalibTree::computeEff(vector<TH1F*>& vhfound,
vector<TH1F*>& vhtotal,
string name,
vector<TGraphAsymmErrors*> geff) {
unsigned int nLayers = siStripLayers_;
if (showRings_)
nLayers = 20;

TH1F* hfound;
TH1F* htotal;

for (unsigned int ilayer = 1; ilayer < nLayers; ilayer++) {
for (unsigned int ilayer = 0; ilayer <= nLayers; ilayer++) {
hfound = vhfound[ilayer];
htotal = vhtotal[ilayer];

Expand All @@ -1625,18 +1654,7 @@ void SiStripHitEffFromCalibTree::computeEff(vector<TH1F*>& vhfound, vector<TH1F*
htotal->SetBinContent(i, 1);
}

TGraphAsymmErrors* geff = fs->make<TGraphAsymmErrors>(hfound->GetNbinsX());
geff->SetName(Form("%s_layer%i", name.c_str(), ilayer));
geff->BayesDivide(hfound, htotal);
if (name == "effVsLumi")
geff->SetTitle(
fmt::format("Hit Efficiency vs inst. lumi. - {}", ::layerName(ilayer, showRings_, nTEClayers)).c_str());
if (name == "effVsPU")
geff->SetTitle(fmt::format("Hit Efficiency vs pileup - {}", ::layerName(ilayer, showRings_, nTEClayers)).c_str());
if (name == "effVsCM")
geff->SetTitle(
fmt::format("Hit Efficiency vs common Mode - {}", ::layerName(ilayer, showRings_, nTEClayers)).c_str());
geff->SetMarkerStyle(20);
geff[ilayer]->BayesDivide(hfound, htotal);
}
}

Expand All @@ -1659,7 +1677,7 @@ void SiStripHitEffFromCalibTree::makeSummaryVsLumi() {
float avgPU = 0;

LOGPRINT << "Lumi summary: (avg over trajectory measurements)";
for (unsigned int ilayer = 1; ilayer < nLayers; ilayer++) {
for (unsigned int ilayer = 0; ilayer <= nLayers; ilayer++) {
layerLumi = layertotal_vsLumi[ilayer]->GetMean();
layerPU = layertotal_vsPU[ilayer]->GetMean();
//LOGPRINT<<" layer "<<ilayer<<" lumi: "<<layerLumi<<" pu: "<<layerPU<<endl;
Expand All @@ -1674,13 +1692,13 @@ void SiStripHitEffFromCalibTree::makeSummaryVsLumi() {
LOGPRINT << "Avg conditions: lumi :" << avgLumi << " pu: " << avgPU;
}

computeEff(layerfound_vsLumi, layertotal_vsLumi, "effVsLumi");
computeEff(layerfound_vsPU, layertotal_vsPU, "effVsPU");
computeEff(layerfound_vsLumi, layertotal_vsLumi, "effVsLumi", geff_avg_vsLumi);
computeEff(layerfound_vsPU, layertotal_vsPU, "effVsPU", geff_avg_vsPU);
}

void SiStripHitEffFromCalibTree::makeSummaryVsCM() {
LOGPRINT << "Computing efficiency vs CM";
computeEff(layerfound_vsCM, layertotal_vsCM, "effVsCM");
computeEff(layerfound_vsCM, layertotal_vsCM, "effVsCM", geff_avg_vsCM);
}

TString SiStripHitEffFromCalibTree::getLayerSideName(Long_t k) {
Expand Down
10 changes: 0 additions & 10 deletions CalibTracker/SiStripHitEfficiency/test/testHitEffWorker.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,7 @@
process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_data', '')

process.source = cms.Source("PoolSource", fileNames=cms.untracked.vstring(
# 10 random files, will need the rest later
"/store/express/Run2018D/StreamExpress/ALCARECO/SiStripCalMinBias-Express-v1/000/325/172/00000/E3D6AECF-3F12-6540-97DC-4A6994CFEBF3.root",
"/store/express/Run2018D/StreamExpress/ALCARECO/SiStripCalMinBias-Express-v1/000/325/172/00000/242566C3-0540-8C43-8D6E-BB42C1FE0BB5.root",
"/store/express/Run2018D/StreamExpress/ALCARECO/SiStripCalMinBias-Express-v1/000/325/172/00000/BC8C0839-F645-B948-9040-15FCB5D50472.root",
"/store/express/Run2018D/StreamExpress/ALCARECO/SiStripCalMinBias-Express-v1/000/325/172/00000/3A806401-2CBC-4345-A5CB-593AABD4BE4E.root",
"/store/express/Run2018D/StreamExpress/ALCARECO/SiStripCalMinBias-Express-v1/000/325/172/00000/852C3C1E-2BD4-A843-A65B-51110A503FBD.root",
"/store/express/Run2018D/StreamExpress/ALCARECO/SiStripCalMinBias-Express-v1/000/325/172/00000/B795F9A0-4681-A34A-B879-E33A0DEC8720.root",
"/store/express/Run2018D/StreamExpress/ALCARECO/SiStripCalMinBias-Express-v1/000/325/172/00000/3A0884F2-A395-C541-8EFB-740C45A57CCE.root",
"/store/express/Run2018D/StreamExpress/ALCARECO/SiStripCalMinBias-Express-v1/000/325/172/00000/D274E7C1-5A9D-A544-B9B3-6A30166FC16C.root",
"/store/express/Run2018D/StreamExpress/ALCARECO/SiStripCalMinBias-Express-v1/000/325/172/00000/C4D243DC-2A09-CF42-A050-7678EF4A90D7.root",
"/store/express/Run2018D/StreamExpress/ALCARECO/SiStripCalMinBias-Express-v1/000/325/172/00000/7946A89D-8AC5-6B4F-BAD2-AE3B971865C5.root",
))

if(options.isUnitTest):
Expand Down
Loading

0 comments on commit 45d22a4

Please sign in to comment.