Skip to content

Commit

Permalink
apply code format
Browse files Browse the repository at this point in the history
  • Loading branch information
@sroychow
sroychow committed May 27, 2021
1 parent af07dd3 commit d6fb725
Show file tree
Hide file tree
Showing 9 changed files with 109 additions and 108 deletions.
9 changes: 4 additions & 5 deletions Validation/SiTrackerPhase2V/interface/Phase2OTValidateRecHitBase.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,17 @@
#include "DQMServices/Core/interface/MonitorElement.h"
#include "DataFormats/TrackerRecHit2D/interface/Phase2TrackerRecHit1D.h"


class Phase2OTValidateRecHitBase : public DQMEDAnalyzer {
public:
explicit Phase2OTValidateRecHitBase(const edm::ParameterSet&);
~Phase2OTValidateRecHitBase() override;
void bookHistograms(DQMStore::IBooker& ibooker, edm::Run const& iRun, edm::EventSetup const& iSetup) override;
void dqmBeginRun(const edm::Run& iRun, const edm::EventSetup& iSetup) override;
void fillOTRecHitHistos(const PSimHit* simhitClosest,
const Phase2TrackerRecHit1D* rechit,
const std::map<unsigned int, SimTrack>& selectedSimTrackMap,
std::map<std::string, unsigned int>& nrechitLayerMapP_primary,
std::map<std::string, unsigned int>& nrechitLayerMapS_primary);
const Phase2TrackerRecHit1D* rechit,
const std::map<unsigned int, SimTrack>& selectedSimTrackMap,
std::map<std::string, unsigned int>& nrechitLayerMapP_primary,
std::map<std::string, unsigned int>& nrechitLayerMapS_primary);

static void fillPSetDescription(edm::ParameterSetDescription& desc);
void bookLayerHistos(DQMStore::IBooker& ibooker, unsigned int det_id, std::string& subdir);
Expand Down
137 changes: 71 additions & 66 deletions Validation/SiTrackerPhase2V/plugins/Phase2ITRecHitHarvester.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,100 +10,107 @@
#include "DQM/SiTrackerPhase2/interface/TrackerPhase2HarvestingUtil.h"
class Phase2ITRecHitHarvester : public DQMEDHarvester {
public:
explicit Phase2ITRecHitHarvester(const edm::ParameterSet &);
explicit Phase2ITRecHitHarvester(const edm::ParameterSet&);
~Phase2ITRecHitHarvester() override;
void dqmEndJob(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter) override;
void dqmEndJob(DQMStore::IBooker& ibooker, DQMStore::IGetter& igetter) override;

static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);

private:
void gausFitslices(MonitorElement* srcME, MonitorElement* meanME, MonitorElement* sigmaME);
void dofitsForLayer(const std::string& iFolder, DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter);
void dofitsForLayer(const std::string& iFolder, DQMStore::IBooker& ibooker, DQMStore::IGetter& igetter);

// ----------member data ---------------------------
const edm::ParameterSet config_;
const std::string topFolder_;
const unsigned int nbarrelLayers_;
const unsigned int ndisk1Rings_;//FOR IT epix//FOR OT TEDD1 rings
const unsigned int ndisk2Rings_;//FOR IT epix//FOR OT TEDD2 rings
const unsigned int ndisk1Rings_; //FOR IT epix//FOR OT TEDD1 rings
const unsigned int ndisk2Rings_; //FOR IT epix//FOR OT TEDD2 rings
const unsigned int fitThreshold_;
const std::string ecapdisk1Name_;//FOR IT Epix//FOR OT TEDD_1
const std::string ecapdisk2Name_;//FOR IT Fpix//FOR OT TEDD_2
const std::string ecapdisk1Name_; //FOR IT Epix//FOR OT TEDD_1
const std::string ecapdisk2Name_; //FOR IT Fpix//FOR OT TEDD_2
const std::string histoPhiname_;
const std::string deltaXvsEtaname_;
const std::string deltaXvsPhiname_;
const std::string deltaYvsEtaname_;
const std::string deltaYvsPhiname_;

};

