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

Removed use of boost::mpl::vector for dependent Records #30874

Merged
merged 3 commits into from
Jul 28, 2020
Merged

Removed use of boost::mpl::vector for dependent Records #30874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
25b0f17
Removed use of boost::mpl from DependentRecord system
Dr15Jones Jul 22, 2020
8600aac
Switched to using edm::mpl::Vector for dependent Records
Dr15Jones Jul 22, 2020
5d09caf
Added missing header file
Dr15Jones Jul 22, 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
10 changes: 5 additions & 5 deletions CalibCalorimetry/EcalLaserCorrection/interface/EcalLaserDbRecord.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#ifndef ECALLASERCORRECTION_ECALLASERDBRECORD_H
#define ECALLASERCORRECTION_ECALLASERDBRECORD_H

#include "boost/mpl/vector.hpp"
#include "FWCore/Utilities/interface/mplVector.h"
#include "FWCore/Framework/interface/DependentRecordImplementation.h"
// #include "FWCore/Framework/interface/EventSetupRecordImplementation.h"

Expand All @@ -18,9 +18,9 @@

class EcalLaserDbRecord
: public edm::eventsetup::DependentRecordImplementation<EcalLaserDbRecord,
boost::mpl::vector<EcalLaserAlphasRcd,
EcalLaserAPDPNRatiosRefRcd,
EcalLaserAPDPNRatiosRcd,
EcalLinearCorrectionsRcd> > {};
edm::mpl::Vector<EcalLaserAlphasRcd,
EcalLaserAPDPNRatiosRefRcd,
EcalLaserAPDPNRatiosRcd,
EcalLinearCorrectionsRcd> > {};

#endif /* ECALLASERCORRECTION_ECALLASERDBRECORD_H */
10 changes: 5 additions & 5 deletions CalibCalorimetry/EcalLaserCorrection/interface/EcalLaserDbRecordMC.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#ifndef ECALLASERCORRECTION_ECALLASERDBRECORDMC_H
#define ECALLASERCORRECTION_ECALLASERDBRECORDMC_H

#include "boost/mpl/vector.hpp"
#include "FWCore/Utilities/interface/mplVector.h"
#include "FWCore/Framework/interface/DependentRecordImplementation.h"

#include "CondFormats/DataRecord/interface/EcalLaserAlphasRcd.h"
Expand All @@ -15,9 +15,9 @@

class EcalLaserDbRecordMC
: public edm::eventsetup::DependentRecordImplementation<EcalLaserDbRecordMC,
boost::mpl::vector<EcalLaserAlphasRcd,
EcalLaserAPDPNRatiosRefRcd,
EcalLaserAPDPNRatiosMCRcd,
EcalLinearCorrectionsRcd> > {};
edm::mpl::Vector<EcalLaserAlphasRcd,
EcalLaserAPDPNRatiosRefRcd,
EcalLaserAPDPNRatiosMCRcd,
EcalLinearCorrectionsRcd> > {};

#endif /* ECALLASERCORRECTION_ECALLASERDBRECORDMC_H */
2 changes: 1 addition & 1 deletion CalibFormats/CaloTPG/interface/CaloTPGRecord.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

