From 199a8c68acc4c85ef0a956892ac015e46d23f3b6 Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Mon, 31 Jul 2023 12:09:46 -0500 Subject: [PATCH] Fixed issue with plugin registration for CondHDF5ESSource --- CondCore/BTauPlugins/src/plugin.cc | 2 +- CondCore/CTPPSPlugins/src/plugin.cc | 2 +- CondCore/DQMPlugins/src/plugin.cc | 2 +- CondCore/ESPlugins/src/plugin.cc | 6 ++-- CondCore/EcalPlugins/src/plugin.cc | 32 +++++++++---------- CondCore/HcalPlugins/src/plugin.cc | 2 +- CondCore/L1TPlugins/src/RCTRecords.cc | 3 +- CondCore/SiPhase2TrackerPlugins/src/plugin.cc | 2 +- CondCore/SiPixelPlugins/plugins/plugin.cc | 2 +- CondFormats/MFObjects/plugins/plugin.cc | 2 +- 10 files changed, 27 insertions(+), 28 deletions(-) diff --git a/CondCore/BTauPlugins/src/plugin.cc b/CondCore/BTauPlugins/src/plugin.cc index 8f2b3a007c734..0bc9194c2c5a2 100644 --- a/CondCore/BTauPlugins/src/plugin.cc +++ b/CondCore/BTauPlugins/src/plugin.cc @@ -16,7 +16,7 @@ using namespace PhysicsTools::Calibration; REGISTER_PLUGIN(CombinedTauTagRcd, CombinedTauTagCalibration); -REGISTER_PLUGIN(BTauGenericMVAJetTagComputerRcd, MVAComputerContainer); +REGISTER_PLUGIN_NO_SERIAL(BTauGenericMVAJetTagComputerRcd, MVAComputerContainer); REGISTER_PLUGIN_NO_SERIAL(TauTagMVAComputerRcd, MVAComputerContainer); REGISTER_PLUGIN(BTagTrackProbability2DRcd, TrackProbabilityCalibration); REGISTER_PLUGIN_NO_SERIAL(BTagTrackProbability3DRcd, TrackProbabilityCalibration); diff --git a/CondCore/CTPPSPlugins/src/plugin.cc b/CondCore/CTPPSPlugins/src/plugin.cc index 970087269e071..a0e1767ee35b4 100644 --- a/CondCore/CTPPSPlugins/src/plugin.cc +++ b/CondCore/CTPPSPlugins/src/plugin.cc @@ -47,6 +47,6 @@ REGISTER_PLUGIN(CTPPSOpticsRcd, LHCOpticalFunctionsSetCollection); REGISTER_PLUGIN(PPSDirectSimulationDataRcd, PPSDirectSimulationData); REGISTER_PLUGIN(PPSPixelTopologyRcd, PPSPixelTopology); REGISTER_PLUGIN(PPSAlignmentConfigRcd, PPSAlignmentConfig); -REGISTER_PLUGIN_NO_SERIAL(PPSAlignmentConfigurationRcd, PPSAlignmentConfiguration); +REGISTER_PLUGIN(PPSAlignmentConfigurationRcd, PPSAlignmentConfiguration); REGISTER_PLUGIN_INIT(PPSAssociationCutsRcd, PPSAssociationCuts, InitAssociationCuts); diff --git a/CondCore/DQMPlugins/src/plugin.cc b/CondCore/DQMPlugins/src/plugin.cc index 68ab17d020750..1ac1ed01754b6 100644 --- a/CondCore/DQMPlugins/src/plugin.cc +++ b/CondCore/DQMPlugins/src/plugin.cc @@ -7,6 +7,6 @@ REGISTER_PLUGIN(DQMSummaryRcd, DQMSummary); REGISTER_PLUGIN(HDQMSummaryRcd, HDQMSummary); #include "CondFormats/Common/interface/FileBlob.h" #include "CondFormats/DataRecord/interface/DQMReferenceHistogramRootFileRcd.h" -REGISTER_PLUGIN(DQMReferenceHistogramRootFileRcd, FileBlob); +REGISTER_PLUGIN_NO_SERIAL(DQMReferenceHistogramRootFileRcd, FileBlob); #include "CondFormats/DataRecord/interface/DQMXMLFileRcd.h" REGISTER_PLUGIN_NO_SERIAL(DQMXMLFileRcd, FileBlob); diff --git a/CondCore/ESPlugins/src/plugin.cc b/CondCore/ESPlugins/src/plugin.cc index 45691868063ab..81f5217b780ac 100644 --- a/CondCore/ESPlugins/src/plugin.cc +++ b/CondCore/ESPlugins/src/plugin.cc @@ -46,9 +46,9 @@ #include "CondFormats/DataRecord/interface/ESChannelStatusRcd.h" REGISTER_PLUGIN(ESGainRcd, ESGain); -REGISTER_PLUGIN(ESPedestalsRcd, ESCondObjectContainer); +REGISTER_PLUGIN(ESPedestalsRcd, ESPedestals); //is ESCondObjectContainer but needs to match name registered with EventSetup system REGISTER_PLUGIN(ESTimeSampleWeightsRcd, ESTimeSampleWeights); -REGISTER_PLUGIN(ESIntercalibConstantsRcd, ESCondObjectContainer); +REGISTER_PLUGIN(ESIntercalibConstantsRcd, ESFloatCondObjectContainer); //is ESCondObjectContainer but needs to match name registered with EventSetup system REGISTER_PLUGIN_NO_SERIAL(ESAngleCorrectionFactorsRcd, ESCondObjectContainer); REGISTER_PLUGIN(ESADCToGeVConstantRcd, ESADCToGeVConstant); REGISTER_PLUGIN(ESMIPToGeVConstantRcd, ESMIPToGeVConstant); @@ -56,4 +56,4 @@ REGISTER_PLUGIN(ESThresholdsRcd, ESThresholds); REGISTER_PLUGIN(ESEEIntercalibConstantsRcd, ESEEIntercalibConstants); REGISTER_PLUGIN(ESMissingEnergyCalibrationRcd, ESMissingEnergyCalibration); REGISTER_PLUGIN(ESRecHitRatioCutsRcd, ESRecHitRatioCuts); -REGISTER_PLUGIN(ESChannelStatusRcd, ESCondObjectContainer); +REGISTER_PLUGIN(ESChannelStatusRcd, ESChannelStatus); //is ESCondObjectContainer but needs to match name registered with EventSetup system diff --git a/CondCore/EcalPlugins/src/plugin.cc b/CondCore/EcalPlugins/src/plugin.cc index 8c05b56de3904..efe554f7c8670 100644 --- a/CondCore/EcalPlugins/src/plugin.cc +++ b/CondCore/EcalPlugins/src/plugin.cc @@ -178,12 +178,12 @@ #include "CondFormats/EcalObjects/interface/EcalSCDynamicDPhiParameters.h" #include "CondFormats/DataRecord/interface/EcalSCDynamicDPhiParametersRcd.h" -REGISTER_PLUGIN(EcalPedestalsRcd, EcalCondObjectContainer); -REGISTER_PLUGIN(EcalWeightXtalGroupsRcd, EcalCondObjectContainer); +REGISTER_PLUGIN(EcalPedestalsRcd, EcalPedestals); //is EcalCondObjectContainer +REGISTER_PLUGIN(EcalWeightXtalGroupsRcd, EcalWeightXtalGroups); // is EcalCondObjectContainer REGISTER_PLUGIN(EcalTBWeightsRcd, EcalTBWeights); -REGISTER_PLUGIN(EcalGainRatiosRcd, EcalCondObjectContainer); +REGISTER_PLUGIN(EcalGainRatiosRcd, EcalGainRatios); // is EcalCondObjectContainer REGISTER_PLUGIN(EcalLinearCorrectionsRcd, EcalTimeDependentCorrections); -REGISTER_PLUGIN(EcalIntercalibConstantsRcd, EcalCondObjectContainer); +REGISTER_PLUGIN(EcalIntercalibConstantsRcd, EcalFloatCondObjectContainer); //is EcalCondObjectContainer REGISTER_PLUGIN_NO_SERIAL(EcalIntercalibConstantsMCRcd, EcalCondObjectContainer); REGISTER_PLUGIN_NO_SERIAL(EcalTimeCalibConstantsRcd, EcalCondObjectContainer); REGISTER_PLUGIN_NO_SERIAL(EcalTimeCalibErrorsRcd, EcalCondObjectContainer); @@ -194,7 +194,7 @@ REGISTER_PLUGIN_NO_SERIAL(EcalLaserAlphasRcd, EcalCondObjectContainer); REGISTER_PLUGIN(EcalLaserAPDPNRatiosRcd, EcalLaserAPDPNRatios); REGISTER_PLUGIN_NO_SERIAL(EcalLaserAPDPNRatiosMCRcd, EcalLaserAPDPNRatios); REGISTER_PLUGIN_NO_SERIAL(EcalLaserAPDPNRatiosRefRcd, EcalCondObjectContainer); -REGISTER_PLUGIN(EcalChannelStatusRcd, EcalCondObjectContainer); +REGISTER_PLUGIN(EcalChannelStatusRcd, EcalChannelStatus); //is EcalCondObjectContainer REGISTER_PLUGIN_NO_SERIAL(EcalPFRecHitThresholdsRcd, EcalCondObjectContainer); REGISTER_PLUGIN_NO_SERIAL(EcalPFSeedingThresholdsRcd, EcalCondObjectContainer); REGISTER_PLUGIN(EcalClusterCrackCorrParametersRcd, EcalFunParams); @@ -206,14 +206,14 @@ REGISTER_PLUGIN_NO_SERIAL(EcalClusterEnergyCorrectionObjectSpecificParametersRcd REGISTER_PLUGIN(EcalSimPulseShapeRcd, EcalSimPulseShape); REGISTER_PLUGIN(EcalSimComponentShapeRcd, EcalSimComponentShape); -REGISTER_PLUGIN(EcalMappingElectronicsRcd, EcalCondObjectContainer); +REGISTER_PLUGIN(EcalMappingElectronicsRcd, EcalMappingElectronics); //is EcalCondObjectContainer -REGISTER_PLUGIN(EcalTPGPedestalsRcd, EcalCondObjectContainer); +REGISTER_PLUGIN(EcalTPGPedestalsRcd, EcalTPGPedestals); //is EcalCondObjectContainer REGISTER_PLUGIN(EcalTPGFineGrainEBGroupRcd, EcalTPGFineGrainEBGroup); REGISTER_PLUGIN(EcalTPGFineGrainEBIdMapRcd, EcalTPGFineGrainEBIdMap); REGISTER_PLUGIN(EcalTPGFineGrainStripEERcd, EcalTPGFineGrainStripEE); REGISTER_PLUGIN(EcalTPGFineGrainTowerEERcd, EcalTPGFineGrainTowerEE); -REGISTER_PLUGIN(EcalTPGLinearizationConstRcd, EcalCondObjectContainer); +REGISTER_PLUGIN(EcalTPGLinearizationConstRcd, EcalTPGLinearizationConst);// is EcalCondObjectContainer REGISTER_PLUGIN(EcalTPGLutGroupRcd, EcalTPGLutGroup); REGISTER_PLUGIN(EcalTPGLutIdMapRcd, EcalTPGLutIdMap); REGISTER_PLUGIN(EcalTPGPhysicsConstRcd, EcalTPGPhysicsConst); @@ -225,16 +225,16 @@ REGISTER_PLUGIN(EcalTPGOddWeightIdMapRcd, EcalTPGOddWeightIdMap); REGISTER_PLUGIN(EcalTPGTPModeRcd, EcalTPGTPMode); -REGISTER_PLUGIN(EcalTPGCrystalStatusRcd, EcalCondObjectContainer); +REGISTER_PLUGIN(EcalTPGCrystalStatusRcd, EcalTPGCrystalStatus); // is EcalCondObjectContainer REGISTER_PLUGIN(EcalTPGTowerStatusRcd, EcalTPGTowerStatus); REGISTER_PLUGIN(EcalTPGStripStatusRcd, EcalTPGStripStatus); REGISTER_PLUGIN(EcalTPGSpikeRcd, EcalTPGSpike); -REGISTER_PLUGIN(EcalDCSTowerStatusRcd, EcalCondTowerObjectContainer); -REGISTER_PLUGIN(EcalDAQTowerStatusRcd, EcalCondTowerObjectContainer); +REGISTER_PLUGIN(EcalDCSTowerStatusRcd,EcalDCSTowerStatus); // is EcalCondTowerObjectContainer +REGISTER_PLUGIN(EcalDAQTowerStatusRcd, EcalDAQTowerStatus); // is EcalCondTowerObjectContainer -REGISTER_PLUGIN(EcalDQMChannelStatusRcd, EcalCondObjectContainer); -REGISTER_PLUGIN(EcalDQMTowerStatusRcd, EcalCondTowerObjectContainer); +REGISTER_PLUGIN(EcalDQMChannelStatusRcd, EcalDQMChannelStatus); // is EcalCondObjectContainer +REGISTER_PLUGIN(EcalDQMTowerStatusRcd, EcalDQMTowerStatus); // is EcalCondTowerObjectContainer REGISTER_PLUGIN(EcalSRSettingsRcd, EcalSRSettings); REGISTER_PLUGIN(EcalSampleMaskRcd, EcalSampleMask); @@ -242,9 +242,9 @@ REGISTER_PLUGIN(EcalSampleMaskRcd, EcalSampleMask); REGISTER_PLUGIN(EcalTimeBiasCorrectionsRcd, EcalTimeBiasCorrections); REGISTER_PLUGIN(EcalSamplesCorrelationRcd, EcalSamplesCorrelation); -REGISTER_PLUGIN(EcalPulseShapesRcd, EcalCondObjectContainer); -REGISTER_PLUGIN(EcalPulseCovariancesRcd, EcalCondObjectContainer); -REGISTER_PLUGIN(EcalPulseSymmCovariancesRcd, EcalCondObjectContainer); +REGISTER_PLUGIN(EcalPulseShapesRcd, EcalPulseShapes); //is EcalCondObjectContainer +REGISTER_PLUGIN(EcalPulseCovariancesRcd, EcalPulseCovariances); //is EcalCondObjectContainer +REGISTER_PLUGIN(EcalPulseSymmCovariancesRcd, EcalPulseSymmCovariances); //is EcalCondObjectContainer REGISTER_PLUGIN(EcalMustacheSCParametersRcd, EcalMustacheSCParameters); REGISTER_PLUGIN(EcalSCDynamicDPhiParametersRcd, EcalSCDynamicDPhiParameters); diff --git a/CondCore/HcalPlugins/src/plugin.cc b/CondCore/HcalPlugins/src/plugin.cc index be904428c166f..7261c15ef0c26 100644 --- a/CondCore/HcalPlugins/src/plugin.cc +++ b/CondCore/HcalPlugins/src/plugin.cc @@ -106,4 +106,4 @@ REGISTER_PLUGIN(HcalSiPMParametersRcd, HcalSiPMParameters); REGISTER_PLUGIN_INIT(HcalSiPMCharacteristicsRcd, HcalSiPMCharacteristics, InitHcalSiPMCharacteristics); REGISTER_PLUGIN(HcalTPParametersRcd, HcalTPParameters); REGISTER_PLUGIN(HcalTPChannelParametersRcd, HcalTPChannelParameters); -REGISTER_PLUGIN(HFPhase1PMTParamsRcd, HcalItemCollById); +REGISTER_PLUGIN(HFPhase1PMTParamsRcd, HFPhase1PMTParams); // is HcalItemCollById diff --git a/CondCore/L1TPlugins/src/RCTRecords.cc b/CondCore/L1TPlugins/src/RCTRecords.cc index a905a8cb4768d..2936d71fc2e2e 100644 --- a/CondCore/L1TPlugins/src/RCTRecords.cc +++ b/CondCore/L1TPlugins/src/RCTRecords.cc @@ -22,5 +22,4 @@ REGISTER_PLUGIN(L1CaloEcalScaleRcd, L1CaloEcalScale); #include "CondFormats/L1TObjects/interface/L1CaloHcalScale.h" #include "CondFormats/DataRecord/interface/L1CaloHcalScaleRcd.h" -//L1CaloHcalScale is same as L1RCTParameters -REGISTER_PLUGIN_NO_SERIAL(L1CaloHcalScaleRcd, L1CaloHcalScale); +REGISTER_PLUGIN(L1CaloHcalScaleRcd, L1CaloHcalScale); diff --git a/CondCore/SiPhase2TrackerPlugins/src/plugin.cc b/CondCore/SiPhase2TrackerPlugins/src/plugin.cc index 8e31b5e06ec38..b65867adedac3 100644 --- a/CondCore/SiPhase2TrackerPlugins/src/plugin.cc +++ b/CondCore/SiPhase2TrackerPlugins/src/plugin.cc @@ -9,4 +9,4 @@ REGISTER_PLUGIN(TrackerDetToDTCELinkCablingMapRcd, TrackerDetToDTCELinkCablingMap); REGISTER_PLUGIN(SiPhase2OuterTrackerLorentzAngleRcd, SiPhase2OuterTrackerLorentzAngle); REGISTER_PLUGIN_NO_SERIAL(SiPhase2OuterTrackerLorentzAngleSimRcd, SiPhase2OuterTrackerLorentzAngle); -REGISTER_PLUGIN(SiPhase2OuterTrackerBadStripRcd, SiStripBadStrip); +REGISTER_PLUGIN_NO_SERIAL(SiPhase2OuterTrackerBadStripRcd, SiStripBadStrip); diff --git a/CondCore/SiPixelPlugins/plugins/plugin.cc b/CondCore/SiPixelPlugins/plugins/plugin.cc index efc2b46d49800..9c32d3dff121a 100644 --- a/CondCore/SiPixelPlugins/plugins/plugin.cc +++ b/CondCore/SiPixelPlugins/plugins/plugin.cc @@ -87,4 +87,4 @@ REGISTER_PLUGIN(PixelCaenChannelIsOnRcd, PixelDCSObject); REGISTER_PLUGIN(PixelCaenChannelIMonRcd, PixelDCSObject); REGISTER_PLUGIN(PixelCaenChannelRcd, PixelDCSObject); -REGISTER_PLUGIN(SiPixelDetVOffRcd, SiStripDetVOff); +REGISTER_PLUGIN_NO_SERIAL(SiPixelDetVOffRcd, SiStripDetVOff); diff --git a/CondFormats/MFObjects/plugins/plugin.cc b/CondFormats/MFObjects/plugins/plugin.cc index f825c0b396016..89d9ddc67d0b5 100644 --- a/CondFormats/MFObjects/plugins/plugin.cc +++ b/CondFormats/MFObjects/plugins/plugin.cc @@ -5,4 +5,4 @@ #include "CondFormats/DataRecord/interface/MFGeometryFileRcd.h" REGISTER_PLUGIN(MagFieldConfigRcd, MagFieldConfig); -REGISTER_PLUGIN(MFGeometryFileRcd, FileBlob); +REGISTER_PLUGIN_NO_SERIAL(MFGeometryFileRcd, FileBlob);