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

Remove deprecation warnings from Alignment subsystem #36193

Merged
merged 8 commits into from
Nov 21, 2021
Merged

Remove deprecation warnings from Alignment subsystem #36193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6691b75
get rid of CMS deprecation warnings in Alignment/CommonAlignmentProducer
mmusich Nov 20, 2021
9f16c1a
get rid of CMS deprecation warnings in Alignment/OfflineValidation
mmusich Nov 20, 2021
0a3e1db
get rid of CMS deprecation warnings in Alignment/LaserAlignment
mmusich Nov 20, 2021
1b0ae36
get rid of CMS deprecation warnings in Alignment/LaserAlignmentSimula…
mmusich Nov 20, 2021
4c2097b
get rid of CMS deprecation warnings in Alignment/MuonAlignment
mmusich Nov 20, 2021
981fff1
get rid of CMS deprecation warnings in Alignment/MuonAlignmentAlgorithms
mmusich Nov 20, 2021
6de9622
get rid of CMS deprecation warnings in Alignment/SurveyAnalysis
mmusich Nov 20, 2021
e16b9af
get rid of CMS deprecation warnings in Alignment/TrackerAlignment
mmusich Nov 20, 2021
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
67 changes: 35 additions & 32 deletions Alignment/CommonAlignmentProducer/test/AlignmentRcdScan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "CondFormats/Alignment/interface/Alignments.h"
Expand All @@ -26,7 +26,7 @@

#include "FWCore/Framework/interface/ESWatcher.h"