class CaloTPGRecord
: public edm::eventsetup::DependentRecordImplementation<CaloTPGRecord,
boost::mpl::vector<HcalLutMetadataRcd, CaloGeometryRecord> > {
edm::mpl::Vector<HcalLutMetadataRcd, CaloGeometryRecord> > {
};

#endif
16 changes: 8 additions & 8 deletions CalibFormats/CastorObjects/interface/CastorDbRecord.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<usage>
*/

#include "boost/mpl/vector.hpp"
#include "FWCore/Utilities/interface/mplVector.h"
#include "FWCore/Framework/interface/DependentRecordImplementation.h"
// #include "FWCore/Framework/interface/EventSetupRecordImplementation.h"

Expand All @@ -28,12 +28,12 @@

class CastorDbRecord
: public edm::eventsetup::DependentRecordImplementation<CastorDbRecord,
boost::mpl::vector<CastorPedestalsRcd,
CastorPedestalWidthsRcd,
CastorGainsRcd,
CastorGainWidthsRcd,
CastorQIEDataRcd,
CastorChannelQualityRcd,
CastorElectronicsMapRcd> > {};
edm::mpl::Vector<CastorPedestalsRcd,
CastorPedestalWidthsRcd,
CastorGainsRcd,
CastorGainWidthsRcd,
CastorQIEDataRcd,
CastorChannelQualityRcd,
CastorElectronicsMapRcd> > {};

#endif /* CASTORDBPRODUCER_CASTORDBRECORD_H */
2 changes: 1 addition & 1 deletion CalibFormats/CastorObjects/interface/CastorTPGRecord.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
#include "CalibFormats/CastorObjects/interface/CastorDbRecord.h"

class CastorTPGRecord
: public edm::eventsetup::DependentRecordImplementation<CastorTPGRecord, boost::mpl::vector<CastorDbRecord> > {};
: public edm::eventsetup::DependentRecordImplementation<CastorTPGRecord, edm::mpl::Vector<CastorDbRecord> > {};

#endif
55 changes: 27 additions & 28 deletions CalibFormats/HcalObjects/interface/HcalDbRecord.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// Author:
// Created: Tue Aug 9 19:10:36 CDT 2005
//
#include "boost/mpl/vector/vector30.hpp"
#include "FWCore/Utilities/interface/mplVector.h"
#include "FWCore/Framework/interface/DependentRecordImplementation.h"
// #include "FWCore/Framework/interface/EventSetupRecordImplementation.h"

Expand All @@ -27,32 +27,31 @@

// class HcalDbRecord : public edm::eventsetup::EventSetupRecordImplementation<HcalDbRecord> {};

class HcalDbRecord
: public edm::eventsetup::DependentRecordImplementation<HcalDbRecord,
boost::mpl::vector25<HcalRecNumberingRecord,
IdealGeometryRecord,
HcalPedestalsRcd,
HcalPedestalWidthsRcd,
HcalGainsRcd,
HcalGainWidthsRcd,
HcalQIEDataRcd,
HcalQIETypesRcd,
HcalChannelQualityRcd,
HcalZSThresholdsRcd,
HcalRespCorrsRcd,
HcalL1TriggerObjectsRcd,
HcalElectronicsMapRcd,
HcalTimeCorrsRcd,
HcalLUTCorrsRcd,
HcalPFCorrsRcd,
HcalFrontEndMapRcd,
HcalSiPMCharacteristicsRcd,
HcalSiPMParametersRcd,
HcalTPParametersRcd,
HcalTPChannelParametersRcd,
HcalLutMetadataRcd,
HcalMCParamsRcd,
HcalRecoParamsRcd,
HcalTimeSlewRecord> > {};
class HcalDbRecord : public edm::eventsetup::DependentRecordImplementation<HcalDbRecord,
edm::mpl::Vector<HcalRecNumberingRecord,
IdealGeometryRecord,
HcalPedestalsRcd,
HcalPedestalWidthsRcd,
HcalGainsRcd,
HcalGainWidthsRcd,
HcalQIEDataRcd,
HcalQIETypesRcd,
HcalChannelQualityRcd,
HcalZSThresholdsRcd,
HcalRespCorrsRcd,
HcalL1TriggerObjectsRcd,
HcalElectronicsMapRcd,
HcalTimeCorrsRcd,
HcalLUTCorrsRcd,
HcalPFCorrsRcd,
HcalFrontEndMapRcd,
HcalSiPMCharacteristicsRcd,
HcalSiPMParametersRcd,
HcalTPParametersRcd,
HcalTPChannelParametersRcd,
HcalLutMetadataRcd,
HcalMCParamsRcd,
HcalRecoParamsRcd,
HcalTimeSlewRecord> > {};

#endif /* HCALDBPRODUCER_HCALDBRECORD_H */
2 changes: 1 addition & 1 deletion CalibFormats/HcalObjects/interface/HcalTPGRecord.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@

class HcalTPGRecord : public edm::eventsetup::DependentRecordImplementation<
HcalTPGRecord,
boost::mpl::vector<HcalRecNumberingRecord, IdealGeometryRecord, HcalDbRecord> > {};
edm::mpl::Vector<HcalRecNumberingRecord, IdealGeometryRecord, HcalDbRecord> > {};

#endif
4 changes: 2 additions & 2 deletions CalibTracker/Records/interface/SiPixel2DTemplateDBObjectESProducerRcd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
#include "CondFormats/DataRecord/interface/SiPixel2DTemplateDBObjectRcd.h"

#include "boost/mpl/vector.hpp"
#include "FWCore/Utilities/interface/mplVector.h"

class SiPixel2DTemplateDBObjectESProducerRcd
: public edm::eventsetup::DependentRecordImplementation<
SiPixel2DTemplateDBObjectESProducerRcd,
boost::mpl::vector<IdealMagneticFieldRecord, SiPixel2DTemplateDBObjectRcd> > {};
edm::mpl::Vector<IdealMagneticFieldRecord, SiPixel2DTemplateDBObjectRcd> > {};

#endif
4 changes: 2 additions & 2 deletions CalibTracker/Records/interface/SiPixelFEDChannelContainerESProducerRcd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@

#include "FWCore/Framework/interface/EventSetupRecordImplementation.h"
#include "FWCore/Framework/interface/DependentRecordImplementation.h"
#include "boost/mpl/vector.hpp"
#include "FWCore/Utilities/interface/mplVector.h"
#include "CondFormats/DataRecord/interface/SiPixelStatusScenariosRcd.h"

class SiPixelFEDChannelContainerESProducerRcd
: public edm::eventsetup::DependentRecordImplementation<SiPixelFEDChannelContainerESProducerRcd,
boost::mpl::vector<SiPixelStatusScenariosRcd> > {};
edm::mpl::Vector<SiPixelStatusScenariosRcd> > {};

#endif
4 changes: 2 additions & 2 deletions CalibTracker/Records/interface/SiPixelGenErrorDBObjectESProducerRcd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@

#include "FWCore/Framework/interface/EventSetupRecordImplementation.h"
#include "FWCore/Framework/interface/DependentRecordImplementation.h"
#include "boost/mpl/vector.hpp"
#include "FWCore/Utilities/interface/mplVector.h"

#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
#include "CondFormats/DataRecord/interface/SiPixelGenErrorDBObjectRcd.h"

class SiPixelGenErrorDBObjectESProducerRcd
: public edm::eventsetup::DependentRecordImplementation<
SiPixelGenErrorDBObjectESProducerRcd,
boost::mpl::vector<IdealMagneticFieldRecord, SiPixelGenErrorDBObjectRcd> > {};
edm::mpl::Vector<IdealMagneticFieldRecord, SiPixelGenErrorDBObjectRcd> > {};

#endif
4 changes: 2 additions & 2 deletions CalibTracker/Records/interface/SiPixelTemplateDBObjectESProducerRcd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@

#include "FWCore/Framework/interface/EventSetupRecordImplementation.h"
#include "FWCore/Framework/interface/DependentRecordImplementation.h"
#include "boost/mpl/vector.hpp"
#include "FWCore/Utilities/interface/mplVector.h"

#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
#include "CondFormats/DataRecord/interface/SiPixelTemplateDBObjectRcd.h"

class SiPixelTemplateDBObjectESProducerRcd
: public edm::eventsetup::DependentRecordImplementation<
SiPixelTemplateDBObjectESProducerRcd,
boost::mpl::vector<IdealMagneticFieldRecord, SiPixelTemplateDBObjectRcd> > {};
edm::mpl::Vector<IdealMagneticFieldRecord, SiPixelTemplateDBObjectRcd> > {};

#endif
Loading