strip modules - fillDescriptions

Author: jlidrych

CalibTracker/SiStripESProducers/plugins/real/SiStripBackPlaneCorrectionDepESProducer.cc

@@ -119,7 +119,7 @@ void SiStripBackPlaneCorrectionDepESProducer::fillDescriptions(edm::Configuratio
     desc.add<edm::ParameterSetDescription>("BackPlaneCorrectionDeconvMode", deconv);
   }
 
-  descriptions.addDefault(desc);
+  descriptions.addWithDefaultLabel(desc);
 }
 
 DEFINE_FWK_EVENTSETUP_MODULE(SiStripBackPlaneCorrectionDepESProducer);

CalibTracker/SiStripESProducers/plugins/real/SiStripLorentzAngleDepESProducer.cc

@@ -116,7 +116,7 @@ void SiStripLorentzAngleDepESProducer::fillDescriptions(edm::ConfigurationDescri
     desc.add<edm::ParameterSetDescription>("LorentzAngleDeconvMode", deconv);
   }
 
-  descriptions.addDefault(desc);
+  descriptions.addWithDefaultLabel(desc);
 }
 
 DEFINE_FWK_EVENTSETUP_MODULE(SiStripLorentzAngleDepESProducer);

CalibTracker/SiStripESProducers/python/SiStripBackPlaneCorrectionDepESProducer_cfi.py

@@ -1,18 +1,5 @@
 # -*- coding: utf-8 -*-
 import FWCore.ParameterSet.Config as cms
 
-siStripBackPlaneCorrectionDepESProducer = cms.ESProducer("SiStripBackPlaneCorrectionDepESProducer",
-   
-     LatencyRecord =   cms.PSet(
-            record = cms.string('SiStripLatencyRcd'),
-            label = cms.untracked.string('')
-            ),
-	BackPlaneCorrectionPeakMode = cms.PSet(
-            record = cms.string('SiStripBackPlaneCorrectionRcd'),
-            label = cms.untracked.string('peak')
-            ),
-        BackPlaneCorrectionDeconvMode = cms.PSet(
-            record = cms.string('SiStripBackPlaneCorrectionRcd'),
-            label = cms.untracked.string('deconvolution')
-            )
-   )
+from CalibTracker.SiStripESProducers.siStripBackPlaneCorrectionDepESProducer_cfi import siStripBackPlaneCorrectionDepESProducer as _siStripBackPlaneCorrectionDepESProducer
+siStripBackPlaneCorrectionDepESProducer = _siStripBackPlaneCorrectionDepESProducer.clone()

CalibTracker/SiStripESProducers/python/SiStripLorentzAngleDepESProducer_cfi.py

@@ -1,21 +1,5 @@
 # -*- coding: utf-8 -*-
 import FWCore.ParameterSet.Config as cms
 
-siStripLorentzAngleDepESProducer = cms.ESProducer("SiStripLorentzAngleDepESProducer",
-   
-     LatencyRecord =   cms.PSet(
-            record = cms.string('SiStripLatencyRcd'),
-            label = cms.untracked.string('')
-            ),
-	LorentzAnglePeakMode = cms.PSet(
-            record = cms.string('SiStripLorentzAngleRcd'),
-            label = cms.untracked.string('peak')
-            ),
-        LorentzAngleDeconvMode = cms.PSet(
-            record = cms.string('SiStripLorentzAngleRcd'),
-            label = cms.untracked.string('deconvolution')
-            )
-        
-   )
-
-
+from CalibTracker.SiStripESProducers.siStripLorentzAngleDepESProducer_cfi import siStripLorentzAngleDepESProducer as _siStripLorentzAngleDepESProducer
+siStripLorentzAngleDepESProducer = _siStripLorentzAngleDepESProducer.clone()

RecoLocalTracker/SiStripRecHitConverter/plugins/StripCPEESProducer.cc

@@ -37,7 +37,7 @@ class StripCPEESProducer : public edm::ESProducer {
 
 void StripCPEESProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   edm::ParameterSetDescription desc;
-  desc.add<std::string>("ComponentName", "SimpleStripCPE");
+  desc.add<std::string>("ComponentName", "stripCPE");
 
   edm::ParameterSetDescription cpeFromTrackAngleDesc;
   StripCPEfromTrackAngle::fillPSetDescription(cpeFromTrackAngleDesc);
@@ -53,7 +53,7 @@ void StripCPEESProducer::fillDescriptions(edm::ConfigurationDescriptions& descri
               edm::ParameterDescription<edm::ParameterSetDescription>("parameters", emptyDesc, true) or
           "FakeStripCPE" >> edm::EmptyGroupDescription());
 
-  descriptions.addDefault(desc);
+  descriptions.addWithDefaultLabel(desc);
 }
 
 StripCPEESProducer::StripCPEESProducer(const edm::ParameterSet& p) {

RecoLocalTracker/SiStripRecHitConverter/python/StripCPEESProducer_cfi.py

@@ -1,7 +1,4 @@
 import FWCore.ParameterSet.Config as cms
 
-stripCPEESProducer = cms.ESProducer("StripCPEESProducer",
-                                    ComponentName = cms.string('stripCPE'),
-                                    ComponentType = cms.string('SimpleStripCPE'),
-                                    parameters    = cms.PSet()
-)
+from RecoLocalTracker.SiStripRecHitConverter.stripCPEESProducer_cfi import stripCPEESProducer as _stripCPEESProducer
+stripCPEESProducer = _stripCPEESProducer.clone()