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

CTPPS Sim and Reco: Change of paradigm: oldDD and DD4hep in parallel #31383

Merged
merged 43 commits into from
Sep 15, 2020
Merged

CTPPS Sim and Reco: Change of paradigm: oldDD and DD4hep in parallel #31383

Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
5523641
add missing includes
davidlange6 Sep 3, 2020
09e5d71
Remove DD4hep-specific SpecPar section from Geometry/VeryForwardData/…
ghugo83 Sep 4, 2020
490f41f
change return type of PPSGeometryESProducer::applyAlignments
ghugo83 Sep 4, 2020
5c1cdbb
More meaningful names in PPSGeometryESProducer::applyAlignments (pD, …
ghugo83 Sep 4, 2020
5c72fd3
Fixed exception handling of alignments.product() in PPSGeometryESProd…
ghugo83 Sep 4, 2020
e8861ff
Merged dl200903 from repository davidlange6 with cms-merge-topic
ghugo83 Sep 4, 2020
5f83176
Fixed BuildFiles + add template for old DD producers
ghugo83 Sep 4, 2020
e1801da
Restore old DD scenarios + move DD4hep scenarios to dedicated repo.
ghugo83 Sep 4, 2020
4ff6dcf
Update geom print files
ghugo83 Sep 4, 2020
e1372d6
IMPORTANT: MAJOR COMMIT, restoring old DD producers, and making code …
ghugo83 Sep 4, 2020
8d81d41
Restore oldDD test files + Add print geom and to DB test files for DD…
ghugo83 Sep 4, 2020
da02c2f
PPSGeometryBuilder needs to have diffrent names for old DD and DD4hep.
ghugo83 Sep 4, 2020
6d78e24
Cannot add a constructor to CondFormats/GeometryObjects/interface/PDe…
ghugo83 Sep 4, 2020
88eada1
Fix navigation
ghugo83 Sep 4, 2020
fe13468
Fix DetId computation, to be able to work for both old DD abd DD4hep,…
ghugo83 Sep 5, 2020
8ed1a87
Fix assignment operator (bool isDD4hep) + write computeDiamondDimensi…
ghugo83 Sep 5, 2020
aeda00c
only complain about looking at a non-box when calling getDiamondDiemn…
ghugo83 Sep 5, 2020
4f9b9d3
Renamed writer to DB + minor commnents.
ghugo83 Sep 5, 2020
0e8e6ea
Clearer variable naming in tree navigation + helper function in DB wr…
ghugo83 Sep 5, 2020
5640c2b
Modify ppsgeometrywriter to be able to write both DD and DD4hep in th…
ghugo83 Sep 5, 2020
93db1ea
CTPPSGeometryESModule.cc handles both old DD and DD4hep
ghugo83 Sep 7, 2020
581d173
Revert "Merge pull request #31359 from cms-sw/revert-31240-CTPPS_final"
ghugo83 Sep 7, 2020
953c2a7
Merged parallel_oldDD_DD4hep from repository ghugo83 with cms-merge-t…
ghugo83 Sep 7, 2020
cefac77
Merged parallel_oldDD_DD4hep from repository ghugo83 with cms-merge-t…
ghugo83 Sep 7, 2020
9c70184
Simplify Geometry/VeryForwardGeometryBuilder/plugins/BuildFile.xml
ghugo83 Sep 7, 2020
5361fd8
Merged parallel_oldDD_DD4hep from repository ghugo83 with cms-merge-t…
ghugo83 Sep 7, 2020
4e4c6be
scram build code-format
ghugo83 Sep 7, 2020
395d3df
Merged parallel_oldDD_DD4hep from repository ghugo83 with cms-merge-t…
ghugo83 Sep 7, 2020
2cd78f1
Merged parallel_oldDD_DD4hep from repository ghugo83 with cms-merge-t…
ghugo83 Sep 8, 2020
43304bd
ESWatcher and better style in writer to DB.
ghugo83 Sep 8, 2020
1432c32
Use ESGetToken instead of legacy way, to access data in writer to DB.
ghugo83 Sep 8, 2020
8f3df1c
Fix use of std::string_view
ghugo83 Sep 8, 2020
d6560af
clean headers
ghugo83 Sep 9, 2020
18d2de6
Updates BuildFiles: legacy SimPPS/RPDigiProducer and RecoPPS/Local we…
ghugo83 Sep 9, 2020
bde378f
Use dd4hep::isA<dd4hep::Box>(fv.solid()) instead of fv.isABox()
ghugo83 Sep 9, 2020
17d7aa6
Revert "Remove DD4hep-specific SpecPar section from Geometry/VeryForw…
ghugo83 Sep 9, 2020
dd7d783
XMLs in old DD and DD4hep should be identical: Add DD4hep SpecPar in …
ghugo83 Sep 9, 2020
4a484e3
Fix in previous commit does not work: not possible to have paths whic…
ghugo83 Sep 9, 2020
e7b72bb
Better DetGeomDesc printout + fix namespace access.
ghugo83 Sep 9, 2020
74f7e3a
scram build code-format
ghugo83 Sep 9, 2020
999ddce
Merge branch 'master' into parallel_oldDD_DD4hep
ghugo83 Sep 14, 2020
310bf13
Merged parallel_oldDD_DD4hep from repository ghugo83 with cms-merge-t…
ghugo83 Sep 14, 2020
a1cb064
Fixed merge conflict, part 2.
ghugo83 Sep 14, 2020
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
11 changes: 4 additions & 7 deletions CondFormats/GeometryObjects/interface/PDetGeomDesc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,16 @@

class PDetGeomDesc {
public:
PDetGeomDesc(){};
~PDetGeomDesc(){};

struct Item {
// Translation matrix elements
double dx_, dy_, dz_;
double dx_, dy_, dz_; // in mm
// Rotation matrix elements
double axx_, axy_, axz_, ayx_, ayy_, ayz_, azx_, azy_, azz_;
std::string name_;
std::vector<double> params_;
uint32_t geographicalID_; // to be converted to DetId
std::vector<double> params_; // default unit: mm from oldDD, cm from DD4hep
uint32_t geographicalID_; // to be converted to DetId
int copy_;
float z_;
float z_; // in mm
std::string sensorType_;

COND_SERIALIZABLE;
Expand Down
8 changes: 5 additions & 3 deletions CondTools/Geometry/plugins/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
<use name="CondCore/DBOutputService"/>
<use name="CondFormats/Common"/>
<use name="CondFormats/GeometryObjects"/>
<use name="DataFormats/CTPPSDetId"/>
<use name="DetectorDescription/Core"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ServiceRegistry"/>
Expand All @@ -25,6 +23,10 @@
<use name="Geometry/MuonNumbering"/>
<use name="Geometry/HGCalGeometry"/>
<use name="Geometry/VeryForwardGeometryBuilder"/>
<library file="*.cc" name="CondToolsGeometryPlugins">
<use name="dd4hep"/>
<use name="DetectorDescription/Core"/>
<use name="DetectorDescription/DDCMS"/>

<library name="CondToolsGeometryPlugins" file="*.cc">
<flags EDM_PLUGIN="1"/>
</library>
Loading