Merge pull request #10402 from argiro/ecaltypedefs-76X

expanded typdefs in plugin definition
cms-sw · Jul 30, 2015 · 0552345 · 0552345
2 parents 3d6139e + f555693
commit 0552345
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 28 deletions.
diff --git a/CondCore/ESPlugins/src/plugin.cc b/CondCore/ESPlugins/src/plugin.cc
@@ -46,15 +46,15 @@
 #include "CondFormats/DataRecord/interface/ESChannelStatusRcd.h"
 
 REGISTER_PLUGIN(ESGainRcd,ESGain);
-REGISTER_PLUGIN(ESPedestalsRcd,ESPedestals);
+REGISTER_PLUGIN(ESPedestalsRcd,ESCondObjectContainer<ESPedestal>);
 REGISTER_PLUGIN(ESTimeSampleWeightsRcd,ESTimeSampleWeights);
-REGISTER_PLUGIN(ESIntercalibConstantsRcd,ESFloatCondObjectContainer);
-REGISTER_PLUGIN(ESAngleCorrectionFactorsRcd,ESFloatCondObjectContainer);
+REGISTER_PLUGIN(ESIntercalibConstantsRcd,ESCondObjectContainer<float>);
+REGISTER_PLUGIN(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,ESChannelStatus);
+REGISTER_PLUGIN(ESChannelStatusRcd,ESCondObjectContainer<ESChannelStatusCode> );
 
diff --git a/CondCore/EcalPlugins/src/plugin.cc b/CondCore/EcalPlugins/src/plugin.cc
@@ -153,64 +153,64 @@
 
 #include "CondFormats/EcalObjects/interface/EcalPulseCovariances.h"
 #include "CondFormats/DataRecord/interface/EcalPulseCovariancesRcd.h"
-
 #include "CondFormats/EcalObjects/interface/EcalPulseSymmCovariances.h"
 #include "CondFormats/DataRecord/interface/EcalPulseSymmCovariancesRcd.h"
 
-REGISTER_PLUGIN(EcalPedestalsRcd,EcalPedestals);
-REGISTER_PLUGIN(EcalWeightXtalGroupsRcd,EcalWeightXtalGroups);
+
+REGISTER_PLUGIN(EcalPedestalsRcd,EcalCondObjectContainer<EcalPedestal>); 
+REGISTER_PLUGIN(EcalWeightXtalGroupsRcd,EcalCondObjectContainer<EcalXtalGroupId>);
 REGISTER_PLUGIN(EcalTBWeightsRcd,EcalTBWeights);
-REGISTER_PLUGIN(EcalGainRatiosRcd,EcalGainRatios);
-REGISTER_PLUGIN(EcalLinearCorrectionsRcd,EcalLinearCorrections);
-REGISTER_PLUGIN(EcalIntercalibConstantsRcd,EcalFloatCondObjectContainer);
-REGISTER_PLUGIN(EcalIntercalibConstantsMCRcd,EcalFloatCondObjectContainer);
-REGISTER_PLUGIN(EcalTimeCalibConstantsRcd,EcalFloatCondObjectContainer);
-REGISTER_PLUGIN(EcalTimeCalibErrorsRcd,EcalFloatCondObjectContainer);
+REGISTER_PLUGIN(EcalGainRatiosRcd,EcalCondObjectContainer<EcalMGPAGainRatio>);
+REGISTER_PLUGIN(EcalLinearCorrectionsRcd,EcalTimeDependentCorrections);
+REGISTER_PLUGIN(EcalIntercalibConstantsRcd,EcalCondObjectContainer<float>);
+REGISTER_PLUGIN(EcalIntercalibConstantsMCRcd,EcalCondObjectContainer<float>);
+REGISTER_PLUGIN(EcalTimeCalibConstantsRcd,EcalCondObjectContainer<float>);
+REGISTER_PLUGIN(EcalTimeCalibErrorsRcd,EcalCondObjectContainer<float>);
 REGISTER_PLUGIN(EcalTimeOffsetConstantRcd,EcalTimeOffsetConstant);
-REGISTER_PLUGIN(EcalIntercalibErrorsRcd,EcalFloatCondObjectContainer);
+REGISTER_PLUGIN(EcalIntercalibErrorsRcd,EcalCondObjectContainer<float>);
 REGISTER_PLUGIN(EcalADCToGeVConstantRcd,EcalADCToGeVConstant);
-REGISTER_PLUGIN(EcalLaserAlphasRcd,EcalFloatCondObjectContainer);
+REGISTER_PLUGIN(EcalLaserAlphasRcd,EcalCondObjectContainer<float>);
 REGISTER_PLUGIN(EcalLaserAPDPNRatiosRcd,EcalLaserAPDPNRatios);
