Skip to content

CalibTracker/SiStripChannelGain: fix issue with ODR of stAPVGain struct #38652

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

Merged
cmsbuild merged 3 commits into from
Jul 9, 2022
Merged

CalibTracker/SiStripChannelGain: fix issue with ODR of stAPVGain struct #38652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0dd60f
fix issue with ODR of stAPVGain struct
mmusich Jul 8, 2022
a387b49
fill the APV->Side method in the PCL workflow
mmusich Jul 8, 2022
0441677
fix bug in the detector side for SiStripGainFromData
mmusich Jul 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CalibTracker/SiStripChannelGain/interface/APVGainStruct.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ struct stAPVGain {
TH1F* HCharge;
TH1F* HChargeN;
bool isMasked;
char Side;
};

struct APVloc {
Expand Down
2 changes: 1 addition & 1 deletion CalibTracker/SiStripChannelGain/interface/SiStripGainsPCLHarvester.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class SiStripGainsPCLHarvester : public DQMEDHarvester {
std::vector<std::shared_ptr<stAPVGain> > APVsCollOrdered;
std::unordered_map<unsigned int, std::shared_ptr<stAPVGain> > APVsColl;

edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken_;
edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoTokenBR_, tTopoTokenER_;
edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> tkGeomToken_;
edm::ESGetToken<SiStripGain, SiStripGainRcd> gainToken_;
edm::ESGetToken<SiStripQuality, SiStripQualityRcd> qualityToken_;
Expand Down
6 changes: 4 additions & 2 deletions CalibTracker/SiStripChannelGain/interface/SiStripGainsPCLWorker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,9 @@ class SiStripGainsPCLWorker : public DQMGlobalEDAnalyzer<APVGain::APVGainHistogr

private:
void dqmBeginRun(edm::Run const &, edm::EventSetup const &, APVGain::APVGainHistograms &) const override;
void checkBookAPVColls(const TrackerGeometry *bareTkGeomPtr, APVGain::APVGainHistograms &histograms) const;
void checkBookAPVColls(const TrackerGeometry *bareTkGeomPtr,
const TrackerTopology *bareTkTopoPtr,
APVGain::APVGainHistograms &histograms) const;

std::vector<std::string> dqm_tag_;

Expand Down Expand Up @@ -114,7 +116,7 @@ class SiStripGainsPCLWorker : public DQMGlobalEDAnalyzer<APVGain::APVGainHistogr
edm::EDGetTokenT<edm::View<reco::Track>> m_tracks_token;
edm::EDGetTokenT<TrajTrackAssociationCollection> m_association_token;

edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken_;
edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoTokenBR_, tTopoToken_;
edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> tkGeomTokenBR_, tkGeomToken_;
edm::ESGetToken<SiStripGain, SiStripGainRcd> gainToken_;
edm::ESGetToken<SiStripQuality, SiStripQualityRcd> qualityToken_;
Expand Down
146 changes: 61 additions & 85 deletions CalibTracker/SiStripChannelGain/plugins/SiStripGainFromData.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,57 +1,53 @@
// Original Author: Loic QUERTENMONT
// Created: Wed Feb 6 08:55:18 CET 2008

// system includes
#include <memory>
#include <unordered_map>

#include "FWCore/Framework/interface/Frameworkfwd.h"
// user includes
#include "CalibFormats/SiStripObjects/interface/SiStripDetCabling.h"
#include "CalibFormats/SiStripObjects/interface/SiStripGain.h"
#include "CalibTracker/Records/interface/SiStripDetCablingRcd.h"
#include "CalibTracker/Records/interface/SiStripGainRcd.h"
#include "CalibTracker/SiStripChannelGain/interface/APVGainStruct.h"
#include "CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h"
#include "CondFormats/SiStripObjects/interface/SiStripApvGain.h"
#include "DQMServices/Core/interface/DQMStore.h"
#include "DataFormats/DetId/interface/DetId.h"
#include "DataFormats/FEDRawData/interface/FEDNumbering.h"
#include "DataFormats/GeometrySurface/interface/RectangularPlaneBounds.h"
#include "DataFormats/GeometrySurface/interface/TrapezoidalPlaneBounds.h"
#include "DataFormats/SiStripCluster/interface/SiStripClusterCollection.h"
#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
#include "DataFormats/TrackReco/interface/DeDxHit.h"
#include "DataFormats/TrackReco/interface/Track.h"
#include "DataFormats/TrackReco/interface/TrackDeDxHits.h"
#include "DataFormats/TrackReco/interface/TrackFwd.h"
#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
#include "DataFormats/TrackerRecHit2D/interface/SiStripMatchedRecHit2D.h"
#include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit1D.h"
#include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2D.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/Utilities/interface/Exception.h"

#include "Geometry/CommonDetUnit/interface/GeomDet.h"
#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h"
#include "Geometry/CommonTopologies/interface/StripTopology.h"
#include "DataFormats/GeometrySurface/interface/TrapezoidalPlaneBounds.h"
#include "DataFormats/GeometrySurface/interface/RectangularPlaneBounds.h"

#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/Records/interface/TrackerTopologyRcd.h"
#include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h"

#include "DataFormats/SiStripCluster/interface/SiStripClusterCollection.h"

#include "CalibFormats/SiStripObjects/interface/SiStripDetCabling.h"
#include "CalibTracker/Records/interface/SiStripDetCablingRcd.h"

#include "DataFormats/FEDRawData/interface/FEDNumbering.h"
#include "DataFormats/TrackReco/interface/Track.h"
#include "DataFormats/TrackReco/interface/TrackFwd.h"
#include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit1D.h"
#include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2D.h"
#include "DataFormats/TrackerRecHit2D/interface/SiStripMatchedRecHit2D.h"
#include "DataFormats/DetId/interface/DetId.h"
#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
#include "Geometry/Records/interface/TrackerTopologyRcd.h"
#include "DataFormats/TrackReco/interface/DeDxHit.h"
#include "DataFormats/TrackReco/interface/TrackDeDxHits.h"

#include "CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h"
#include "CondFormats/SiStripObjects/interface/SiStripApvGain.h"

#include "TrackingTools/PatternTools/interface/Trajectory.h"
#include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
#include "TrackingTools/PatternTools/interface/Trajectory.h"

#include "DQMServices/Core/interface/DQMStore.h"

#include "CalibFormats/SiStripObjects/interface/SiStripGain.h"
#include "CalibTracker/Records/interface/SiStripGainRcd.h"

// ROOT inclues
#include "TFile.h"
#include "TObjString.h"
#include "TString.h"
Expand All @@ -61,34 +57,16 @@
#include "TF1.h"
#include "TROOT.h"

#include <unordered_map>
#include <memory>

using namespace edm;
using namespace reco;
using namespace std;

struct stAPVGain {
unsigned int Index;
int DetId;
int APVId;
int SubDet;
float Eta;
float R;
float Phi;
float Thickness;
double MPV;
double Gain;
double PreviousGain;
char Side;
};

class SiStripGainFromData : public ConditionDBWriter<SiStripApvGain> {
public:
typedef dqm::legacy::MonitorElement MonitorElement;
typedef dqm::legacy::DQMStore DQMStore;
explicit SiStripGainFromData(const edm::ParameterSet&);
~SiStripGainFromData() override;
~SiStripGainFromData() override = default;

private:
void algoBeginJob(const edm::EventSetup&) override;
Expand Down Expand Up @@ -338,8 +316,6 @@ SiStripGainFromData::SiStripGainFromData(const edm::ParameterSet& iConfig)
// dqmStore_->open(OutputHistos.c_str(), true);
}

SiStripGainFromData::~SiStripGainFromData() {}

void SiStripGainFromData::algoBeginJob(const edm::EventSetup& iSetup) {
const TrackerTopology* const tTopo = &iSetup.getData(tTopoToken_);

Expand Down Expand Up @@ -601,7 +577,7 @@ void SiStripGainFromData::algoBeginJob(const edm::EventSetup& iSetup) {
APV->DetId = Detid.rawId();
APV->APVId = j;
APV->SubDet = SubDet;
APV->MPV = -1;
APV->FitMPV = -1;
APV->Gain = -1;
APV->PreviousGain = 1;
APV->Eta = Eta;
Expand All @@ -611,7 +587,7 @@ void SiStripGainFromData::algoBeginJob(const edm::EventSetup& iSetup) {
APV->Side = 0;

if (SubDet == StripSubdetector::TID) {
APV->Side = tTopo->tecSide(Detid);
APV->Side = tTopo->tidSide(Detid);
} else if (SubDet == StripSubdetector::TEC) {
APV->Side = tTopo->tecSide(Detid);
}
Expand Down Expand Up @@ -780,44 +756,44 @@ void SiStripGainFromData::algoEndJob() {
//std::cout << "Proj->GetEntries(): " << Proj->GetEntries() << ", Proj->GetMean(): " << Proj->GetMean() << std::endl;

getPeakOfLandau(Proj, FitResults);
APV->MPV = FitResults[0];
APV->FitMPV = FitResults[0];
// printf("MPV = %f - %f\n",FitResults[0], FitResults[1]);
if (FitResults[0] != -0.5 && FitResults[1] < MaxMPVError) {
APV_MPV->Fill(APV->Index, APV->MPV);
MPVs->Fill(APV->MPV);
APV_MPV->Fill(APV->Index, APV->FitMPV);
MPVs->Fill(APV->FitMPV);
if (APV->Thickness < 0.04)
MPVs320->Fill(APV->MPV);
MPVs320->Fill(APV->FitMPV);
if (APV->Thickness > 0.04)
MPVs500->Fill(APV->MPV);
MPVs500->Fill(APV->FitMPV);

MPV_Vs_R->Fill(APV->R, APV->MPV);
MPV_Vs_Eta->Fill(APV->Eta, APV->MPV);
MPV_Vs_R->Fill(APV->R, APV->FitMPV);
MPV_Vs_Eta->Fill(APV->Eta, APV->FitMPV);
if (APV->SubDet == StripSubdetector::TIB)
MPV_Vs_EtaTIB->Fill(APV->Eta, APV->MPV);
MPV_Vs_EtaTIB->Fill(APV->Eta, APV->FitMPV);
if (APV->SubDet == StripSubdetector::TID)
MPV_Vs_EtaTID->Fill(APV->Eta, APV->MPV);
MPV_Vs_EtaTID->Fill(APV->Eta, APV->FitMPV);
if (APV->SubDet == StripSubdetector::TOB)
MPV_Vs_EtaTOB->Fill(APV->Eta, APV->MPV);
MPV_Vs_EtaTOB->Fill(APV->Eta, APV->FitMPV);
if (APV->SubDet == StripSubdetector::TEC) {
MPV_Vs_EtaTEC->Fill(APV->Eta, APV->MPV);
MPV_Vs_EtaTEC->Fill(APV->Eta, APV->FitMPV);
if (APV->Thickness < 0.04)
MPV_Vs_EtaTEC1->Fill(APV->Eta, APV->MPV);
MPV_Vs_EtaTEC1->Fill(APV->Eta, APV->FitMPV);
if (APV->Thickness > 0.04)
MPV_Vs_EtaTEC2->Fill(APV->Eta, APV->MPV);
MPV_Vs_EtaTEC2->Fill(APV->Eta, APV->FitMPV);
}
MPV_Vs_Phi->Fill(APV->Phi, APV->MPV);
MPV_Vs_Phi->Fill(APV->Phi, APV->FitMPV);
if (APV->SubDet == StripSubdetector::TIB)
MPV_Vs_PhiTIB->Fill(APV->Phi, APV->MPV);
MPV_Vs_PhiTIB->Fill(APV->Phi, APV->FitMPV);
if (APV->SubDet == StripSubdetector::TID)
MPV_Vs_PhiTID->Fill(APV->Phi, APV->MPV);
MPV_Vs_PhiTID->Fill(APV->Phi, APV->FitMPV);
if (APV->SubDet == StripSubdetector::TOB)
MPV_Vs_PhiTOB->Fill(APV->Phi, APV->MPV);
MPV_Vs_PhiTOB->Fill(APV->Phi, APV->FitMPV);
if (APV->SubDet == StripSubdetector::TEC) {
MPV_Vs_PhiTEC->Fill(APV->Phi, APV->MPV);
MPV_Vs_PhiTEC->Fill(APV->Phi, APV->FitMPV);
if (APV->Thickness < 0.04)
MPV_Vs_PhiTEC1->Fill(APV->Phi, APV->MPV);
MPV_Vs_PhiTEC1->Fill(APV->Phi, APV->FitMPV);
if (APV->Thickness > 0.04)
MPV_Vs_PhiTEC2->Fill(APV->Phi, APV->MPV);
MPV_Vs_PhiTEC2->Fill(APV->Phi, APV->FitMPV);
}

if (APV->SubDet == StripSubdetector::TIB)
Expand Down Expand Up @@ -891,8 +867,8 @@ void SiStripGainFromData::algoEndJob() {
double MPVmean = 300.; //MPVs->GetMean();
for (auto it = APVsColl.begin(); it != APVsColl.end(); it++) {
stAPVGain* APV = it->second;
if (APV->MPV > 0) {
APV->Gain = APV->MPV / MPVmean; // APV->MPV;
if (APV->FitMPV > 0) {
APV->Gain = APV->FitMPV / MPVmean; // APV->FitMPV;
GOOD++;
} else {
NoMPV_Vs_EtaPhi->Fill(APV->Eta, APV->Phi);
Expand Down Expand Up @@ -1105,11 +1081,11 @@ void SiStripGainFromData::algoEndJob() {
APV->Gain);
}

std::vector<int> DetIdOfBuggedAPV;
std::vector<unsigned int> DetIdOfBuggedAPV;
fprintf(Gains, "----------------------------------------------------------------------\n");
for (std::vector<stAPVGain*>::iterator it = APVsCollOrdered.begin(); it != APVsCollOrdered.end(); it++) {
stAPVGain* APV = *it;
if (APV->MPV > 0 && APV->MPV < 200) {
if (APV->FitMPV > 0 && APV->FitMPV < 200) {
bool tmpBug = false;
for (unsigned int b = 0; b < DetIdOfBuggedAPV.size() && !tmpBug; b++) {
if (DetIdOfBuggedAPV[b] == APV->DetId)
Expand Down Expand Up @@ -1493,7 +1469,7 @@ std::unique_ptr<SiStripApvGain> SiStripGainFromData::getNewObject() {

auto obj = std::make_unique<SiStripApvGain>();
std::vector<float>* theSiStripVector = nullptr;
int PreviousDetId = -1;
unsigned int PreviousDetId = -1;
for (unsigned int a = 0; a < APVsCollOrdered.size(); a++) {
stAPVGain* APV = APVsCollOrdered[a];
if (APV == nullptr) {
Expand Down
15 changes: 13 additions & 2 deletions CalibTracker/SiStripChannelGain/src/SiStripGainsPCLHarvester.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ SiStripGainsPCLHarvester::SiStripGainsPCLHarvester(const edm::ParameterSet& ps)
dqm_tag_.push_back("IsoMuon0T"); // statistic collection from Isolated Muon @ 0 T
dqm_tag_.push_back("Harvest"); // statistic collection: Harvest

tTopoToken_ = esConsumes<edm::Transition::EndRun>();
tTopoTokenBR_ = esConsumes<edm::Transition::BeginRun>();
tTopoTokenER_ = esConsumes<edm::Transition::EndRun>();
tkGeomToken_ = esConsumes<edm::Transition::BeginRun>();
gainToken_ = esConsumes<edm::Transition::BeginRun>();
qualityToken_ = esConsumes<edm::Transition::BeginRun>();
Expand Down Expand Up @@ -686,6 +687,7 @@ bool SiStripGainsPCLHarvester::IsGoodLandauFit(double* FitResults) {
// ------------ method called once each job just before starting event loop ------------
void SiStripGainsPCLHarvester::checkBookAPVColls(const edm::EventSetup& es) {
auto newBareTkGeomPtr = &es.getData(tkGeomToken_);
auto bareTkTopoPtr = &es.getData(tTopoTokenBR_);
if (newBareTkGeomPtr == bareTkGeomPtr_)
return; // already filled APVColls, nothing changed

Expand All @@ -712,6 +714,14 @@ void SiStripGainsPCLHarvester::checkBookAPVColls(const edm::EventSetup& es) {
APV->Index = Index;
APV->Bin = -1;
APV->DetId = Detid.rawId();
APV->Side = 0;

if (SubDet == StripSubdetector::TID) {
APV->Side = bareTkTopoPtr->tidSide(Detid);
} else if (SubDet == StripSubdetector::TEC) {
APV->Side = bareTkTopoPtr->tecSide(Detid);
}

APV->APVId = j;
APV->SubDet = SubDet;
APV->FitMPV = -1;
Expand Down Expand Up @@ -761,6 +771,7 @@ void SiStripGainsPCLHarvester::checkBookAPVColls(const edm::EventSetup& es) {
APV->Index = Index;
APV->Bin = -1;
APV->DetId = Detid.rawId();
APV->Side = 0;
APV->APVId = (j << 3 | i);
APV->SubDet = SubDet;
APV->FitMPV = -1;
Expand Down Expand Up @@ -945,6 +956,6 @@ void SiStripGainsPCLHarvester::fillDescriptions(edm::ConfigurationDescriptions&
//********************************************************************************//
void SiStripGainsPCLHarvester::endRun(edm::Run const& run, edm::EventSetup const& isetup) {
if (!tTopo_) {
tTopo_ = std::make_unique<TrackerTopology>(isetup.getData(tTopoToken_));
tTopo_ = std::make_unique<TrackerTopology>(isetup.getData(tTopoTokenER_));
}
}
14 changes: 13 additions & 1 deletion CalibTracker/SiStripChannelGain/src/SiStripGainsPCLWorker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ SiStripGainsPCLWorker::SiStripGainsPCLWorker(const edm::ParameterSet& iConfig) {
m_association_token = consumes<TrajTrackAssociationCollection>(iConfig.getParameter<edm::InputTag>("tracks"));

tTopoToken_ = esConsumes();
tTopoTokenBR_ = esConsumes<edm::Transition::BeginRun>();
tkGeomTokenBR_ = esConsumes<edm::Transition::BeginRun>();
tkGeomToken_ = esConsumes<>();
gainToken_ = esConsumes<edm::Transition::BeginRun>();
Expand All @@ -69,7 +70,8 @@ void SiStripGainsPCLWorker::dqmBeginRun(edm::Run const& run,

// fills the APV collections at each begin run
const TrackerGeometry* bareTkGeomPtr = &iSetup.getData(tkGeomTokenBR_);
checkBookAPVColls(bareTkGeomPtr, histograms);
const TrackerTopology* bareTkTopoPtr = &iSetup.getData(tTopoTokenBR_);
checkBookAPVColls(bareTkGeomPtr, bareTkTopoPtr, histograms);

const auto gainHandle = iSetup.getHandle(gainToken_);
if (!gainHandle.isValid()) {
Expand Down Expand Up @@ -389,6 +391,7 @@ void SiStripGainsPCLWorker::dqmAnalyze(edm::Event const& iEvent,
//********************************************************************************//
// ------------ method called once each job just before starting event loop ------------
void SiStripGainsPCLWorker::checkBookAPVColls(const TrackerGeometry* bareTkGeomPtr,
const TrackerTopology* bareTkTopoPtr,
APVGain::APVGainHistograms& histograms) const {
if (bareTkGeomPtr) { // pointer not yet set: called the first time => fill the APVColls
auto const& Det = bareTkGeomPtr->dets();
Expand All @@ -415,6 +418,14 @@ void SiStripGainsPCLWorker::checkBookAPVColls(const TrackerGeometry* bareTkGeomP
APV->Index = Index;
APV->Bin = -1;
APV->DetId = Detid.rawId();
APV->Side = 0;

if (SubDet == StripSubdetector::TID) {
APV->Side = bareTkTopoPtr->tidSide(Detid);
} else if (SubDet == StripSubdetector::TEC) {
APV->Side = bareTkTopoPtr->tecSide(Detid);
}

APV->APVId = j;
APV->SubDet = SubDet;
APV->FitMPV = -1;
Expand Down Expand Up @@ -463,6 +474,7 @@ void SiStripGainsPCLWorker::checkBookAPVColls(const TrackerGeometry* bareTkGeomP
APV->Index = Index;
APV->Bin = -1;
APV->DetId = Detid.rawId();
APV->Side = 0;
APV->APVId = (j << 3 | i);
APV->SubDet = SubDet;
APV->FitMPV = -1;
Expand Down