Merge pull request #29905 from adewit/tkgeom-solidshapes

DD4Hep migration (SolidShapes) for TrackerNumberingBuilder (+TkAl & related CondTool/Geometry plugins)

Alignment/OfflineValidation/plugins/TrackerGeometryCompare.h

@@ -100,64 +100,65 @@ class TrackerGeometryCompare : public edm::EDAnalyzer {
   const SurveyErrors* theSurveyErrors;
 
   // configurables
-  const std::vector<std::string> _levelStrings;
-  std::string _moduleListName;
-  std::string _inputFilename1;
-  std::string _inputFilename2;
-  std::string _inputTreenameAlign;
-  std::string _inputTreenameDeform;
-  bool _writeToDB;
-  std::string _weightBy;
-  std::string _setCommonTrackerSystem;
-  bool _detIdFlag;
-  std::string _detIdFlagFile;
-  bool _weightById;
-  std::string _weightByIdFile;
-  std::vector<unsigned int> _weightByIdVector;
-
-  std::vector<uint32_t> _detIdFlagVector;
-  align::StructureType _commonTrackerLevel;
-  align::GlobalVector _TrackerCommonT;
-  align::GlobalVector _TrackerCommonR;
-  align::PositionType _TrackerCommonCM;
-
-  std::ifstream _moduleListFile;
-  std::vector<int> _moduleList;
-  int _moduleInList;
+  const std::vector<std::string> levelStrings_;
+  std::string moduleListName_;
+  std::string inputFilename1_;
+  std::string inputFilename2_;
+  std::string inputTreenameAlign_;
+  std::string inputTreenameDeform_;
+  bool fromDD4hep_;
+  bool writeToDB_;
+  std::string weightBy_;
+  std::string setCommonTrackerSystem_;
+  bool detIdFlag_;
+  std::string detIdFlagFile_;
+  bool weightById_;
+  std::string weightByIdFile_;
+  std::vector<unsigned int> weightByIdVector_;
+
+  std::vector<uint32_t> detIdFlagVector_;
+  align::StructureType commonTrackerLevel_;
+  align::GlobalVector TrackerCommonT_;
+  align::GlobalVector TrackerCommonR_;
+  align::PositionType TrackerCommonCM_;
+
+  std::ifstream moduleListFile_;
+  std::vector<int> moduleList_;
+  int moduleInList_;
 
   //root configuration
-  std::string _filename;
-  TFile* _theFile;
-  TTree* _alignTree;
-  TFile* _inputRootFile1;
-  TFile* _inputRootFile2;
-  TTree* _inputTree01;
-  TTree* _inputTree02;
-  TTree* _inputTree11;
-  TTree* _inputTree12;
+  std::string filename_;
+  TFile* theFile_;
+  TTree* alignTree_;
+  TFile* inputRootFile1_;
+  TFile* inputRootFile2_;
+  TTree* inputTree01_;
+  TTree* inputTree02_;
+  TTree* inputTree11_;
+  TTree* inputTree12_;
 
   /**\ Tree variables */
-  int _id, _badModuleQuality, _inModuleList, _level, _mid, _mlevel, _sublevel, _useDetId, _detDim;
-  float _xVal, _yVal, _zVal, _rVal, _etaVal, _phiVal, _alphaVal, _betaVal, _gammaVal;
+  int id_, badModuleQuality_, inModuleList_, level_, mid_, mlevel_, sublevel_, useDetId_, detDim_;
+  float xVal_, yVal_, zVal_, rVal_, etaVal_, phiVal_, alphaVal_, betaVal_, gammaVal_;
   // changes in global variables
-  float _dxVal, _dyVal, _dzVal, _drVal, _dphiVal, _dalphaVal, _dbetaVal, _dgammaVal;
+  float dxVal_, dyVal_, dzVal_, drVal_, dphiVal_, dalphaVal_, dbetaVal_, dgammaVal_;
   // changes local variables: u, v, w, alpha, beta, gamma
-  float _duVal, _dvVal, _dwVal, _daVal, _dbVal, _dgVal;
-  float _surWidth, _surLength;
-  uint32_t _identifiers[6];
-  double _surRot[9];
-  int _type;
-  double _surfDeform[13];
+  float duVal_, dvVal_, dwVal_, daVal_, dbVal_, dgVal_;
+  float surWidth_, surLength_;
+  uint32_t identifiers_[6];
+  double surRot_[9];
+  int type_;
+  double surfDeform_[13];
 
-  int m_nBins;
-  double m_rangeLow;
-  double m_rangeHigh;
+  int m_nBins_;
+  double m_rangeLow_;
+  double m_rangeHigh_;
 
   bool firstEvent_;
 
-  std::vector<TrackerMap> m_vtkmap;
+  std::vector<TrackerMap> m_vtkmap_;
 
-  std::map<std::string, TH1D*> m_h1;
+  std::map<std::string, TH1D*> m_h1_;
 };
 
 #endif

