Skip to content

Commit 2adc2cd

Browse files
jfernan2jfernan2
authored
Merge branch 'master' into python3Validation
2 parents 8b1bbbe + 32f4925 commit 2adc2cd

File tree

2,535 files changed

+289793
-250650
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,535 files changed

+289793
-250650
lines changed

‎Alignment/CommonAlignment/interface/AlignableComposite.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,10 @@ class AlignableComposite : public Alignable {
9797
/// Return surface deformations
9898
int surfaceDeformationIdPairs(std::vector<std::pair<int, SurfaceDeformation*> >&) const override;
9999

100+
// avoid implicit cast of not explicitely defined version to the defined ones
101+
template <class T>
102+
void update(T) = delete;
103+
100104
protected:
101105
/// Constructor from GeomDet, only for use in AlignableDet
102106
explicit AlignableComposite(const GeomDet* geomDet);
@@ -105,10 +109,6 @@ class AlignableComposite : public Alignable {
105109
/// The given GeomDetUnit id has to match the current id.
106110
void update(const GeomDet* geomDet);
107111

108-
// avoid implicit cast of not explicitely defined version to the defined ones
109-
template <class T>
110-
void update(T) = delete;
111-
112112
void setSurface(const AlignableSurface& s) { theSurface = s; }
113113

114114
StructureType theStructureType;

‎Alignment/CommonAlignmentMonitor/interface/AlignmentMonitorBase.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,11 @@ class AlignmentMonitorBase {
116116

117117
const edm::InputTag m_beamSpotTag;
118118

119-
private:
119+
public:
120120
AlignmentMonitorBase(const AlignmentMonitorBase &) = delete; // stop default
121121
const AlignmentMonitorBase &operator=(const AlignmentMonitorBase &) = delete; // stop default
122122

123+
private:
123124
// ---------- member data --------------------------------
124125

125126
int m_iteration;

‎Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorAsAnalyzer.cc‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
#include "Geometry/CommonTopologies/interface/GeometryAligner.h"
4545
#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h"
4646
#include "Geometry/Records/interface/PTrackerParametersRcd.h"
47+
#include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h"
4748
#include "Geometry/Records/interface/MuonGeometryRecord.h"
4849
#include "CondFormats/AlignmentRecord/interface/TrackerAlignmentRcd.h"
4950
#include "CondFormats/AlignmentRecord/interface/TrackerAlignmentErrorExtendedRcd.h"
@@ -88,6 +89,7 @@ class AlignmentMonitorAsAnalyzer : public edm::one::EDAnalyzer<> {
8889
const edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> esTokenTTopo_;
8990
const edm::ESGetToken<GeometricDet, IdealGeometryRecord> esTokenGeomDet_;
9091
const edm::ESGetToken<PTrackerParameters, PTrackerParametersRcd> esTokenPTP_;
92+
const edm::ESGetToken<PTrackerAdditionalParametersPerDet, PTrackerAdditionalParametersPerDetRcd> esTokenPtitp_;
9193
const edm::ESGetToken<DTGeometry, MuonGeometryRecord> esTokenDT_;
9294
const edm::ESGetToken<CSCGeometry, MuonGeometryRecord> esTokenCSC_;
9395
const edm::ESGetToken<GEMGeometry, MuonGeometryRecord> esTokenGEM_;
@@ -120,6 +122,7 @@ AlignmentMonitorAsAnalyzer::AlignmentMonitorAsAnalyzer(const edm::ParameterSet&
120122
esTokenTTopo_(esConsumes()),
121123
esTokenGeomDet_(esConsumes()),
122124
esTokenPTP_(esConsumes()),
125+
esTokenPtitp_(esConsumes()),
123126
esTokenDT_(esConsumes(edm::ESInputTag("", "idealForAlignmentMonitorAsAnalyzer"))),
124127
esTokenCSC_(esConsumes(edm::ESInputTag("", "idealForAlignmentMonitorAsAnalyzer"))),
125128
esTokenGEM_(esConsumes(edm::ESInputTag("", "idealForAlignmentMonitorAsAnalyzer"))),
@@ -155,8 +158,9 @@ void AlignmentMonitorAsAnalyzer::analyze(const edm::Event& iEvent, const edm::Ev
155158

156159
const GeometricDet* geom = &iSetup.getData(esTokenGeomDet_);
157160
const PTrackerParameters& ptp = iSetup.getData(esTokenPTP_);
161+
const PTrackerAdditionalParametersPerDet* ptitp = &iSetup.getData(esTokenPtitp_);
158162
TrackerGeomBuilderFromGeometricDet trackerBuilder;
159-
std::shared_ptr<TrackerGeometry> theTracker(trackerBuilder.build(geom, ptp, tTopo));
163+
std::shared_ptr<TrackerGeometry> theTracker(trackerBuilder.build(geom, ptitp, ptp, tTopo));
160164

161165
edm::ESHandle<DTGeometry> theMuonDT = iSetup.getHandle(esTokenDT_);
162166
edm::ESHandle<CSCGeometry> theMuonCSC = iSetup.getHandle(esTokenCSC_);

‎Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
#include "CondFormats/AlignmentRecord/interface/TrackerSurveyRcd.h"
4545
#include "CondFormats/AlignmentRecord/interface/TrackerSurveyErrorExtendedRcd.h"
4646
#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h"
47+
#include "CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h"
4748
#include "CondFormats/Common/interface/Time.h"
4849

4950
#include "FWCore/Framework/interface/ESHandle.h"
@@ -59,6 +60,7 @@
5960
#include "Geometry/Records/interface/IdealGeometryRecord.h"
6061
#include "Geometry/Records/interface/MuonGeometryRecord.h"
6162
#include "Geometry/Records/interface/TrackerTopologyRcd.h"
63+
#include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h"
6264

6365
#include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
6466

@@ -248,12 +250,12 @@ class AlignmentProducerBase {
248250
const bool saveToDB_, saveApeToDB_, saveDeformationsToDB_;
249251
const bool useSurvey_;
250252
const bool enableAlignableUpdates_;
251-
std::string idealGeometryLabel;
252253

253254
/*** ESTokens ***/
254255
const edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> ttopoToken_;
255256
const edm::ESGetToken<GeometricDet, IdealGeometryRecord> geomDetToken_;
256257
const edm::ESGetToken<PTrackerParameters, PTrackerParametersRcd> ptpToken_;
258+
const edm::ESGetToken<PTrackerAdditionalParametersPerDet, PTrackerAdditionalParametersPerDetRcd> ptitpToken_;
257259
const edm::ESGetToken<DTGeometry, MuonGeometryRecord> dtGeomToken_;
258260
const edm::ESGetToken<CSCGeometry, MuonGeometryRecord> cscGeomToken_;
259261
const edm::ESGetToken<GEMGeometry, MuonGeometryRecord> gemGeomToken_;

‎Alignment/CommonAlignmentProducer/python/AlignmentProducerAsAnalyzer_cff.py‎

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -76,28 +76,12 @@
7676
# update alignables if triggered by corresponding input IOV boundary
7777
enableAlignableUpdates = cms.bool(False),
7878
)
79-
DTGeometryAlignmentProducerAsAnalyzer = cms.ESProducer("DTGeometryESModule",
80-
appendToDataLabel = cms.string('idealForAlignmentProducerBase'),
81-
applyAlignment = cms.bool(False),
82-
alignmentsLabel = cms.string(''),
83-
fromDDD = cms.bool(True)
84-
)
85-
CSCGeometryAlignmentProducerAsAnalyzer = cms.ESProducer("CSCGeometryESModule",
86-
appendToDataLabel = cms.string('idealForAlignmentProducerBase'),
87-
debugV = cms.untracked.bool(False),
88-
useGangedStripsInME1a = cms.bool(False),
89-
alignmentsLabel = cms.string(''),
90-
useOnlyWiresInME1a = cms.bool(False),
91-
useRealWireGeometry = cms.bool(True),
92-
useCentreTIOffsets = cms.bool(False),
93-
applyAlignment = cms.bool(False),
94-
fromDDD = cms.bool(True),
95-
fromDD4hep = cms.bool(False)
96-
)
97-
GEMGeometryAlignmentProducerAsAnalyzer = cms.ESProducer("GEMGeometryESModule",
98-
appendToDataLabel = cms.string('idealForAlignmentProducerBase'),
99-
applyAlignment = cms.bool(False),
100-
alignmentsLabel = cms.string(''),
101-
fromDDD = cms.bool(True),
102-
fromDD4Hep = cms.bool(False)
103-
)
79+
import Geometry.DTGeometryBuilder.dtGeometryDB_cfi
80+
DTGeometryAlignmentProducerAsAnalyzer = Geometry.DTGeometryBuilder.dtGeometryDB_cfi.DTGeometryESModule.clone()
81+
DTGeometryAlignmentProducerAsAnalyzer.appendToDataLabel = 'idealForAlignmentProducerBase'
82+
import Geometry.CSCGeometryBuilder.cscGeometryDB_cfi
83+
CSCGeometryAlignmentProducerAsAnalyzer = Geometry.CSCGeometryBuilder.cscGeometryDB_cfi.CSCGeometryESModule.clone()
84+
CSCGeometryAlignmentProducerAsAnalyzer.appendToDataLabel = 'idealForAlignmentProducerBase'
85+
import Geometry.GEMGeometryBuilder.gemGeometryDB_cfi
86+
GEMGeometryAlignmentProducerAsAnalyzer = Geometry.GEMGeometryBuilder.gemGeometryDB_cfi.GEMGeometryESModule.clone()
87+
GEMGeometryAlignmentProducerAsAnalyzer.appendToDataLabel = 'idealForAlignmentProducerBase'

‎Alignment/CommonAlignmentProducer/python/AlignmentProducer_cff.py‎

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -78,28 +78,13 @@
7878
# update alignables if triggered by corresponding input IOV boundary
7979
enableAlignableUpdates = cms.bool(False),
8080
)
81-
DTGeometryAlignmentProducer = cms.ESProducer("DTGeometryESModule",
82-
appendToDataLabel = cms.string('idealForAlignmentProducerBase'),
83-
applyAlignment = cms.bool(False), ## to be abondoned (?)
84-
alignmentsLabel = cms.string(''),
85-
fromDDD = cms.bool(True)
86-
)
87-
CSCGeometryAlignmentProducer = cms.ESProducer("CSCGeometryESModule",
88-
appendToDataLabel = cms.string('idealForAlignmentProducerBase'),
89-
debugV = cms.untracked.bool(False),
90-
useGangedStripsInME1a = cms.bool(False),
91-
alignmentsLabel = cms.string(''),
92-
useOnlyWiresInME1a = cms.bool(False),
93-
useRealWireGeometry = cms.bool(True),
94-
useCentreTIOffsets = cms.bool(False),
95-
applyAlignment = cms.bool(False), ## GF: to be abandoned
96-
fromDDD = cms.bool(True),
97-
fromDD4hep = cms.bool(False)
98-
)
99-
GEMGeometryAlignmentProducer = cms.ESProducer("GEMGeometryESModule",
100-
appendToDataLabel = cms.string('idealForAlignmentProducerBase'),
101-
applyAlignment = cms.bool(False),
102-
alignmentsLabel = cms.string(''),
103-
fromDDD = cms.bool(True),
104-
fromDD4Hep = cms.bool(False)
105-
)
81+
82+
import Geometry.DTGeometryBuilder.dtGeometryDB_cfi
83+
DTGeometryAlignmentProducerAsAnalyzer = Geometry.DTGeometryBuilder.dtGeometryDB_cfi.DTGeometryESModule.clone()
84+
DTGeometryAlignmentProducerAsAnalyzer.appendToDataLabel = 'idealForAlignmentProducerBase'
85+
import Geometry.CSCGeometryBuilder.cscGeometryDB_cfi
86+
CSCGeometryAlignmentProducerAsAnalyzer = Geometry.CSCGeometryBuilder.cscGeometryDB_cfi.CSCGeometryESModule.clone()
87+
CSCGeometryAlignmentProducerAsAnalyzer.appendToDataLabel = 'idealForAlignmentProducerBase'
88+
import Geometry.GEMGeometryBuilder.gemGeometryDB_cfi
89+
GEMGeometryAlignmentProducerAsAnalyzer = Geometry.GEMGeometryBuilder.gemGeometryDB_cfi.GEMGeometryESModule.clone()
90+
GEMGeometryAlignmentProducerAsAnalyzer.appendToDataLabel = 'idealForAlignmentProducerBase'

‎Alignment/CommonAlignmentProducer/src/AlignmentProducerBase.cc‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ AlignmentProducerBase::AlignmentProducerBase(const edm::ParameterSet& config, ed
4747
saveDeformationsToDB_{config.getParameter<bool>("saveDeformationsToDB")},
4848
useSurvey_{config.getParameter<bool>("useSurvey")},
4949
enableAlignableUpdates_{config.getParameter<bool>("enableAlignableUpdates")},
50-
idealGeometryLabel("idealForAlignmentProducerBase"),
5150
ttopoToken_(iC.esConsumes<edm::Transition::BeginRun>()),
5251
geomDetToken_(iC.esConsumes<edm::Transition::BeginRun>()),
5352
ptpToken_(iC.esConsumes<edm::Transition::BeginRun>()),
54-
//dtGeomToken_(iC.esConsumes<edm::Transition::BeginRun>(edm::ESInputTag("", "idealForAlignmentProducerBase"))),
55-
//cscGeomToken_(iC.esConsumes<edm::Transition::BeginRun>(edm::ESInputTag("", "idealForAlignmentProducerBase"))),
56-
//gemGeomToken_(iC.esConsumes<edm::Transition::BeginRun>(edm::ESInputTag("", "idealForAlignmentProducerBase"))),
53+
ptitpToken_(iC.esConsumes<edm::Transition::BeginRun>()),
54+
dtGeomToken_(iC.esConsumes<edm::Transition::BeginRun>(edm::ESInputTag("", "idealForAlignmentProducerBase"))),
55+
cscGeomToken_(iC.esConsumes<edm::Transition::BeginRun>(edm::ESInputTag("", "idealForAlignmentProducerBase"))),
56+
gemGeomToken_(iC.esConsumes<edm::Transition::BeginRun>(edm::ESInputTag("", "idealForAlignmentProducerBase"))),
5757
tkAliToken_(iC.esConsumes<edm::Transition::BeginRun>()),
5858
dtAliToken_(iC.esConsumes<edm::Transition::BeginRun>()),
5959
cscAliToken_(iC.esConsumes<edm::Transition::BeginRun>()),
@@ -431,17 +431,15 @@ void AlignmentProducerBase::createGeometries(const edm::EventSetup& iSetup, cons
431431
if (doTracker_) {
432432
const GeometricDet* geometricDet = &iSetup.getData(geomDetToken_);
433433
const PTrackerParameters* ptp = &iSetup.getData(ptpToken_);
434+
const PTrackerAdditionalParametersPerDet* ptitp = &iSetup.getData(ptitpToken_);
434435
TrackerGeomBuilderFromGeometricDet trackerBuilder;
435-
trackerGeometry_ = std::shared_ptr<TrackerGeometry>(trackerBuilder.build(geometricDet, *ptp, tTopo));
436+
trackerGeometry_ = std::shared_ptr<TrackerGeometry>(trackerBuilder.build(geometricDet, ptitp, *ptp, tTopo));
436437
}
437438

438439
if (doMuon_) {
439-
iSetup.get<MuonGeometryRecord>().get(idealGeometryLabel, muonDTGeometry_);
440-
iSetup.get<MuonGeometryRecord>().get(idealGeometryLabel, muonCSCGeometry_);
441-
iSetup.get<MuonGeometryRecord>().get(idealGeometryLabel, muonGEMGeometry_);
442-
//muonDTGeometry_ = iSetup.getHandle(dtGeomToken_);
443-
//muonCSCGeometry_ = iSetup.getHandle(cscGeomToken_);
444-
//muonGEMGeometry_ = iSetup.getHandle(gemGeomToken_);
440+
muonDTGeometry_ = iSetup.getHandle(dtGeomToken_);
441+
muonCSCGeometry_ = iSetup.getHandle(cscGeomToken_);
442+
muonGEMGeometry_ = iSetup.getHandle(gemGeomToken_);
445443
}
446444
}
447445

‎Alignment/Geners/interface/AbsReader.hh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ namespace gs {
7373
return it->second->read(id, in);
7474
}
7575

76-
private:
7776
DefaultReader(const DefaultReader &) = delete;
7877
DefaultReader &operator=(const DefaultReader &) = delete;
7978
};
@@ -106,7 +105,6 @@ namespace gs {
106105
rd[id.name()] = new ConcreteReader<InheritanceBase, Derived>();
107106
}
108107

109-
private:
110108
// Disable the constructor
111109
StaticReader() = delete;
112110
};

‎Alignment/Geners/interface/AbsReference.hh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ namespace gs {
1414

1515
class AbsReference {
1616
public:
17+
AbsReference() = delete;
1718
inline virtual ~AbsReference() {}
1819

1920
inline AbsArchive &archive() const { return archive_; }
@@ -64,8 +65,6 @@ namespace gs {
6465
private:
6566
friend class AbsArchive;
6667

67-
AbsReference() = delete;
68-
6968
void initialize() const;
7069
void addItemId(unsigned long long id);
7170

‎Alignment/Geners/interface/ArrayAdaptor.hh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ namespace gs {
4141
return (const_cast<T *>(data_))[index];
4242
}
4343

44-
private:
4544
ArrayAdaptor() = delete;
4645

46+
private:
4747
const T *data_;
4848
std::size_t size_;
4949
bool writetemCl_;

0 commit comments

Comments
 (0)