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

Jump to bottom

Removing Duplications of some DD Algos #8327

Merged
merged 2 commits into from
Mar 20, 2015
Merged

Removing Duplications of some DD Algos #8327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfa873e
Remove DDAlgo Duplicate
boudoul Mar 16, 2015
3633144
removing duplicates
boudoul Mar 16, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Geometry/TrackerCommonData/plugins/DDPixBarLayerUpgradeAlgo.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "DetectorDescription/Core/interface/DDMaterial.h"
#include "DetectorDescription/Core/interface/DDCurrentNamespace.h"
#include "DetectorDescription/Core/interface/DDSplit.h"
#include "SLHCUpgradeSimulations/Geometry/interface/DDPixBarLayerUpgradeAlgo.h"
#include "Geometry/TrackerCommonData/plugins/DDPixBarLayerUpgradeAlgo.h"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we actually allow including across plugins?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nevermind...

#include "CLHEP/Units/PhysicalConstants.h"
#include "CLHEP/Units/SystemOfUnits.h"

Expand Down
2 changes: 1 addition & 1 deletion Geometry/TrackerCommonData/plugins/DDPixFwdDiskAlgo.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "DetectorDescription/Base/interface/DDutils.h"
#include "DetectorDescription/Core/interface/DDCurrentNamespace.h"
#include "DetectorDescription/Core/interface/DDSplit.h"
#include "SLHCUpgradeSimulations/Geometry/interface/DDPixFwdDiskAlgo.h"
#include "Geometry/TrackerCommonData/plugins/DDPixFwdDiskAlgo.h"
#include "CLHEP/Units/PhysicalConstants.h"
#include "CLHEP/Units/SystemOfUnits.h"

Expand Down
45 changes: 0 additions & 45 deletions SLHCUpgradeSimulations/Geometry/interface/DDPixBarLayerUpgradeAlgo.h
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions SLHCUpgradeSimulations/Geometry/interface/DDPixFwdDiskAlgo.h
View file
Open in desktop

This file was deleted.

172 changes: 0 additions & 172 deletions SLHCUpgradeSimulations/Geometry/src/DDPixBarLayerUpgradeAlgo.cc
View file
Open in desktop

This file was deleted.

111 changes: 0 additions & 111 deletions SLHCUpgradeSimulations/Geometry/src/DDPixFwdDiskAlgo.cc
View file
Open in desktop

This file was deleted.