Alignment/OfflineValidation/python/TrackerGeometryCompare_cfi.py

@@ -2,6 +2,7 @@
 
 # Full configuration for Tracker Geometry Comparison Tool
 TrackerGeometryCompare = cms.EDAnalyzer("TrackerGeometryCompare",		
+    fromDD4hep = cms.untracked.bool(False),
     writeToDB = cms.untracked.bool(False),
     outputFile = cms.untracked.string('output.root'),
     setCommonTrackerSystem = cms.untracked.string('NONE'), ##must be "NONE" if you don't want to use this option

CondTools/Geometry/plugins/PGeometricDetBuilder.cc

@@ -10,33 +10,48 @@
 #include "CondFormats/GeometryObjects/interface/PGeometricDet.h"
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
 #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
+#include "DetectorDescription/DDCMS/interface/DDCompactView.h"
 #include "DetectorDescription/Core/interface/DDCompactView.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include <vector>
 
+using DD3Vector = ROOT::Math::DisplacementVector3D<ROOT::Math::Cartesian3D<double>>;
+using Translation = ROOT::Math::DisplacementVector3D<ROOT::Math::Cartesian3D<double>>;
+using RotationMatrix = ROOT::Math::Rotation3D;
+
 class PGeometricDetBuilder : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
 public:
-  PGeometricDetBuilder(const edm::ParameterSet&) {}
+  PGeometricDetBuilder(const edm::ParameterSet&);
 
   void beginRun(edm::Run const& iEvent, edm::EventSetup const&) override;
   void analyze(edm::Event const& iEvent, edm::EventSetup const&) override {}
   void endRun(edm::Run const& iEvent, edm::EventSetup const&) override {}
 
 private:
   void putOne(const GeometricDet* gd, PGeometricDet* pgd, int lev);
+  bool fromDD4hep_;
 };
 
