Fixed issue with plugin registration for CondHDF5ESSource

cms-sw · Jul 31, 2023 · 199a8c6 · 199a8c6
1 parent e2698df
commit 199a8c6
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 28 deletions.
diff --git 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
@@ -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
@@ -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
@@ -46,14 +46,14 @@
 #include "CondFormats/DataRecord/interface/ESChannelStatusRcd.h"
 
 REGISTER_PLUGIN(ESGainRcd, ESGain);
-REGISTER_PLUGIN(ESPedestalsRcd, ESCondObjectContainer<ESPedestal>);
+REGISTER_PLUGIN(ESPedestalsRcd, ESPedestals); //is ESCondObjectContainer<ESPedestal> but needs to match name registered with EventSetup system
 REGISTER_PLUGIN(ESTimeSampleWeightsRcd, ESTimeSampleWeights);
-REGISTER_PLUGIN(ESIntercalibConstantsRcd, ESCondObjectContainer<float>);
+REGISTER_PLUGIN(ESIntercalibConstantsRcd, ESFloatCondObjectContainer); //is ESCondObjectContainer<float> but needs to match name registered with EventSetup system
 REGISTER_PLUGIN_NO_SERIAL(ESAngleCorrectionFactorsRcd, ESCondObjectContainer<float>);
 REGISTER_PLUGIN(ESADCToGeVConstantRcd, ESADCToGeVConstant);
 REGISTER_PLUGIN(ESMIPToGeVConstantRcd, ESMIPToGeVConstant);
 REGISTER_PLUGIN(ESThresholdsRcd, ESThresholds);
 REGISTER_PLUGIN(ESEEIntercalibConstantsRcd, ESEEIntercalibConstants);
 REGISTER_PLUGIN(ESMissingEnergyCalibrationRcd, ESMissingEnergyCalibration);
 REGISTER_PLUGIN(ESRecHitRatioCutsRcd, ESRecHitRatioCuts);
-REGISTER_PLUGIN(ESChannelStatusRcd, ESCondObjectContainer<ESChannelStatusCode>);
+REGISTER_PLUGIN(ESChannelStatusRcd, ESChannelStatus); //is ESCondObjectContainer<ESChannelStatusCode> but needs to match name registered with EventSetup system
diff --git 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<EcalPedestal>);
-REGISTER_PLUGIN(EcalWeightXtalGroupsRcd, EcalCondObjectContainer<EcalXtalGroupId>);
+REGISTER_PLUGIN(EcalPedestalsRcd, EcalPedestals); //is EcalCondObjectContainer<EcalPedestal>
+REGISTER_PLUGIN(EcalWeightXtalGroupsRcd, EcalWeightXtalGroups); // is EcalCondObjectContainer<EcalXtalGroupId>
 REGISTER_PLUGIN(EcalTBWeightsRcd, EcalTBWeights);
-REGISTER_PLUGIN(EcalGainRatiosRcd, EcalCondObjectContainer<EcalMGPAGainRatio>);
+REGISTER_PLUGIN(EcalGainRatiosRcd, EcalGainRatios); // is EcalCondObjectContainer<EcalMGPAGainRatio>
 REGISTER_PLUGIN(EcalLinearCorrectionsRcd, EcalTimeDependentCorrections);
-REGISTER_PLUGIN(EcalIntercalibConstantsRcd, EcalCondObjectContainer<float>);
+REGISTER_PLUGIN(EcalIntercalibConstantsRcd, EcalFloatCondObjectContainer); //is EcalCondObjectContainer<float>
 REGISTER_PLUGIN_NO_SERIAL(EcalIntercalibConstantsMCRcd, EcalCondObjectContainer<float>);
 REGISTER_PLUGIN_NO_SERIAL(EcalTimeCalibConstantsRcd, EcalCondObjectContainer<float>);
 REGISTER_PLUGIN_NO_SERIAL(EcalTimeCalibErrorsRcd, EcalCondObjectContainer<float>);
@@ -194,7 +194,7 @@ REGISTER_PLUGIN_NO_SERIAL(EcalLaserAlphasRcd, EcalCondObjectContainer<float>);
 REGISTER_PLUGIN(EcalLaserAPDPNRatiosRcd, EcalLaserAPDPNRatios);
 REGISTER_PLUGIN_NO_SERIAL(EcalLaserAPDPNRatiosMCRcd, EcalLaserAPDPNRatios);
 REGISTER_PLUGIN_NO_SERIAL(EcalLaserAPDPNRatiosRefRcd, EcalCondObjectContainer<float>);
-REGISTER_PLUGIN(EcalChannelStatusRcd, EcalCondObjectContainer<EcalChannelStatusCode>);
+REGISTER_PLUGIN(EcalChannelStatusRcd, EcalChannelStatus); //is EcalCondObjectContainer<EcalChannelStatusCode>
 REGISTER_PLUGIN_NO_SERIAL(EcalPFRecHitThresholdsRcd, EcalCondObjectContainer<float>);
 REGISTER_PLUGIN_NO_SERIAL(EcalPFSeedingThresholdsRcd, EcalCondObjectContainer<float>);
 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<EcalMappingElement>);
+REGISTER_PLUGIN(EcalMappingElectronicsRcd, EcalMappingElectronics); //is EcalCondObjectContainer<EcalMappingElement>
 
-REGISTER_PLUGIN(EcalTPGPedestalsRcd, EcalCondObjectContainer<EcalTPGPedestal>);
+REGISTER_PLUGIN(EcalTPGPedestalsRcd, EcalTPGPedestals); //is EcalCondObjectContainer<EcalTPGPedestal>
 REGISTER_PLUGIN(EcalTPGFineGrainEBGroupRcd, EcalTPGFineGrainEBGroup);
 REGISTER_PLUGIN(EcalTPGFineGrainEBIdMapRcd, EcalTPGFineGrainEBIdMap);
 REGISTER_PLUGIN(EcalTPGFineGrainStripEERcd, EcalTPGFineGrainStripEE);
 REGISTER_PLUGIN(EcalTPGFineGrainTowerEERcd, EcalTPGFineGrainTowerEE);
