Skip to content

Commit f73d140

Browse files
cmsbuildcmsbuild
authored
Merge pull request #48216 from leobeltra/simplify_and_improve_macros
Merged SoAView into SoALayout and added heterogeneous deepCopy for PortableCollections
2 parents 3c9125e + 9d7deb8 commit f73d140

Some content is hidden

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

44 files changed

+1697
-1305
lines changed

‎CondFormats/EcalObjects/interface/EcalElectronicsMappingSoA.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
#include "DataFormats/SoATemplate/interface/SoACommon.h"
55
#include "DataFormats/SoATemplate/interface/SoALayout.h"
6-
#include "DataFormats/SoATemplate/interface/SoAView.h"
76

87
GENERATE_SOA_LAYOUT(EcalElectronicsMappingSoALayout, SOA_COLUMN(uint32_t, rawid))
98

‎CondFormats/EcalObjects/interface/EcalMultifitConditionsSoA.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#include <Eigen/Dense>
66
#include "DataFormats/SoATemplate/interface/SoACommon.h"
77
#include "DataFormats/SoATemplate/interface/SoALayout.h"
8-
#include "DataFormats/SoATemplate/interface/SoAView.h"
98
#include "DataFormats/EcalDigi/interface/EcalConstants.h"
109
#include "CondFormats/EcalObjects/interface/EcalPulseShapes.h"
1110

‎CondFormats/EcalObjects/interface/EcalRecHitConditionsSoA.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
#include "DataFormats/SoATemplate/interface/SoACommon.h"
55
#include "DataFormats/SoATemplate/interface/SoALayout.h"
6-
#include "DataFormats/SoATemplate/interface/SoAView.h"
76
#include "DataFormats/Provenance/interface/Timestamp.h"
87

98
GENERATE_SOA_LAYOUT(EcalRecHitConditionsSoALayout,

‎CondFormats/HGCalObjects/interface/HGCalCalibParamSoA.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
#include "DataFormats/SoATemplate/interface/SoACommon.h"
88
#include "DataFormats/SoATemplate/interface/SoALayout.h"
9-
#include "DataFormats/SoATemplate/interface/SoAView.h"
109

1110
//#include "CondFormats/HGCalObjects/interface/HGCalMappingModuleIndexer.h"
1211

‎CondFormats/HGCalObjects/interface/HGCalMappingParameterSoA.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
#include "DataFormats/SoATemplate/interface/SoACommon.h"
55
#include "DataFormats/SoATemplate/interface/SoALayout.h"
6-
#include "DataFormats/SoATemplate/interface/SoAView.h"
76

87
#include "CondFormats/HGCalObjects/interface/HGCalMappingModuleIndexer.h"
98
#include "CondFormats/HGCalObjects/interface/HGCalMappingCellIndexer.h"

‎CondFormats/HcalObjects/interface/HcalMahiConditionsSoA.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
#include "DataFormats/SoATemplate/interface/SoACommon.h"
77
#include "DataFormats/SoATemplate/interface/SoALayout.h"
8-
#include "DataFormats/SoATemplate/interface/SoAView.h"
98

109
#include <array>
1110

‎CondFormats/HcalObjects/interface/HcalRecoParamWithPulseShapeSoA.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
#include "DataFormats/SoATemplate/interface/SoACommon.h"
77
#include "DataFormats/SoATemplate/interface/SoALayout.h"
8-
#include "DataFormats/SoATemplate/interface/SoAView.h"
98

109
#include <array>
1110

‎CondFormats/HcalObjects/interface/HcalSiPMCharacteristicsSoA.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
#include "DataFormats/SoATemplate/interface/SoACommon.h"
77
#include "DataFormats/SoATemplate/interface/SoALayout.h"
8-
#include "DataFormats/SoATemplate/interface/SoAView.h"
98

109
namespace hcal {
1110
GENERATE_SOA_LAYOUT(HcalSiPMCharacteristicsSoALayout,

‎DataFormats/HGCalDigi/interface/HGCalDigiSoA.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
#include "DataFormats/SoATemplate/interface/SoACommon.h"
77
#include "DataFormats/SoATemplate/interface/SoALayout.h"
8-
#include "DataFormats/SoATemplate/interface/SoAView.h"
98

109
namespace hgcaldigi {
1110

‎DataFormats/HGCalDigi/interface/HGCalECONDPacketInfoSoA.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
#include "DataFormats/SoATemplate/interface/SoACommon.h"
99
#include "DataFormats/SoATemplate/interface/SoALayout.h"
10-
#include "DataFormats/SoATemplate/interface/SoAView.h"
1110

1211
namespace hgcaldigi {
1312

0 commit comments

Comments
 (0)