+PGeometricDetBuilder::PGeometricDetBuilder(const edm::ParameterSet& iConfig) {
+  fromDD4hep_ = iConfig.getParameter<bool>("fromDD4hep");
+}
+
 void PGeometricDetBuilder::beginRun(const edm::Run&, edm::EventSetup const& es) {
   PGeometricDet* pgd = new PGeometricDet;
   edm::Service<cond::service::PoolDBOutputService> mydbservice;
   if (!mydbservice.isAvailable()) {
     edm::LogError("PGeometricDetBuilder") << "PoolDBOutputService unavailable";
     return;
   }
-  edm::ESTransientHandle<DDCompactView> pDD;
+  if (!fromDD4hep_) {
+    edm::ESTransientHandle<DDCompactView> pDD;
+    es.get<IdealGeometryRecord>().get(pDD);
+  } else {
+    edm::ESTransientHandle<cms::DDCompactView> pDD;
+    es.get<IdealGeometryRecord>().get(pDD);
+  }
   edm::ESHandle<GeometricDet> rDD;
-  es.get<IdealGeometryRecord>().get(pDD);
   es.get<IdealGeometryRecord>().get(rDD);
   const GeometricDet* tracker = &(*rDD);
 
@@ -114,8 +129,8 @@ void PGeometricDetBuilder::beginRun(const edm::Run&, edm::EventSetup const& es)
 
 void PGeometricDetBuilder::putOne(const GeometricDet* gd, PGeometricDet* pgd, int lev) {
   PGeometricDet::Item item;
-  const DDTranslation& tran = gd->translation();
-  const DDRotationMatrix& rot = gd->rotation();
+  const Translation& tran = gd->translation();
+  const RotationMatrix& rot = gd->rotation();
   DD3Vector x, y, z;
   rot.GetComponents(x, y, z);
   item._name = gd->name();
@@ -135,9 +150,9 @@ void PGeometricDetBuilder::putOne(const GeometricDet* gd, PGeometricDet* pgd, in
   item._a31 = x.Z();
   item._a32 = y.Z();
   item._a33 = z.Z();
-  item._shape = static_cast<int>(gd->shape());
+  item._shape = static_cast<int>(gd->shape_dd4hep());
   item._type = gd->type();
-  if (gd->shape() == DDSolidShape::ddbox) {
+  if (gd->shape_dd4hep() == cms::DDSolidShape::ddbox) {
     item._params0 = gd->params()[0];
     item._params1 = gd->params()[1];
     item._params2 = gd->params()[2];
@@ -149,7 +164,7 @@ void PGeometricDetBuilder::putOne(const GeometricDet* gd, PGeometricDet* pgd, in
     item._params8 = 0;
     item._params9 = 0;
     item._params10 = 0;
-  } else if (gd->shape() == DDSolidShape::ddtrap) {
+  } else if (gd->shape_dd4hep() == cms::DDSolidShape::ddtrap) {
     item._params0 = gd->params()[0];
     item._params1 = gd->params()[1];
     item._params2 = gd->params()[2];

CondTools/Geometry/plugins/PGeometricDetExtraBuilder.cc

@@ -10,33 +10,45 @@
 #include "CondFormats/GeometryObjects/interface/PGeometricDetExtra.h"
 #include "Geometry/Records/interface/PGeometricDetExtraRcd.h"
 #include "Geometry/TrackerNumberingBuilder/interface/GeometricDetExtra.h"
+#include "DetectorDescription/DDCMS/interface/DDCompactView.h"
 #include "DetectorDescription/Core/interface/DDCompactView.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include <vector>
 
 class PGeometricDetExtraBuilder : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
 public:
-  PGeometricDetExtraBuilder(const edm::ParameterSet&) {}
+  PGeometricDetExtraBuilder(const edm::ParameterSet&);
 
   void beginRun(edm::Run const& iEvent, edm::EventSetup const&) override;
   void analyze(edm::Event const& iEvent, edm::EventSetup const&) override {}
   void endRun(edm::Run const& iEvent, edm::EventSetup const&) override {}
 
 private:
   void putOne(const GeometricDetExtra& gde, PGeometricDetExtra* pgde);
+  bool fromDD4hep_;
 };
 
+PGeometricDetExtraBuilder::PGeometricDetExtraBuilder(const edm::ParameterSet& iConfig) {
+  fromDD4hep_ = iConfig.getParameter<bool>("fromDD4hep");
+}
+
 void PGeometricDetExtraBuilder::beginRun(const edm::Run&, edm::EventSetup const& es) {
   PGeometricDetExtra* pgde = new PGeometricDetExtra;
   edm::Service<cond::service::PoolDBOutputService> mydbservice;
   if (!mydbservice.isAvailable()) {
     edm::LogError("PGeometricDetExtraBuilder") << "PoolDBOutputService unavailable";
     return;
   }
-  edm::ESTransientHandle<DDCompactView> cpvH;
+
+  if (!fromDD4hep_) {
+    edm::ESTransientHandle<DDCompactView> cpvH;
+    es.get<IdealGeometryRecord>().get(cpvH);
+  } else {
+    edm::ESTransientHandle<cms::DDCompactView> cpvH;
+    es.get<IdealGeometryRecord>().get(cpvH);
+  }
   edm::ESHandle<std::vector<GeometricDetExtra> > gdeH;
-  es.get<IdealGeometryRecord>().get(cpvH);
   es.get<IdealGeometryRecord>().get(gdeH);
   const std::vector<GeometricDetExtra>& gdes = (*gdeH);
 

CondTools/Geometry/plugins/PTrackerParametersDBBuilder.cc

@@ -5,31 +5,46 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
 #include "CondFormats/GeometryObjects/interface/PTrackerParameters.h"
+#include "DetectorDescription/DDCMS/interface/DDCompactView.h"
 #include "DetectorDescription/Core/interface/DDCompactView.h"
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerParametersFromDD.h"
 
 class PTrackerParametersDBBuilder : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
 public:
-  PTrackerParametersDBBuilder(const edm::ParameterSet&) {}
+  PTrackerParametersDBBuilder(const edm::ParameterSet&);
 
   void beginRun(edm::Run const& iEvent, edm::EventSetup const&) override;
   void analyze(edm::Event const& iEvent, edm::EventSetup const&) override {}
   void endRun(edm::Run const& iEvent, edm::EventSetup const&) override {}
+
+private:
+  bool fromDD4hep_;
 };
 
+PTrackerParametersDBBuilder::PTrackerParametersDBBuilder(const edm::ParameterSet& iConfig) {
+  fromDD4hep_ = iConfig.getParameter<bool>("fromDD4hep");
+}
+
 void PTrackerParametersDBBuilder::beginRun(const edm::Run&, edm::EventSetup const& es) {
   PTrackerParameters* ptp = new PTrackerParameters;
   edm::Service<cond::service::PoolDBOutputService> mydbservice;
   if (!mydbservice.isAvailable()) {
     edm::LogError("PTrackerParametersDBBuilder") << "PoolDBOutputService unavailable";
     return;
   }
-  edm::ESTransientHandle<DDCompactView> cpv;
-  es.get<IdealGeometryRecord>().get(cpv);
 
   TrackerParametersFromDD builder;
-  builder.build(&(*cpv), *ptp);
+
+  if (!fromDD4hep_) {
+    edm::ESTransientHandle<DDCompactView> cpv;
+    es.get<IdealGeometryRecord>().get(cpv);
+    builder.build(&(*cpv), *ptp);
+  } else {
+    edm::ESTransientHandle<cms::DDCompactView> cpv;
+    es.get<IdealGeometryRecord>().get(cpv);
+    builder.build(&(*cpv), *ptp);
+  }
 
   if (mydbservice->isNewTagRequest("PTrackerParametersRcd")) {
     mydbservice->createNewIOV<PTrackerParameters>(

CondTools/Geometry/test/geometrywriter.py

@@ -21,9 +21,9 @@
                                                            fromDDD = cms.bool( True )
                                                            )
 
-process.TrackerGeometryWriter = cms.EDAnalyzer("PGeometricDetBuilder")
-process.TrackerGeometryExtraWriter = cms.EDAnalyzer("PGeometricDetExtraBuilder")
-process.TrackerParametersWriter = cms.EDAnalyzer("PTrackerParametersDBBuilder")
+process.TrackerGeometryWriter = cms.EDAnalyzer("PGeometricDetBuilder",fromDD4hep=cms.bool( False ))
+process.TrackerGeometryExtraWriter = cms.EDAnalyzer("PGeometricDetExtraBuilder", fromDD4hep=cms.bool( False ))
+process.TrackerParametersWriter = cms.EDAnalyzer("PTrackerParametersDBBuilder", fromDD4hep=cms.bool( False ))
 
 process.CaloGeometryWriter = cms.EDAnalyzer("PCaloGeometryBuilder")
 

CondTools/Geometry/test/trackergeometrywriter.py

@@ -15,9 +15,9 @@
                                                            fromDDD = cms.bool( True )
                                                            )
 
-process.TrackerGeometryWriter = cms.EDAnalyzer("PGeometricDetBuilder")
-process.TrackerGeometryExtraWriter = cms.EDAnalyzer("PGeometricDetExtraBuilder")
-process.TrackerParametersWriter = cms.EDAnalyzer("PTrackerParametersDBBuilder")
+process.TrackerGeometryWriter = cms.EDAnalyzer("PGeometricDetBuilder", fromDD4hep=cms.bool(False))
+process.TrackerGeometryExtraWriter = cms.EDAnalyzer("PGeometricDetExtraBuilder", fromDD4hep=cms.bool(False))
+process.TrackerParametersWriter = cms.EDAnalyzer("PTrackerParametersDBBuilder", fromDD4hep=cms.bool(False))
 
 process.CondDB.timetype = cms.untracked.string('runnumber')
 process.CondDB.connect = cms.string('sqlite_file:myfile.db')

CondTools/Geometry/test/trackergeometrywriterRun2.py

@@ -15,9 +15,9 @@
                                                            fromDDD = cms.bool( True )
                                                            )
 
-process.TrackerGeometryWriter = cms.EDAnalyzer("PGeometricDetBuilder")
-process.TrackerGeometryExtraWriter = cms.EDAnalyzer("PGeometricDetExtraBuilder")
-process.TrackerParametersWriter = cms.EDAnalyzer("PTrackerParametersDBBuilder")
+process.TrackerGeometryWriter = cms.EDAnalyzer("PGeometricDetBuilder",fromDD4hep=cms.bool( False ))
+process.TrackerGeometryExtraWriter = cms.EDAnalyzer("PGeometricDetExtraBuilder",fromDD4hep=cms.bool( False ))
+process.TrackerParametersWriter = cms.EDAnalyzer("PTrackerParametersDBBuilder",fromDD4hep=cms.bool( False ))
 
 process.CondDB.timetype = cms.untracked.string('runnumber')
 process.CondDB.connect = cms.string('sqlite_file:myfilerun2.db')

CondTools/Geometry/test/writehelpers/geometryExtended2016_writer.py

@@ -31,9 +31,9 @@
                                                            fromDDD = cms.bool( True ),
                                                            )
 
-process.TrackerGeometryWriter = cms.EDAnalyzer("PGeometricDetBuilder")
-process.TrackerGeometryExtraWriter = cms.EDAnalyzer("PGeometricDetExtraBuilder")
-process.TrackerParametersWriter = cms.EDAnalyzer("PTrackerParametersDBBuilder")
+process.TrackerGeometryWriter = cms.EDAnalyzer("PGeometricDetBuilder",fromDD4hep=cms.bool(False))
+process.TrackerGeometryExtraWriter = cms.EDAnalyzer("PGeometricDetExtraBuilder",fromDD4hep=cms.bool(False))
+process.TrackerParametersWriter = cms.EDAnalyzer("PTrackerParametersDBBuilder",fromDD4hep=cms.bool(False))
 
 process.CaloGeometryWriter = cms.EDAnalyzer("PCaloGeometryBuilder")
 

CondTools/Geometry/test/writehelpers/geometryExtended2017Plan1_writer.py

@@ -32,9 +32,9 @@
                                                            fromDDD = cms.bool( True ),
                                                            )
 
-process.TrackerGeometryWriter = cms.EDAnalyzer("PGeometricDetBuilder")
-process.TrackerGeometryExtraWriter = cms.EDAnalyzer("PGeometricDetExtraBuilder")
-process.TrackerParametersWriter = cms.EDAnalyzer("PTrackerParametersDBBuilder")
+process.TrackerGeometryWriter = cms.EDAnalyzer("PGeometricDetBuilder",fromDD4hep=cms.bool(False))
+process.TrackerGeometryExtraWriter = cms.EDAnalyzer("PGeometricDetExtraBuilder",fromDD4hep=cms.bool(False))
+process.TrackerParametersWriter = cms.EDAnalyzer("PTrackerParametersDBBuilder",fromDD4hep=cms.bool(False))
 
 process.CaloGeometryWriter = cms.EDAnalyzer("PCaloGeometryBuilder")
 

CondTools/Geometry/test/writehelpers/geometryExtended2017_writer.py

@@ -32,9 +32,9 @@
                                                            fromDDD = cms.bool( True ),
                                                            )
 
-process.TrackerGeometryWriter = cms.EDAnalyzer("PGeometricDetBuilder")
-process.TrackerGeometryExtraWriter = cms.EDAnalyzer("PGeometricDetExtraBuilder")
-process.TrackerParametersWriter = cms.EDAnalyzer("PTrackerParametersDBBuilder")
+process.TrackerGeometryWriter = cms.EDAnalyzer("PGeometricDetBuilder",fromDD4hep=cms.bool(False))
+process.TrackerGeometryExtraWriter = cms.EDAnalyzer("PGeometricDetExtraBuilder",fromDD4hep=cms.bool(False))
+process.TrackerParametersWriter = cms.EDAnalyzer("PTrackerParametersDBBuilder",fromDD4hep=cms.bool(False))
 
 process.CaloGeometryWriter = cms.EDAnalyzer("PCaloGeometryBuilder")
 

CondTools/Geometry/test/writehelpers/geometryExtended2018_writer.py

@@ -32,9 +32,9 @@
                                                            fromDDD = cms.bool( True ),
                                                            )
 
-process.TrackerGeometryWriter = cms.EDAnalyzer("PGeometricDetBuilder")
-process.TrackerGeometryExtraWriter = cms.EDAnalyzer("PGeometricDetExtraBuilder")
-process.TrackerParametersWriter = cms.EDAnalyzer("PTrackerParametersDBBuilder")
+process.TrackerGeometryWriter = cms.EDAnalyzer("PGeometricDetBuilder",fromDD4hep=cms.bool(False))
+process.TrackerGeometryExtraWriter = cms.EDAnalyzer("PGeometricDetExtraBuilder",fromDD4hep=cms.bool(False))
+process.TrackerParametersWriter = cms.EDAnalyzer("PTrackerParametersDBBuilder",fromDD4hep=cms.bool(False))
 
 process.CaloGeometryWriter = cms.EDAnalyzer("PCaloGeometryBuilder")