Phase2ITRecHitHarvester::Phase2ITRecHitHarvester(const edm::ParameterSet & iConfig) :
config_(iConfig),
topFolder_(iConfig.getParameter<std::string>("TopFolder")),
nbarrelLayers_(iConfig.getParameter<uint32_t>("NbarrelLayers")),
ndisk1Rings_(iConfig.getParameter<uint32_t>("NDisk1Rings")),
ndisk2Rings_(iConfig.getParameter<uint32_t>("NDisk2Rings")),
fitThreshold_(iConfig.getParameter<uint32_t>("NFitThreshold")),
ecapdisk1Name_(iConfig.getParameter<std::string>("EcapDisk1Name")),
ecapdisk2Name_(iConfig.getParameter<std::string>("EcapDisk2Name")),
deltaXvsEtaname_(iConfig.getParameter<std::string>("ResidualXvsEta")),
deltaXvsPhiname_(iConfig.getParameter<std::string>("ResidualXvsPhi")),
deltaYvsEtaname_(iConfig.getParameter<std::string>("ResidualYvsEta")),
deltaYvsPhiname_(iConfig.getParameter<std::string>("ResidualYvsPhi"))
{
}
Phase2ITRecHitHarvester::Phase2ITRecHitHarvester(const edm::ParameterSet& iConfig)
: config_(iConfig),
topFolder_(iConfig.getParameter<std::string>("TopFolder")),
nbarrelLayers_(iConfig.getParameter<uint32_t>("NbarrelLayers")),
ndisk1Rings_(iConfig.getParameter<uint32_t>("NDisk1Rings")),
ndisk2Rings_(iConfig.getParameter<uint32_t>("NDisk2Rings")),
fitThreshold_(iConfig.getParameter<uint32_t>("NFitThreshold")),
ecapdisk1Name_(iConfig.getParameter<std::string>("EcapDisk1Name")),
ecapdisk2Name_(iConfig.getParameter<std::string>("EcapDisk2Name")),
deltaXvsEtaname_(iConfig.getParameter<std::string>("ResidualXvsEta")),
deltaXvsPhiname_(iConfig.getParameter<std::string>("ResidualXvsPhi")),
deltaYvsEtaname_(iConfig.getParameter<std::string>("ResidualYvsEta")),
deltaYvsPhiname_(iConfig.getParameter<std::string>("ResidualYvsPhi")) {}

Phase2ITRecHitHarvester::~Phase2ITRecHitHarvester() {}