-REGISTER_PLUGIN(EcalTPGLinearizationConstRcd, EcalCondObjectContainer<EcalTPGLinearizationConstant>);
+REGISTER_PLUGIN(EcalTPGLinearizationConstRcd, EcalTPGLinearizationConst);// is EcalCondObjectContainer<EcalTPGLinearizationConstant>
 REGISTER_PLUGIN(EcalTPGLutGroupRcd, EcalTPGLutGroup);
 REGISTER_PLUGIN(EcalTPGLutIdMapRcd, EcalTPGLutIdMap);
 REGISTER_PLUGIN(EcalTPGPhysicsConstRcd, EcalTPGPhysicsConst);
@@ -225,26 +225,26 @@ REGISTER_PLUGIN(EcalTPGOddWeightIdMapRcd, EcalTPGOddWeightIdMap);
 
 REGISTER_PLUGIN(EcalTPGTPModeRcd, EcalTPGTPMode);
 
-REGISTER_PLUGIN(EcalTPGCrystalStatusRcd, EcalCondObjectContainer<EcalTPGCrystalStatusCode>);
+REGISTER_PLUGIN(EcalTPGCrystalStatusRcd, EcalTPGCrystalStatus); // is EcalCondObjectContainer<EcalTPGCrystalStatusCode>
 REGISTER_PLUGIN(EcalTPGTowerStatusRcd, EcalTPGTowerStatus);
 REGISTER_PLUGIN(EcalTPGStripStatusRcd, EcalTPGStripStatus);
 REGISTER_PLUGIN(EcalTPGSpikeRcd, EcalTPGSpike);
 
-REGISTER_PLUGIN(EcalDCSTowerStatusRcd, EcalCondTowerObjectContainer<EcalChannelStatusCode>);
-REGISTER_PLUGIN(EcalDAQTowerStatusRcd, EcalCondTowerObjectContainer<EcalDAQStatusCode>);
+REGISTER_PLUGIN(EcalDCSTowerStatusRcd,EcalDCSTowerStatus); // is EcalCondTowerObjectContainer<EcalChannelStatusCode>
+REGISTER_PLUGIN(EcalDAQTowerStatusRcd, EcalDAQTowerStatus); // is EcalCondTowerObjectContainer<EcalDAQStatusCode>
 
-REGISTER_PLUGIN(EcalDQMChannelStatusRcd, EcalCondObjectContainer<EcalDQMStatusCode>);
-REGISTER_PLUGIN(EcalDQMTowerStatusRcd, EcalCondTowerObjectContainer<EcalDQMStatusCode>);
+REGISTER_PLUGIN(EcalDQMChannelStatusRcd, EcalDQMChannelStatus); // is EcalCondObjectContainer<EcalDQMStatusCode>
+REGISTER_PLUGIN(EcalDQMTowerStatusRcd, EcalDQMTowerStatus); // is EcalCondTowerObjectContainer<EcalDQMStatusCode>
 
 REGISTER_PLUGIN(EcalSRSettingsRcd, EcalSRSettings);
 REGISTER_PLUGIN(EcalSampleMaskRcd, EcalSampleMask);
 
 REGISTER_PLUGIN(EcalTimeBiasCorrectionsRcd, EcalTimeBiasCorrections);
 
 REGISTER_PLUGIN(EcalSamplesCorrelationRcd, EcalSamplesCorrelation);
-REGISTER_PLUGIN(EcalPulseShapesRcd, EcalCondObjectContainer<EcalPulseShape>);
-REGISTER_PLUGIN(EcalPulseCovariancesRcd, EcalCondObjectContainer<EcalPulseCovariance>);
-REGISTER_PLUGIN(EcalPulseSymmCovariancesRcd, EcalCondObjectContainer<EcalPulseSymmCovariance>);
+REGISTER_PLUGIN(EcalPulseShapesRcd, EcalPulseShapes); //is EcalCondObjectContainer<EcalPulseShape>
+REGISTER_PLUGIN(EcalPulseCovariancesRcd, EcalPulseCovariances); //is EcalCondObjectContainer<EcalPulseCovariance>
+REGISTER_PLUGIN(EcalPulseSymmCovariancesRcd, EcalPulseSymmCovariances); //is EcalCondObjectContainer<EcalPulseSymmCovariance>
 
 REGISTER_PLUGIN(EcalMustacheSCParametersRcd, EcalMustacheSCParameters);
 REGISTER_PLUGIN(EcalSCDynamicDPhiParametersRcd, EcalSCDynamicDPhiParameters);
diff --git 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<HFPhase1PMTData>);
+REGISTER_PLUGIN(HFPhase1PMTParamsRcd, HFPhase1PMTParams); // is HcalItemCollById<HFPhase1PMTData>
diff --git 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
@@ -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
@@ -87,4 +87,4 @@ REGISTER_PLUGIN(PixelCaenChannelIsOnRcd, PixelDCSObject<bool>);
 REGISTER_PLUGIN(PixelCaenChannelIMonRcd, PixelDCSObject<float>);
 REGISTER_PLUGIN(PixelCaenChannelRcd, PixelDCSObject<CaenChannel>);
 
-REGISTER_PLUGIN(SiPixelDetVOffRcd, SiStripDetVOff);
+REGISTER_PLUGIN_NO_SERIAL(SiPixelDetVOffRcd, SiStripDetVOff);
diff --git 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);