-REGISTER_PLUGIN(EcalLaserAPDPNRatiosRefRcd,EcalFloatCondObjectContainer);
-REGISTER_PLUGIN(EcalChannelStatusRcd,EcalChannelStatus);
+REGISTER_PLUGIN(EcalLaserAPDPNRatiosRefRcd,EcalCondObjectContainer<float>);
+REGISTER_PLUGIN(EcalChannelStatusRcd,EcalCondObjectContainer<EcalChannelStatusCode>);
 
 REGISTER_PLUGIN(EcalClusterCrackCorrParametersRcd,EcalFunParams);
 REGISTER_PLUGIN(EcalClusterLocalContCorrParametersRcd,EcalFunParams);
 REGISTER_PLUGIN(EcalClusterEnergyUncertaintyParametersRcd,EcalFunParams);
 REGISTER_PLUGIN(EcalClusterEnergyCorrectionParametersRcd,EcalFunParams);
 REGISTER_PLUGIN(EcalClusterEnergyCorrectionObjectSpecificParametersRcd,EcalFunParams);
 
-REGISTER_PLUGIN(EcalMappingElectronicsRcd,EcalMappingElectronics);
+REGISTER_PLUGIN(EcalMappingElectronicsRcd,EcalCondObjectContainer<EcalMappingElement>);
 
-REGISTER_PLUGIN(EcalTPGPedestalsRcd,EcalTPGPedestals);
+REGISTER_PLUGIN(EcalTPGPedestalsRcd,EcalCondObjectContainer<EcalTPGPedestal> );
 REGISTER_PLUGIN(EcalTPGFineGrainEBGroupRcd,EcalTPGFineGrainEBGroup);
 REGISTER_PLUGIN(EcalTPGFineGrainEBIdMapRcd,EcalTPGFineGrainEBIdMap);
 REGISTER_PLUGIN(EcalTPGFineGrainStripEERcd,EcalTPGFineGrainStripEE);
 REGISTER_PLUGIN(EcalTPGFineGrainTowerEERcd,EcalTPGFineGrainTowerEE);
-REGISTER_PLUGIN(EcalTPGLinearizationConstRcd,EcalTPGLinearizationConst);
+REGISTER_PLUGIN(EcalTPGLinearizationConstRcd,EcalCondObjectContainer<EcalTPGLinearizationConstant>);
 REGISTER_PLUGIN(EcalTPGLutGroupRcd,EcalTPGLutGroup);
 REGISTER_PLUGIN(EcalTPGLutIdMapRcd,EcalTPGLutIdMap);
 REGISTER_PLUGIN(EcalTPGPhysicsConstRcd,EcalTPGPhysicsConst);
 REGISTER_PLUGIN(EcalTPGSlidingWindowRcd,EcalTPGSlidingWindow);
 REGISTER_PLUGIN(EcalTPGWeightGroupRcd,EcalTPGWeightGroup);
 REGISTER_PLUGIN(EcalTPGWeightIdMapRcd,EcalTPGWeightIdMap);
-REGISTER_PLUGIN(EcalTPGCrystalStatusRcd,EcalTPGCrystalStatus);
+REGISTER_PLUGIN(EcalTPGCrystalStatusRcd,EcalCondObjectContainer<EcalTPGCrystalStatusCode>);
 REGISTER_PLUGIN(EcalTPGTowerStatusRcd,EcalTPGTowerStatus);
 REGISTER_PLUGIN(EcalTPGStripStatusRcd,EcalTPGStripStatus);
 REGISTER_PLUGIN(EcalTPGSpikeRcd,EcalTPGSpike);
 
-REGISTER_PLUGIN(EcalDCSTowerStatusRcd,EcalDCSTowerStatus);
-REGISTER_PLUGIN(EcalDAQTowerStatusRcd,EcalDAQTowerStatus);
+REGISTER_PLUGIN(EcalDCSTowerStatusRcd,EcalCondTowerObjectContainer<EcalChannelStatusCode> );
+REGISTER_PLUGIN(EcalDAQTowerStatusRcd,EcalCondTowerObjectContainer<EcalDAQStatusCode> );
 
-REGISTER_PLUGIN(EcalDQMChannelStatusRcd,EcalDQMChannelStatus);
-REGISTER_PLUGIN(EcalDQMTowerStatusRcd,EcalDQMTowerStatus);
+REGISTER_PLUGIN(EcalDQMChannelStatusRcd,EcalCondObjectContainer<EcalDQMStatusCode>);
+REGISTER_PLUGIN(EcalDQMTowerStatusRcd,EcalCondTowerObjectContainer<EcalDQMStatusCode>);
 
 REGISTER_PLUGIN(EcalSRSettingsRcd, EcalSRSettings);
 REGISTER_PLUGIN(EcalSampleMaskRcd, EcalSampleMask);
 
 REGISTER_PLUGIN(EcalTimeBiasCorrectionsRcd, EcalTimeBiasCorrections);
 
 REGISTER_PLUGIN(EcalSamplesCorrelationRcd, EcalSamplesCorrelation);
-REGISTER_PLUGIN(EcalPulseShapesRcd,EcalPulseShapes);
-REGISTER_PLUGIN(EcalPulseCovariancesRcd,EcalPulseCovariances);
-REGISTER_PLUGIN(EcalPulseSymmCovariancesRcd,EcalPulseSymmCovariances);
+REGISTER_PLUGIN(EcalPulseShapesRcd,EcalCondObjectContainer<EcalPulseShape>);
+REGISTER_PLUGIN(EcalPulseCovariancesRcd,EcalCondObjectContainer<EcalPulseCovariance>);
+REGISTER_PLUGIN(EcalPulseSymmCovariancesRcd,EcalCondObjectContainer<EcalPulseSymmCovariance>);