class AlignmentRcdScan : public edm::EDAnalyzer {
class AlignmentRcdScan : public edm::one::EDAnalyzer<> {
public:
enum Mode { Unknown = 0, Tk = 1, DT = 2, CSC = 3 };

Expand All @@ -36,7 +36,7 @@ class AlignmentRcdScan : public edm::EDAnalyzer {
virtual void analyze(const edm::Event& evt, const edm::EventSetup& evtSetup);

private:
void inspectRecord(const std::string& rcdname, const edm::Event& evt, const edm::ESHandle<Alignments>& alignments);
void inspectRecord(const std::string& rcdname, const edm::Event& evt, const Alignments* alignments);

int mode_;
bool verbose_;
Expand All @@ -45,11 +45,19 @@ class AlignmentRcdScan : public edm::EDAnalyzer {
edm::ESWatcher<DTAlignmentRcd> watchDT_;
edm::ESWatcher<CSCAlignmentRcd> watchCSC_;

const edm::ESGetToken<Alignments, TrackerAlignmentRcd> tkAliToken_;
const edm::ESGetToken<Alignments, DTAlignmentRcd> dtAliToken_;
const edm::ESGetToken<Alignments, CSCAlignmentRcd> cscAliToken_;

Alignments* refAlignments_;
};

AlignmentRcdScan::AlignmentRcdScan(const edm::ParameterSet& iConfig)
: verbose_(iConfig.getUntrackedParameter<bool>("verbose")), refAlignments_(0) {
: verbose_(iConfig.getUntrackedParameter<bool>("verbose")),
tkAliToken_(esConsumes()),
dtAliToken_(esConsumes()),
cscAliToken_(esConsumes()),
refAlignments_(0) {
std::string modestring = iConfig.getUntrackedParameter<std::string>("mode");
if (modestring == "Tk") {
mode_ = Tk;
Expand All @@ -73,36 +81,31 @@ AlignmentRcdScan::~AlignmentRcdScan() {

void AlignmentRcdScan::analyze(const edm::Event& evt, const edm::EventSetup& evtSetup) {
if (mode_ == Tk && watchTk_.check(evtSetup)) {
edm::ESHandle<Alignments> alignments;
evtSetup.get<TrackerAlignmentRcd>().get(alignments);
const Alignments* alignments = &evtSetup.getData(tkAliToken_);
inspectRecord("TrackerAlignmentRcd", evt, alignments);
}
if (mode_ == DT && watchDT_.check(evtSetup)) {
edm::ESHandle<Alignments> alignments;
evtSetup.get<DTAlignmentRcd>().get(alignments);
const Alignments* alignments = &evtSetup.getData(dtAliToken_);
inspectRecord("DTAlignmentRcd", evt, alignments);
}
if (mode_ == CSC && watchCSC_.check(evtSetup)) {
edm::ESHandle<Alignments> alignments;
evtSetup.get<CSCAlignmentRcd>().get(alignments);
const Alignments* alignments = &evtSetup.getData(cscAliToken_);
inspectRecord("CSCAlignmentRcd", evt, alignments);
}
}

void AlignmentRcdScan::inspectRecord(const std::string& rcdname,
const edm::Event& evt,
const edm::ESHandle<Alignments>& alignments) {
std::cout << rcdname << " content starting from run " << evt.run();
void AlignmentRcdScan::inspectRecord(const std::string& rcdname, const edm::Event& evt, const Alignments* alignments) {
edm::LogPrint("inspectRecord") << rcdname << " content starting from run " << evt.run();

if (verbose_ == false) {
std::cout << std::endl;
edm::LogPrint("inspectRecord") << std::endl;
return;
}

std::cout << " with " << alignments->m_align.size() << " entries" << std::endl;
edm::LogPrint("inspectRecord") << " with " << alignments->m_align.size() << " entries" << std::endl;

if (refAlignments_) {
std::cout << " Compared to previous record:" << std::endl;
edm::LogPrint("inspectRecord") << " Compared to previous record:" << std::endl;

double meanX = 0;
double rmsX = 0;
Expand Down Expand Up @@ -132,10 +135,10 @@ void AlignmentRcdScan::inspectRecord(const std::string& rcdname,
rmsR += pow(i->translation().perp() - iref->translation().perp(), 2);

dPhi = i->translation().phi() - iref->translation().phi();
if (dPhi > TMath::Pi())
dPhi -= 2.0 * TMath::Pi();
if (dPhi < -TMath::Pi())
dPhi += 2.0 * TMath::Pi();
if (dPhi > M_PI)
dPhi -= 2.0 * M_PI;
if (dPhi < -M_PI)
dPhi += 2.0 * M_PI;

meanPhi += dPhi;
rmsPhi += dPhi * dPhi;
Expand All @@ -152,23 +155,23 @@ void AlignmentRcdScan::inspectRecord(const std::string& rcdname,
meanPhi /= alignments->m_align.size();
rmsPhi /= alignments->m_align.size();

std::cout << " mean X shift: " << std::setw(12) << std::scientific << std::setprecision(3) << meanX
<< " (RMS = " << sqrt(rmsX) << ")" << std::endl;
std::cout << " mean Y shift: " << std::setw(12) << std::scientific << std::setprecision(3) << meanY
<< " (RMS = " << sqrt(rmsY) << ")" << std::endl;
std::cout << " mean Z shift: " << std::setw(12) << std::scientific << std::setprecision(3) << meanZ
<< " (RMS = " << sqrt(rmsZ) << ")" << std::endl;
std::cout << " mean R shift: " << std::setw(12) << std::scientific << std::setprecision(3) << meanR
<< " (RMS = " << sqrt(rmsR) << ")" << std::endl;
std::cout << " mean Phi shift: " << std::setw(12) << std::scientific << std::setprecision(3) << meanPhi
<< " (RMS = " << sqrt(rmsPhi) << ")" << std::endl;
edm::LogPrint("inspectRecord") << " mean X shift: " << std::setw(12) << std::scientific << std::setprecision(3)
<< meanX << " (RMS = " << sqrt(rmsX) << ")" << std::endl;
edm::LogPrint("inspectRecord") << " mean Y shift: " << std::setw(12) << std::scientific << std::setprecision(3)
<< meanY << " (RMS = " << sqrt(rmsY) << ")" << std::endl;
edm::LogPrint("inspectRecord") << " mean Z shift: " << std::setw(12) << std::scientific << std::setprecision(3)
<< meanZ << " (RMS = " << sqrt(rmsZ) << ")" << std::endl;
edm::LogPrint("inspectRecord") << " mean R shift: " << std::setw(12) << std::scientific << std::setprecision(3)
<< meanR << " (RMS = " << sqrt(rmsR) << ")" << std::endl;
edm::LogPrint("inspectRecord") << " mean Phi shift: " << std::setw(12) << std::scientific << std::setprecision(3)
<< meanPhi << " (RMS = " << sqrt(rmsPhi) << ")" << std::endl;

delete refAlignments_;
}

refAlignments_ = new Alignments(*alignments);

std::cout << std::endl;
edm::LogPrint("inspectRecord") << std::endl;
}

//define this as a plug-in
Expand Down
36 changes: 19 additions & 17 deletions Alignment/CommonAlignmentProducer/test/GlobalPositionRcdRead.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,49 +3,51 @@
#include <vector>

#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "CondFormats/Alignment/interface/Alignments.h"
#include "CondFormats/Alignment/interface/AlignTransform.h"
#include "CondFormats/AlignmentRecord/interface/GlobalPositionRcd.h"
#include "DataFormats/DetId/interface/DetId.h"

class GlobalPositionRcdRead : public edm::EDAnalyzer {
class GlobalPositionRcdRead : public edm::one::EDAnalyzer<> {
public:
explicit GlobalPositionRcdRead(const edm::ParameterSet& iConfig) : nEventCalls_(0) {}
explicit GlobalPositionRcdRead(const edm::ParameterSet& iConfig) : GPRToken_(esConsumes()), nEventCalls_(0) {}
~GlobalPositionRcdRead() {}
virtual void analyze(const edm::Event& evt, const edm::EventSetup& evtSetup);
void analyze(const edm::Event&, const edm::EventSetup&) override;

private:
const edm::ESGetToken<Alignments, GlobalPositionRcd> GPRToken_;
unsigned int nEventCalls_;
};

void GlobalPositionRcdRead::analyze(const edm::Event& evt, const edm::EventSetup& evtSetup) {
void GlobalPositionRcdRead::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
if (nEventCalls_ > 0) {
std::cout << "Reading from DB to be done only once, "
<< "set 'untracked PSet maxEvents = {untracked int32 input = 1}'." << std::endl;
edm::LogPrint("GlobalPositionRcdRead")
<< "Reading from DB to be done only once, "
<< "set 'untracked PSet maxEvents = {untracked int32 input = 1}'." << std::endl;

return;
}

std::cout << "Reading from database in GlobalPositionRcdRead::analyze..." << std::endl;
edm::LogPrint("GlobalPositionRcdRead") << "Reading from database in GlobalPositionRcdRead::analyze..." << std::endl;

edm::ESHandle<Alignments> globalPositionRcd;
evtSetup.get<GlobalPositionRcd>().get(globalPositionRcd);
const Alignments* globalPositionRcd = &iSetup.getData(GPRToken_);

std::cout << "Expecting entries in " << DetId(DetId::Tracker).rawId() << " " << DetId(DetId::Muon).rawId() << " "
<< DetId(DetId::Ecal).rawId() << " " << DetId(DetId::Hcal).rawId() << " " << DetId(DetId::Calo).rawId()
<< std::endl;
edm::LogPrint("GlobalPositionRcdRead") << "Expecting entries in " << DetId(DetId::Tracker).rawId() << " "
<< DetId(DetId::Muon).rawId() << " " << DetId(DetId::Ecal).rawId() << " "
<< DetId(DetId::Hcal).rawId() << " " << DetId(DetId::Calo).rawId()
<< std::endl;
for (std::vector<AlignTransform>::const_iterator i = globalPositionRcd->m_align.begin();
i != globalPositionRcd->m_align.end();
++i) {
std::cout << "entry " << i->rawId() << " translation " << i->translation() << " angles "
<< i->rotation().eulerAngles() << std::endl;
std::cout << i->rotation() << std::endl;
edm::LogPrint("GlobalPositionRcdRead") << "entry " << i->rawId() << " translation " << i->translation()
<< " angles " << i->rotation().eulerAngles() << std::endl;
edm::LogPrint("GlobalPositionRcdRead") << i->rotation() << std::endl;
}

std::cout << "done!" << std::endl;
edm::LogPrint("GlobalPositionRcdRead") << "done!" << std::endl;
nEventCalls_++;
}

Expand Down
48 changes: 25 additions & 23 deletions Alignment/CommonAlignmentProducer/test/GlobalPositionRcdScan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "CondFormats/Alignment/interface/Alignments.h"
Expand All @@ -16,16 +16,17 @@

#include "Alignment/CommonAlignment/interface/Utilities.h"

class GlobalPositionRcdScan : public edm::EDAnalyzer {
class GlobalPositionRcdScan : public edm::one::EDAnalyzer<> {
public:
explicit GlobalPositionRcdScan(const edm::ParameterSet& iConfig);

virtual ~GlobalPositionRcdScan() {}
virtual ~GlobalPositionRcdScan() = default;
virtual void analyze(const edm::Event& evt, const edm::EventSetup& evtSetup);
virtual void endJob();

private:
edm::ESWatcher<GlobalPositionRcd> watcher_;
const edm::ESGetToken<Alignments, GlobalPositionRcd> GPRToken_;

bool eulerAngles_;
bool alignAngles_;
Expand All @@ -35,7 +36,7 @@ class GlobalPositionRcdScan : public edm::EDAnalyzer {
};

GlobalPositionRcdScan::GlobalPositionRcdScan(const edm::ParameterSet& iConfig)
: eulerAngles_(false), alignAngles_(false), matrix_(false), firstRun_(0), lastRun_(0) {
: GPRToken_(esConsumes()), eulerAngles_(false), alignAngles_(false), matrix_(false), firstRun_(0), lastRun_(0) {
const std::string howRot(iConfig.getParameter<std::string>("rotation"));

if (howRot == "euler" || howRot == "all")
Expand All @@ -59,33 +60,34 @@ void GlobalPositionRcdScan::analyze(const edm::Event& evt, const edm::EventSetup
firstRun_ = lastRun_;

if (watcher_.check(evtSetup)) {
edm::ESHandle<Alignments> globalPositionRcd;
evtSetup.get<GlobalPositionRcd>().get(globalPositionRcd);
const Alignments* globalPositionRcd = &evtSetup.getData(GPRToken_);

std::cout << "=====================================================\n"
<< "GlobalPositionRcd content starting from run " << evt.run() << ":" << std::endl;
edm::LogPrint("GlobalPositionRcdScan")
<< "=====================================================\n"
<< "GlobalPositionRcd content starting from run " << evt.run() << ":" << std::endl;

for (std::vector<AlignTransform>::const_iterator i = globalPositionRcd->m_align.begin();
i != globalPositionRcd->m_align.end();
++i) {
std::cout << " Component ";
edm::LogPrint("GlobalPositionRcdScan") << " Component ";
if (i->rawId() == DetId(DetId::Tracker).rawId()) {
std::cout << "Tracker";
edm::LogPrint("GlobalPositionRcdScan") << "Tracker";
} else if (i->rawId() == DetId(DetId::Muon).rawId()) {
std::cout << "Muon ";
edm::LogPrint("GlobalPositionRcdScan") << "Muon ";
} else if (i->rawId() == DetId(DetId::Ecal).rawId()) {
std::cout << "Ecal ";
edm::LogPrint("GlobalPositionRcdScan") << "Ecal ";
} else if (i->rawId() == DetId(DetId::Hcal).rawId()) {
std::cout << "Hcal ";
edm::LogPrint("GlobalPositionRcdScan") << "Hcal ";
} else if (i->rawId() == DetId(DetId::Calo).rawId()) {
std::cout << "Calo ";
edm::LogPrint("GlobalPositionRcdScan") << "Calo ";
} else {
std::cout << "Unknown";
edm::LogPrint("GlobalPositionRcdScan") << "Unknown";
}
std::cout << " entry " << i->rawId() << "\n translation " << i->translation() << "\n";
edm::LogPrint("GlobalPositionRcdScan")
<< " entry " << i->rawId() << "\n translation " << i->translation() << "\n";
const AlignTransform::Rotation hepRot(i->rotation());
if (eulerAngles_) {
std::cout << " euler angles " << hepRot.eulerAngles() << std::endl;
edm::LogPrint("GlobalPositionRcdScan") << " euler angles " << hepRot.eulerAngles() << std::endl;
}
if (alignAngles_) {
const align::RotationType matrix(hepRot.xx(),
Expand All @@ -98,20 +100,20 @@ void GlobalPositionRcdScan::analyze(const edm::Event& evt, const edm::EventSetup
hepRot.zy(),
hepRot.zz());
const AlgebraicVector angles(align::toAngles(matrix));
std::cout << " alpha, beta, gamma (" << angles[0] << ", " << angles[1] << ", " << angles[2] << ')'
<< std::endl;
edm::LogPrint("GlobalPositionRcdScan")
<< " alpha, beta, gamma (" << angles[0] << ", " << angles[1] << ", " << angles[2] << ')' << std::endl;
}
if (matrix_) {
std::cout << " rotation matrix " << hepRot << std::endl;
edm::LogPrint("GlobalPositionRcdScan") << " rotation matrix " << hepRot << std::endl;
}
}
}
}

void GlobalPositionRcdScan::endJob() {
std::cout << "\n=====================================================\n"
<< "=====================================================\n"
<< "Checked run range " << firstRun_ << " to " << lastRun_ << "." << std::endl;
edm::LogPrint("GlobalPositionRcdScan") << "\n=====================================================\n"
<< "=====================================================\n"
<< "Checked run range " << firstRun_ << " to " << lastRun_ << "." << std::endl;
}

//define this as a plug-in
Expand Down
Loading