void Phase2ITRecHitHarvester::dqmEndJob(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter) {

for(unsigned int i = 1; i<=nbarrelLayers_; i++) {
std::string iFolder=topFolder_ + "/Barrel/Layer" + std::to_string(i);
void Phase2ITRecHitHarvester::dqmEndJob(DQMStore::IBooker& ibooker, DQMStore::IGetter& igetter) {
for (unsigned int i = 1; i <= nbarrelLayers_; i++) {
std::string iFolder = topFolder_ + "/Barrel/Layer" + std::to_string(i);
dofitsForLayer(iFolder, ibooker, igetter);
}
for(unsigned int iSide = 1; iSide <=2; iSide++) {
const std::string ecapbasedisk1 = topFolder_ + "/EndCap_Side" + std::to_string(iSide) + "/" + ecapdisk1Name_ + "/Ring" ;
const std::string ecapbasedisk2 = topFolder_ + "/EndCap_Side" + std::to_string(iSide) + "/" + ecapdisk2Name_ + "/Ring" ;
}
for (unsigned int iSide = 1; iSide <= 2; iSide++) {
const std::string ecapbasedisk1 =
topFolder_ + "/EndCap_Side" + std::to_string(iSide) + "/" + ecapdisk1Name_ + "/Ring";
const std::string ecapbasedisk2 =
topFolder_ + "/EndCap_Side" + std::to_string(iSide) + "/" + ecapdisk2Name_ + "/Ring";
//EPix or TEDD_1
for(unsigned int epixr = 1; epixr<=ndisk1Rings_; epixr++) {
std::string iFolder=ecapbasedisk1 + std::to_string(epixr);
for (unsigned int epixr = 1; epixr <= ndisk1Rings_; epixr++) {
std::string iFolder = ecapbasedisk1 + std::to_string(epixr);
dofitsForLayer(iFolder, ibooker, igetter);
}
//FPix or TEDD_2
for(unsigned int fpixr = 1; fpixr<=ndisk2Rings_; fpixr++) {
std::string iFolder= ecapbasedisk2 + std::to_string(fpixr);
for (unsigned int fpixr = 1; fpixr <= ndisk2Rings_; fpixr++) {
std::string iFolder = ecapbasedisk2 + std::to_string(fpixr);
dofitsForLayer(iFolder, ibooker, igetter);
}
}

}
//Function for Layer/Ring
void Phase2ITRecHitHarvester::dofitsForLayer(const std::string& iFolder, DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter) {

MonitorElement* deltaX_eta=igetter.get(iFolder+"/"+ deltaXvsEtaname_);
MonitorElement* deltaX_phi=igetter.get(iFolder+"/"+ deltaXvsPhiname_);
MonitorElement* deltaY_eta=igetter.get(iFolder+"/" + deltaYvsEtaname_);
MonitorElement* deltaY_phi=igetter.get(iFolder+"/" + deltaYvsPhiname_);

std::string resFolder=iFolder+"/ResolutionFromFit/";

ibooker.cd();
ibooker.setCurrentFolder(resFolder);
MonitorElement* sigmaX_eta=phase2tkharvestutil::book1DFromPSet(config_.getParameter<edm::ParameterSet>("resXvseta"), ibooker);
MonitorElement* meanX_eta=phase2tkharvestutil::book1DFromPSet(config_.getParameter<edm::ParameterSet>("meanXvseta"), ibooker);

gausFitslices(deltaX_eta, meanX_eta, sigmaX_eta);

MonitorElement* sigmaY_eta=phase2tkharvestutil::book1DFromPSet(config_.getParameter<edm::ParameterSet>("resYvseta"), ibooker);
MonitorElement* meanY_eta=phase2tkharvestutil::book1DFromPSet(config_.getParameter<edm::ParameterSet>("meanYvseta"), ibooker);
gausFitslices(deltaY_eta, meanY_eta, sigmaY_eta);

MonitorElement* sigmaX_phi=phase2tkharvestutil::book1DFromPSet(config_.getParameter<edm::ParameterSet>("resXvsphi"), ibooker);
MonitorElement* meanX_phi=phase2tkharvestutil::book1DFromPSet(config_.getParameter<edm::ParameterSet>("meanXvsphi"), ibooker);
gausFitslices(deltaX_phi, meanX_phi, sigmaX_phi);

MonitorElement* sigmaY_phi=phase2tkharvestutil::book1DFromPSet(config_.getParameter<edm::ParameterSet>("resYvsphi"), ibooker);
MonitorElement* meanY_phi=phase2tkharvestutil::book1DFromPSet(config_.getParameter<edm::ParameterSet>("meanYvsphi"), ibooker);
gausFitslices(deltaY_phi, meanY_phi, sigmaY_phi);
void Phase2ITRecHitHarvester::dofitsForLayer(const std::string& iFolder,
DQMStore::IBooker& ibooker,
DQMStore::IGetter& igetter) {
MonitorElement* deltaX_eta = igetter.get(iFolder + "/" + deltaXvsEtaname_);
MonitorElement* deltaX_phi = igetter.get(iFolder + "/" + deltaXvsPhiname_);
MonitorElement* deltaY_eta = igetter.get(iFolder + "/" + deltaYvsEtaname_);
MonitorElement* deltaY_phi = igetter.get(iFolder + "/" + deltaYvsPhiname_);

std::string resFolder = iFolder + "/ResolutionFromFit/";

ibooker.cd();
ibooker.setCurrentFolder(resFolder);
MonitorElement* sigmaX_eta =
phase2tkharvestutil::book1DFromPSet(config_.getParameter<edm::ParameterSet>("resXvseta"), ibooker);
MonitorElement* meanX_eta =
phase2tkharvestutil::book1DFromPSet(config_.getParameter<edm::ParameterSet>("meanXvseta"), ibooker);

gausFitslices(deltaX_eta, meanX_eta, sigmaX_eta);

MonitorElement* sigmaY_eta =
phase2tkharvestutil::book1DFromPSet(config_.getParameter<edm::ParameterSet>("resYvseta"), ibooker);
MonitorElement* meanY_eta =
phase2tkharvestutil::book1DFromPSet(config_.getParameter<edm::ParameterSet>("meanYvseta"), ibooker);
gausFitslices(deltaY_eta, meanY_eta, sigmaY_eta);

MonitorElement* sigmaX_phi =
phase2tkharvestutil::book1DFromPSet(config_.getParameter<edm::ParameterSet>("resXvsphi"), ibooker);
MonitorElement* meanX_phi =
phase2tkharvestutil::book1DFromPSet(config_.getParameter<edm::ParameterSet>("meanXvsphi"), ibooker);
gausFitslices(deltaX_phi, meanX_phi, sigmaX_phi);

MonitorElement* sigmaY_phi =
phase2tkharvestutil::book1DFromPSet(config_.getParameter<edm::ParameterSet>("resYvsphi"), ibooker);
MonitorElement* meanY_phi =
phase2tkharvestutil::book1DFromPSet(config_.getParameter<edm::ParameterSet>("meanYvsphi"), ibooker);
gausFitslices(deltaY_phi, meanY_phi, sigmaY_phi);
}
void Phase2ITRecHitHarvester::gausFitslices(MonitorElement* srcME, MonitorElement* meanME, MonitorElement* sigmaME) {
TH2F* histo = srcME->getTH2F();
Expand Down Expand Up @@ -231,10 +238,8 @@ void Phase2ITRecHitHarvester::fillDescriptions(edm::ConfigurationDescriptions& d
psd7.add<bool>("switch", true);
desc.add<edm::ParameterSetDescription>("meanYvsphi", psd7);



desc.add<unsigned int>("NFitThreshold", 5);

descriptions.add("Phase2ITRechitHarvester", desc);
// or use the following to generate the label from the module's C++ type
//descriptions.addWithDefaultLabel(desc);
Expand Down
2 changes: 1 addition & 1 deletion Validation/SiTrackerPhase2V/plugins/Phase2ITValidateCluster.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ void Phase2ITValidateCluster::fillITHistos(const edm::Event& iEvent,
if (it != clusterSimTrackIds.end() && *it == simhitIt.trackId()) {
float dx = simhitIt.localPosition().x() - localPosCluster.x();
float dy = simhitIt.localPosition().y() - localPosCluster.y();
float dist = dx*dx + dy*dy;
float dist = dx * dx + dy * dy;
if (!closestSimHit || dist < mind) {
mind = dist;
closestSimHit = &simhitIt;
Expand Down
2 changes: 1 addition & 1 deletion Validation/SiTrackerPhase2V/plugins/Phase2ITValidateRecHit.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ void Phase2ITValidateRecHit::fillITHistos(const edm::Event& iEvent,
if (simhitIt.trackId() == mId.first) {
float dx = simhitIt.localPosition().x() - lp.x();
float dy = simhitIt.localPosition().y() - lp.y();
float dist = dx*dx + dy*dy;
float dist = dx * dx + dy * dy;
if (!simhitClosest || dist < mind) {
mind = dist;
simhitClosest = &simhitIt;
Expand Down
2 changes: 1 addition & 1 deletion Validation/SiTrackerPhase2V/plugins/Phase2ITValidateTrackingRecHit.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ void Phase2ITValidateTrackingRecHit::fillITHistos(const edm::Event& iEvent,
if (simhitIt.trackId() == mId.first) {
float dx = simhitIt.localPosition().x() - lp.x();
float dy = simhitIt.localPosition().y() - lp.y();
float dist = dx*dx + dy*dy;
float dist = dx * dx + dy * dy;
if (!simhitClosest || dist < mind) {
mind = dist;
simhitClosest = &simhitIt;
Expand Down
2 changes: 1 addition & 1 deletion Validation/SiTrackerPhase2V/plugins/Phase2OTValidateCluster.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ void Phase2OTValidateCluster::fillOTHistos(const edm::Event& iEvent,
if (it != clusterSimTrackIds.end() && *it == simhitIt.trackId()) {
float dx = simhitIt.localPosition().x() - localPosCluster.x();
float dy = simhitIt.localPosition().y() - localPosCluster.y();
float dist = dx*dx + dy*dy;
float dist = dx * dx + dy * dy;
if (!closestSimHit || dist < mind) {
mind = dist;
closestSimHit = &simhitIt;
Expand Down
2 changes: 1 addition & 1 deletion Validation/SiTrackerPhase2V/plugins/Phase2OTValidateRecHit.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ void Phase2OTValidateRecHit::fillOTHistos(const edm::Event& iEvent,
if (simhitIt.trackId() == mId.first) {
float dx = simhitIt.localPosition().x() - lp.x();
float dy = simhitIt.localPosition().y() - lp.y();
float dist = dx*dx + dy*dy;
float dist = dx * dx + dy * dy;
if (!simhitClosest || dist < mind) {
mind = dist;
simhitClosest = &simhitIt;
Expand Down
43 changes: 20 additions & 23 deletions Validation/SiTrackerPhase2V/plugins/Phase2OTValidateTrackingRecHit.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,12 @@ class Phase2OTValidateTrackingRecHit : public Phase2OTValidateRecHitBase {
const std::vector<edm::Handle<edm::PSimHitContainer>>& simHits,
const std::map<unsigned int, SimTrack>& selectedSimTrackMap);


edm::ParameterSet config_;
TrackerHitAssociator::Config trackerHitAssociatorConfig_;
const double simtrackminpt_;
const edm::EDGetTokenT<reco::TrackCollection> tokenTracks_;
const edm::EDGetTokenT<edm::SimTrackContainer> simTracksToken_;
std::vector<edm::EDGetTokenT<edm::PSimHitContainer>> simHitTokens_;

};

//
Expand All @@ -83,7 +81,6 @@ Phase2OTValidateTrackingRecHit::Phase2OTValidateTrackingRecHit(const edm::Parame
simtrackminpt_(iConfig.getParameter<double>("SimTrackMinPt")),
tokenTracks_(consumes<reco::TrackCollection>(iConfig.getParameter<edm::InputTag>("tracksSrc"))),
simTracksToken_(consumes<edm::SimTrackContainer>(iConfig.getParameter<edm::InputTag>("simTracksSrc"))) {

edm::LogInfo("Phase2OTValidateTrackingRecHit") << ">>> Construct Phase2OTValidateTrackingRecHit ";
for (const auto& itag : config_.getParameter<std::vector<edm::InputTag>>("PSimHitSource"))
simHitTokens_.push_back(consumes<edm::PSimHitContainer>(itag));
Expand Down Expand Up @@ -123,10 +120,9 @@ void Phase2OTValidateTrackingRecHit::analyze(const edm::Event& iEvent, const edm
}

void Phase2OTValidateTrackingRecHit::fillOTHistos(const edm::Event& iEvent,
const TrackerHitAssociator& associateRecHit,
const std::vector<edm::Handle<edm::PSimHitContainer>>& simHits,
const std::map<unsigned int, SimTrack>& selectedSimTrackMap) {

const TrackerHitAssociator& associateRecHit,
const std::vector<edm::Handle<edm::PSimHitContainer>>& simHits,
const std::map<unsigned int, SimTrack>& selectedSimTrackMap) {
const auto& tracks = iEvent.getHandle(tokenTracks_);
if (!tracks.isValid())
return;
Expand All @@ -142,23 +138,23 @@ void Phase2OTValidateTrackingRecHit::fillOTHistos(const edm::Event& iEvent,
// check that we are in the pixel
auto subdetid = (detId.subdetId());
if (subdetid == PixelSubdetector::PixelBarrel || subdetid == PixelSubdetector::PixelEndcap)
continue;
continue;

// determine the detector we are in
TrackerGeometry::ModuleType mType = tkGeom_->getDetectorType(detId);
std::string key = phase2tkutil::getOTHistoId(detId.rawId(), tTopo_);
if (mType == TrackerGeometry::ModuleType::Ph2PSP) {
if (nrechitLayerMapP_primary.find(key) == nrechitLayerMapP_primary.end()) {
nrechitLayerMapP_primary.emplace(key,1);
} else {
nrechitLayerMapP_primary[key] += 1;
}
if (nrechitLayerMapP_primary.find(key) == nrechitLayerMapP_primary.end()) {
nrechitLayerMapP_primary.emplace(key, 1);
} else {
nrechitLayerMapP_primary[key] += 1;
}
} else if (mType == TrackerGeometry::ModuleType::Ph2PSS || mType == TrackerGeometry::ModuleType::Ph2SS) {
if (nrechitLayerMapS_primary.find(key) == nrechitLayerMapS_primary.end()) {
nrechitLayerMapS_primary.emplace(key,1);
} else {
nrechitLayerMapS_primary[key] += 1;
}
if (nrechitLayerMapS_primary.find(key) == nrechitLayerMapS_primary.end()) {
nrechitLayerMapS_primary.emplace(key, 1);
} else {
nrechitLayerMapS_primary[key] += 1;
}
}
//GetSimHits
const Phase2TrackerRecHit1D* rechit = dynamic_cast<const Phase2TrackerRecHit1D*>(hit);
Expand All @@ -174,7 +170,7 @@ void Phase2OTValidateTrackingRecHit::fillOTHistos(const edm::Event& iEvent,
if (simhitIt.trackId() == mId.first) {
float dx = simhitIt.localPosition().x() - lp.x();
float dy = simhitIt.localPosition().y() - lp.y();
float dist = dx*dx + dy*dy;
float dist = dx * dx + dy * dy;
if (!simhitClosest || dist < mind) {
mind = dist;
simhitClosest = &simhitIt;
Expand All @@ -185,8 +181,9 @@ void Phase2OTValidateTrackingRecHit::fillOTHistos(const edm::Event& iEvent,
} //end loop over simHits
if (!simhitClosest)
continue;
fillOTRecHitHistos(simhitClosest, rechit, selectedSimTrackMap, nrechitLayerMapP_primary, nrechitLayerMapS_primary);

fillOTRecHitHistos(
simhitClosest, rechit, selectedSimTrackMap, nrechitLayerMapP_primary, nrechitLayerMapS_primary);

} //end loop over rechits of a track
} //End loop over tracks

Expand All @@ -204,7 +201,7 @@ void Phase2OTValidateTrackingRecHit::fillDescriptions(edm::ConfigurationDescript
edm::ParameterSetDescription desc;
// call the base fillPsetDescription for the plots bookings
Phase2OTValidateRecHitBase::fillPSetDescription(desc);

//for macro-pixel sensors
///////
desc.add<edm::InputTag>("SimVertexSource", edm::InputTag("g4SimHits"));
Expand Down

0 comments on commit d6fb725

Please sign in to comment.