Skip to content

Commit

Permalink
Code check
Browse files Browse the repository at this point in the history
  • Loading branch information
Sunanda committed Apr 13, 2020
1 parent 642d470 commit 764d514
Showing 1 changed file with 23 additions and 22 deletions.
45 changes: 23 additions & 22 deletions Calibration/HcalCalibAlgos/plugins/HcalIsoTrkAnalyzer.cc
Expand Up @@ -240,9 +240,9 @@ HcalIsoTrkAnalyzer::HcalIsoTrkAnalyzer(const edm::ParameterSet& iConfig)
labelHBHE_(iConfig.getParameter<std::string>("labelHBHERecHit")),
labelTower_(iConfig.getParameter<std::string>("labelCaloTower")),
l1TrigName_(iConfig.getUntrackedParameter<std::string>("l1TrigName", "L1_SingleJet60")),
oldID_(iConfig.getUntrackedParameter<std::vector<int> >("oldID")),
newDepth_(iConfig.getUntrackedParameter<std::vector<int> >("newDepth")),
hep17_(iConfig.getUntrackedParameter<bool>("hep17")),
oldID_(iConfig.getUntrackedParameter<std::vector<int>>("oldID")),
newDepth_(iConfig.getUntrackedParameter<std::vector<int>>("newDepth")),
hep17_(iConfig.getUntrackedParameter<bool>("hep17")),
nRun_(0),
nLow_(0),
nHigh_(0),
Expand Down Expand Up @@ -277,9 +277,9 @@ HcalIsoTrkAnalyzer::HcalIsoTrkAnalyzer(const edm::ParameterSet& iConfig)
edm::InputTag algTag = iConfig.getParameter<edm::InputTag>("algInputTag");
edm::InputTag extTag = iConfig.getParameter<edm::InputTag>("extInputTag");
for (unsigned int k = 0; k < oldID_.size(); ++k) {
oldDet_.emplace_back((oldID_[k]/10000)%10);
oldEta_.emplace_back((oldID_[k]/100)%100);
oldDepth_.emplace_back(oldID_[k]%100);
oldDet_.emplace_back((oldID_[k] / 10000) % 10);
oldEta_.emplace_back((oldID_[k] / 100) % 100);
oldDepth_.emplace_back(oldID_[k] % 100);
}

l1GtUtils_ = new l1t::L1TGlobalUtil(iConfig, consumesCollector(), *this, algTag, extTag, l1t::UseEventSetupIn::Event);
Expand Down Expand Up @@ -340,8 +340,9 @@ HcalIsoTrkAnalyzer::HcalIsoTrkAnalyzer(const edm::ParameterSet& iConfig)
edm::LogVerbatim("HcalIsoTrack") << "Trigger[" << k << "] " << trigNames_[k];
}
edm::LogVerbatim("HcalIsoTrack") << oldID_.size() << " DetIDs to be corrected with HEP17 flag:" << hep17_;
for (unsigned int k = 0; k < oldID_.size(); ++k)
edm::LogVerbatim("HcalIsoTrack") << "[" << k << "] Det " << oldDet_[k] << " EtaAbs " << oldEta_[k] << " Depth " << oldDepth_[k] << ":" << newDepth_[k];
for (unsigned int k = 0; k < oldID_.size(); ++k)
edm::LogVerbatim("HcalIsoTrack") << "[" << k << "] Det " << oldDet_[k] << " EtaAbs " << oldEta_[k] << " Depth "
<< oldDepth_[k] << ":" << newDepth_[k];

for (int i = 0; i < 10; i++)
phibins_.push_back(-M_PI + 0.1 * (2 * i + 1) * M_PI);
Expand Down Expand Up @@ -887,8 +888,8 @@ void HcalIsoTrkAnalyzer::fillDescriptions(edm::ConfigurationDescriptions& descri
desc.addUntracked<std::string>("l1TrigName", "L1_SingleJet60");
desc.addUntracked<int>("outMode", 11);
std::vector<int> dummy;
desc.addUntracked<std::vector<int> >("oldID", dummy);
desc.addUntracked<std::vector<int> >("newDepth", dummy);
desc.addUntracked<std::vector<int>>("oldID", dummy);
desc.addUntracked<std::vector<int>>("newDepth", dummy);
desc.addUntracked<bool>("hep17", false);
descriptions.add("HcalIsoTrkAnalyzer", desc);
}
Expand Down Expand Up @@ -1148,10 +1149,10 @@ std::array<int, 3> HcalIsoTrkAnalyzer::fillTree(std::vector<math::XYZTLorentzVec
ids,
edet0,
useRaw_);
if (!oldID_.empty()) {
for (unsigned k = 0; k < ids.size(); ++k)
ids[k] = newId(ids[k]);
}
if (!oldID_.empty()) {
for (unsigned k = 0; k < ids.size(); ++k)
ids[k] = newId(ids[k]);
}
storeEnergy(0, respCorrs, ids, edet0, t_eHcal, t_DetIds, t_HitEnergies);

//----- hcal energy in the extended cone 1 (a_coneR+10) --------------
Expand All @@ -1165,10 +1166,10 @@ std::array<int, 3> HcalIsoTrkAnalyzer::fillTree(std::vector<math::XYZTLorentzVec
ids1,
edet1,
useRaw_);
if (!oldID_.empty()) {
for (unsigned k = 0; k < ids1.size(); ++k)
ids1[k] = newId(ids1[k]);
}
if (!oldID_.empty()) {
for (unsigned k = 0; k < ids1.size(); ++k)
ids1[k] = newId(ids1[k]);
}
storeEnergy(1, respCorrs, ids1, edet1, t_eHcal10, t_DetIds1, t_HitEnergies1);

//----- hcal energy in the extended cone 3 (a_coneR+30) --------------
Expand All @@ -1182,10 +1183,10 @@ std::array<int, 3> HcalIsoTrkAnalyzer::fillTree(std::vector<math::XYZTLorentzVec
ids3,
edet3,
useRaw_);
if (!oldID_.empty()) {
for (unsigned k = 0; k < ids3.size(); ++k)
ids3[k] = newId(ids3[k]);
}
if (!oldID_.empty()) {
for (unsigned k = 0; k < ids3.size(); ++k)
ids3[k] = newId(ids3[k]);
}
storeEnergy(3, respCorrs, ids3, edet3, t_eHcal30, t_DetIds3, t_HitEnergies3);

t_p = pTrack->p();
Expand Down

0 comments on commit 764d514

Please sign in to comment.