Skip to content

Commit 6c4dc7f

Browse files
francescobriviofrancescobrivio
committed
Apply Naming Rules to BeamSpotObjects methods
1 parent 90eb7d4 commit 6c4dc7f

File tree

28 files changed

+306
-310
lines changed

28 files changed

+306
-310
lines changed

‎Alignment/OfflineValidation/plugins/PixelBaryCentreAnalyzer.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ void PixelBaryCentreAnalyzer::analyze(const edm::Event& iEvent, const edm::Event
505505
// Get BeamSpot from EventSetup
506506
const BeamSpotObjects* mybeamspot = &iSetup.getData(bsTokens_[label]);
507507

508-
BS_ = GlobalPoint(mybeamspot->GetX(), mybeamspot->GetY(), mybeamspot->GetZ());
508+
BS_ = GlobalPoint(mybeamspot->x(), mybeamspot->y(), mybeamspot->z());
509509

510510
bsTrees_[label]->Fill();
511511
} // bsLabels_

‎Calibration/TkAlCaRecoProducers/plugins/AlcaBeamSpotFromDB.cc‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,25 +39,24 @@ void AlcaBeamSpotFromDB::endLuminosityBlockProduce(edm::LuminosityBlock &lumiSeg
3939
const BeamSpotObjects *spotDB = &iSetup.getData(beamSpotToken_);
4040

4141
// translate from BeamSpotObjects to reco::BeamSpot
42-
reco::BeamSpot::Point apoint(spotDB->GetX(), spotDB->GetY(), spotDB->GetZ());
42+
reco::BeamSpot::Point apoint(spotDB->x(), spotDB->y(), spotDB->z());
4343

4444
reco::BeamSpot::CovarianceMatrix matrix;
4545
for (int i = 0; i < 7; ++i) {
4646
for (int j = 0; j < 7; ++j) {
47-
matrix(i, j) = spotDB->GetCovariance(i, j);
47+
matrix(i, j) = spotDB->covariance(i, j);
4848
}
4949
}
5050

5151
reco::BeamSpot aSpot;
5252
// this assume beam width same in x and y
53-
aSpot = reco::BeamSpot(
54-
apoint, spotDB->GetSigmaZ(), spotDB->Getdxdz(), spotDB->Getdydz(), spotDB->GetBeamWidthX(), matrix);
55-
aSpot.setBeamWidthY(spotDB->GetBeamWidthY());
56-
aSpot.setEmittanceX(spotDB->GetEmittanceX());
57-
aSpot.setEmittanceY(spotDB->GetEmittanceY());
58-
aSpot.setbetaStar(spotDB->GetBetaStar());
59-
60-
if (spotDB->GetBeamType() == 2) {
53+
aSpot = reco::BeamSpot(apoint, spotDB->sigmaZ(), spotDB->dxdz(), spotDB->dydz(), spotDB->beamWidthX(), matrix);
54+
aSpot.setBeamWidthY(spotDB->beamWidthY());
55+
aSpot.setEmittanceX(spotDB->emittanceX());
56+
aSpot.setEmittanceY(spotDB->emittanceY());
57+
aSpot.setbetaStar(spotDB->betaStar());
58+
59+
if (spotDB->beamType() == 2) {
6160
aSpot.setType(reco::BeamSpot::Tracker);
6261
} else {
6362
aSpot.setType(reco::BeamSpot::Fake);

‎Calibration/TkAlCaRecoProducers/plugins/AlcaBeamSpotHarvester.cc‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -76,29 +76,29 @@ void AlcaBeamSpotHarvester::endRun(const edm::Run &iRun, const edm::EventSetup &
7676
if (poolDbService.isAvailable()) {
7777
for (AlcaBeamSpotManager::bsMap_iterator it = beamSpotMap.begin(); it != beamSpotMap.end(); it++) {
7878
BeamSpotObjects aBeamSpot;
79-
aBeamSpot.SetType(it->second.second.type());
80-
aBeamSpot.SetPosition(it->second.second.x0(), it->second.second.y0(), it->second.second.z0());
79+
aBeamSpot.setType(it->second.second.type());
80+
aBeamSpot.setPosition(it->second.second.x0(), it->second.second.y0(), it->second.second.z0());
8181
if (sigmaZValue_ == -1) {
82-
aBeamSpot.SetSigmaZ(it->second.second.sigmaZ());
82+
aBeamSpot.setSigmaZ(it->second.second.sigmaZ());
8383
} else {
84-
aBeamSpot.SetSigmaZ(sigmaZValue_);
84+
aBeamSpot.setSigmaZ(sigmaZValue_);
8585
}
86-
aBeamSpot.Setdxdz(it->second.second.dxdz());
87-
aBeamSpot.Setdydz(it->second.second.dydz());
88-
aBeamSpot.SetBeamWidthX(it->second.second.BeamWidthX());
89-
aBeamSpot.SetBeamWidthY(it->second.second.BeamWidthY());
90-
aBeamSpot.SetEmittanceX(it->second.second.emittanceX());
91-
aBeamSpot.SetEmittanceY(it->second.second.emittanceY());
92-
aBeamSpot.SetBetaStar(it->second.second.betaStar());
86+
aBeamSpot.setdxdz(it->second.second.dxdz());
87+
aBeamSpot.setdydz(it->second.second.dydz());
88+
aBeamSpot.setBeamWidthX(it->second.second.BeamWidthX());
89+
aBeamSpot.setBeamWidthY(it->second.second.BeamWidthY());
90+
aBeamSpot.setEmittanceX(it->second.second.emittanceX());
91+
aBeamSpot.setEmittanceY(it->second.second.emittanceY());
92+
aBeamSpot.setBetaStar(it->second.second.betaStar());
9393

9494
for (int i = 0; i < 7; ++i) {
9595
for (int j = 0; j < 7; ++j) {
96-
aBeamSpot.SetCovariance(i, j, it->second.second.covariance(i, j));
96+
aBeamSpot.setCovariance(i, j, it->second.second.covariance(i, j));
9797
}
9898
}
9999

100100
if (sigmaZValue_ > 0) {
101-
aBeamSpot.SetCovariance(3, 3, 0.000025);
101+
aBeamSpot.setCovariance(3, 3, 0.000025);
102102
}
103103

104104
cond::Time_t thisIOV = 1;

‎CondCore/BeamSpotPlugins/interface/BeamSpotPayloadInspectorHelper.h‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -96,21 +96,21 @@ namespace BeamSpotPI {
9696

9797
switch (my_param) {
9898
case X:
99-
return std::make_pair<double, double>(payload.GetX(), payload.GetXError());
99+
return std::make_pair<double, double>(payload.x(), payload.xError());
100100
case Y:
101-
return std::make_pair<double, double>(payload.GetY(), payload.GetYError());
101+
return std::make_pair<double, double>(payload.y(), payload.yError());
102102
case Z:
103-
return std::make_pair<double, double>(payload.GetZ(), payload.GetZError());
103+
return std::make_pair<double, double>(payload.z(), payload.zError());
104104
case sigmaX:
105-
return std::make_pair<double, double>(payload.GetBeamWidthX(), payload.GetBeamWidthXError());
105+
return std::make_pair<double, double>(payload.beamWidthX(), payload.beamWidthXError());
106106
case sigmaY:
107-
return std::make_pair<double, double>(payload.GetBeamWidthY(), payload.GetBeamWidthYError());
107+
return std::make_pair<double, double>(payload.beamWidthY(), payload.beamWidthYError());
108108
case sigmaZ:
109-
return std::make_pair<double, double>(payload.GetSigmaZ(), payload.GetSigmaZError());
109+
return std::make_pair<double, double>(payload.sigmaZ(), payload.sigmaZError());
110110
case dxdz:
111-
return std::make_pair<double, double>(payload.Getdxdz(), payload.GetdxdzError());
111+
return std::make_pair<double, double>(payload.dxdz(), payload.dxdzError());
112112
case dydz:
113-
return std::make_pair<double, double>(payload.Getdydz(), payload.GetdydzError());
113+
return std::make_pair<double, double>(payload.dydz(), payload.dydzError());
114114
case END_OF_TYPES:
115115
return ret;
116116
default:
@@ -135,21 +135,21 @@ namespace BeamSpotPI {
135135

136136
switch (my_param) {
137137
case X:
138-
return std::make_pair<double, double>(payload.GetX(), payload.GetXError());
138+
return std::make_pair<double, double>(payload.x(), payload.xError());
139139
case Y:
140-
return std::make_pair<double, double>(payload.GetY(), payload.GetYError());
140+
return std::make_pair<double, double>(payload.y(), payload.yError());
141141
case Z:
142-
return std::make_pair<double, double>(payload.GetZ(), payload.GetZError());
142+
return std::make_pair<double, double>(payload.z(), payload.zError());
143143
case sigmaX:
144-
return std::make_pair<double, double>(payload.GetBeamWidthX(), payload.GetBeamWidthXError());
144+
return std::make_pair<double, double>(payload.beamWidthX(), payload.beamWidthXError());
145145
case sigmaY:
146-
return std::make_pair<double, double>(payload.GetBeamWidthY(), payload.GetBeamWidthYError());
146+
return std::make_pair<double, double>(payload.beamWidthY(), payload.beamWidthYError());
147147
case sigmaZ:
148-
return std::make_pair<double, double>(payload.GetSigmaZ(), payload.GetSigmaZError());
148+
return std::make_pair<double, double>(payload.sigmaZ(), payload.sigmaZError());
149149
case dxdz:
150-
return std::make_pair<double, double>(payload.Getdxdz(), payload.GetdxdzError());
150+
return std::make_pair<double, double>(payload.dxdz(), payload.dxdzError());
151151
case dydz:
152-
return std::make_pair<double, double>(payload.Getdydz(), payload.GetdydzError());
152+
return std::make_pair<double, double>(payload.dydz(), payload.dydzError());
153153
case END_OF_TYPES:
154154
return ret;
155155
default:
@@ -174,21 +174,21 @@ namespace BeamSpotPI {
174174

175175
switch (my_param) {
176176
case X:
177-
return std::make_pair<double, double>(payload.GetX(), payload.GetXError());
177+
return std::make_pair<double, double>(payload.x(), payload.xError());
178178
case Y:
179-
return std::make_pair<double, double>(payload.GetY(), payload.GetYError());
179+
return std::make_pair<double, double>(payload.y(), payload.yError());
180180
case Z:
181-
return std::make_pair<double, double>(payload.GetZ(), payload.GetZError());
181+
return std::make_pair<double, double>(payload.z(), payload.zError());
182182
case sigmaX:
183-
return std::make_pair<double, double>(payload.GetBeamWidthX(), payload.GetBeamWidthXError());
183+
return std::make_pair<double, double>(payload.beamWidthX(), payload.beamWidthXError());
184184
case sigmaY:
185-
return std::make_pair<double, double>(payload.GetBeamWidthY(), payload.GetBeamWidthYError());
185+
return std::make_pair<double, double>(payload.beamWidthY(), payload.beamWidthYError());
186186
case sigmaZ:
187-
return std::make_pair<double, double>(payload.GetSigmaZ(), payload.GetSigmaZError());
187+
return std::make_pair<double, double>(payload.sigmaZ(), payload.sigmaZError());
188188
case dxdz:
189-
return std::make_pair<double, double>(payload.Getdxdz(), payload.GetdxdzError());
189+
return std::make_pair<double, double>(payload.dxdz(), payload.dxdzError());
190190
case dydz:
191-
return std::make_pair<double, double>(payload.Getdydz(), payload.GetdydzError());
191+
return std::make_pair<double, double>(payload.dydz(), payload.dydzError());
192192
case END_OF_TYPES:
193193
return ret;
194194
default:
@@ -206,7 +206,7 @@ namespace BeamSpotPI {
206206
xyCorrelation() : cond::payloadInspector::ScatterPlot<PayloadType, double, double>("BeamSpot x vs y", "x", "y") {}
207207

208208
std::tuple<double, double> getFromPayload(PayloadType& payload) override {
209-
return std::make_tuple(payload.GetX(), payload.GetY());
209+
return std::make_tuple(payload.x(), payload.y());
210210
}
211211
};
212212

@@ -256,21 +256,21 @@ namespace BeamSpotPI {
256256
if (!isError) {
257257
switch (my_param) {
258258
case X:
259-
return m_payload->GetX();
259+
return m_payload->x();
260260
case Y:
261-
return m_payload->GetY();
261+
return m_payload->y();
262262
case Z:
263-
return m_payload->GetZ();
263+
return m_payload->z();
264264
case sigmaX:
265-
return m_payload->GetBeamWidthX();
265+
return m_payload->beamWidthX();
266266
case sigmaY:
267-
return m_payload->GetBeamWidthY();
267+
return m_payload->beamWidthY();
268268
case sigmaZ:
269-
return m_payload->GetSigmaZ();
269+
return m_payload->sigmaZ();
270270
case dxdz:
271-
return m_payload->Getdxdz();
271+
return m_payload->dxdz();
272272
case dydz:
273-
return m_payload->Getdydz();
273+
return m_payload->dydz();
274274
case END_OF_TYPES:
275275
return ret;
276276
default:
@@ -279,21 +279,21 @@ namespace BeamSpotPI {
279279
} else {
280280
switch (my_param) {
281281
case X:
282-
return m_payload->GetXError();
282+
return m_payload->xError();
283283
case Y:
284-
return m_payload->GetYError();
284+
return m_payload->yError();
285285
case Z:
286-
return m_payload->GetZError();
286+
return m_payload->zError();
287287
case sigmaX:
288-
return m_payload->GetBeamWidthXError();
288+
return m_payload->beamWidthXError();
289289
case sigmaY:
290-
return m_payload->GetBeamWidthYError();
290+
return m_payload->beamWidthYError();
291291
case sigmaZ:
292-
return m_payload->GetSigmaZError();
292+
return m_payload->sigmaZError();
293293
case dxdz:
294-
return m_payload->GetdxdzError();
294+
return m_payload->dxdzError();
295295
case dydz:
296-
return m_payload->GetdydzError();
296+
return m_payload->dydzError();
297297
case END_OF_TYPES:
298298
return ret;
299299
default:

‎CondCore/BeamSpotPlugins/plugins/BeamSpot_PayloadInspector.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace {
1515
: cond::payloadInspector::HistoryPlot<BeamSpotObjects, std::pair<double, double> >("x vs run number", "x") {}
1616

1717
std::pair<double, double> getFromPayload(BeamSpotObjects& payload) override {
18-
return std::make_pair(payload.GetX(), payload.GetXError());
18+
return std::make_pair(payload.x(), payload.xError());
1919
}
2020
};
2121

@@ -25,7 +25,7 @@ namespace {
2525
: cond::payloadInspector::RunHistoryPlot<BeamSpotObjects, std::pair<double, double> >("x vs run number", "x") {}
2626

2727
std::pair<double, double> getFromPayload(BeamSpotObjects& payload) override {
28-
return std::make_pair(payload.GetX(), payload.GetXError());
28+
return std::make_pair(payload.x(), payload.xError());
2929
}
3030
};
3131
class BeamSpot_x : public cond::payloadInspector::TimeHistoryPlot<BeamSpotObjects, std::pair<double, double> > {
@@ -34,7 +34,7 @@ namespace {
3434
: cond::payloadInspector::TimeHistoryPlot<BeamSpotObjects, std::pair<double, double> >("x vs time", "x") {}
3535

3636
std::pair<double, double> getFromPayload(BeamSpotObjects& payload) override {
37-
return std::make_pair(payload.GetX(), payload.GetXError());
37+
return std::make_pair(payload.x(), payload.xError());
3838
}
3939
};
4040

@@ -44,7 +44,7 @@ namespace {
4444
: cond::payloadInspector::TimeHistoryPlot<BeamSpotObjects, std::pair<double, double> >("y vs time", "y") {}
4545

4646
std::pair<double, double> getFromPayload(BeamSpotObjects& payload) override {
47-
return std::make_pair(payload.GetY(), payload.GetYError());
47+
return std::make_pair(payload.y(), payload.yError());
4848
}
4949
};
5050

‎CondCore/DBOutputService/test/stubs/LumiBasedUpdateAnalyzer.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ void LumiBasedUpdateAnalyzer::analyze(const edm::Event& evt, const edm::EventSet
8989
std::string tag = mydbservice->tag(m_record);
9090
mydbservice->logger().logDebug() << "Tag: " << tag;
9191
BeamSpotObjects mybeamspot;
92-
mybeamspot.SetPosition(0.053, 0.1, 0.13);
93-
mybeamspot.SetSigmaZ(3.8);
94-
mybeamspot.SetType(int(lumiId));
95-
mydbservice->logger().logDebug() << "BeamType: " << mybeamspot.GetBeamType();
92+
mybeamspot.setPosition(0.053, 0.1, 0.13);
93+
mybeamspot.setSigmaZ(3.8);
94+
mybeamspot.setType(int(lumiId));
95+
mydbservice->logger().logDebug() << "BeamType: " << mybeamspot.beamType();
9696
try {
9797
auto iov = mydbservice->writeIOVForNextLumisection(mybeamspot, m_record);
9898
if (iov) {

‎CondCore/ESSources/test/stubs/LumiTestReadAnalyzer.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ namespace edmtest {
6161
const BeamSpotObjects* payload = ps.product();
6262
edm::LogInfo(MSGSOURCE) << "Event " << e.id().event() << " Run " << e.id().run() << " Lumi "
6363
<< e.id().luminosityBlock() << " Time " << e.time().value() << " LumiTestPayload id "
64-
<< payload->GetBeamType() << std::endl;
64+
<< payload->beamType() << std::endl;
6565
//cond::Time_t target = cond::time::lumiTime( e.id().run(), e.id().luminosityBlock());
6666
unsigned int target = e.id().luminosityBlock();
67-
unsigned int found = payload->GetBeamType();
67+
unsigned int found = payload->beamType();
6868
if (target != found) {
6969
boost::posix_time::ptime now = boost::posix_time::microsec_clock::local_time();
7070
std::stringstream msg;

‎CondCore/ESSources/test/stubs/TestConcurrentIOVsCondCore.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,9 @@ namespace edmtest {
159159
if (lumi < nLumisToTest) {
160160
BeamSpotTestObject& testObject = testObjects_[lumi];
161161
testObject.lumi_ = lumi;
162-
testObject.x_ = beamSpotObjects->GetX();
163-
testObject.y_ = beamSpotObjects->GetY();
164-
testObject.z_ = beamSpotObjects->GetZ();
162+
testObject.x_ = beamSpotObjects->x();
163+
testObject.y_ = beamSpotObjects->y();
164+
testObject.z_ = beamSpotObjects->z();
165165
testObject.start_ = iov.first().luminosityBlockNumber();
166166
testObject.end_ = iov.last().luminosityBlockNumber();
167167
}

0 commit comments

Comments
 (0)