Merge pull request #12074 from gennai/AlcaBeamSpotHarvesterFixV2_CMSS…

…W_7_6_X Alca beam spot harvester fix v2 cmssw 7 6 x
cms-sw · Oct 25, 2015 · ddacdfd · ddacdfd
2 parents c1218ea + f83f354
commit ddacdfd
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/Calibration/TkAlCaRecoProducers/interface/AlcaBeamSpotHarvester.h b/Calibration/TkAlCaRecoProducers/interface/AlcaBeamSpotHarvester.h
@@ -36,7 +36,7 @@ class AlcaBeamSpotHarvester : public edm::EDAnalyzer {
   std::string 	      beamSpotOutputBase_;
   std::string 	      outputrecordName_;
   double      	      sigmaZValue_;
-
+  double              sigmaZCut_;
   // Member Variables
   AlcaBeamSpotManager theAlcaBeamSpotManager_;
 

diff --git a/Calibration/TkAlCaRecoProducers/interface/AlcaBeamSpotManager.h b/Calibration/TkAlCaRecoProducers/interface/AlcaBeamSpotManager.h
@@ -40,7 +40,7 @@ class AlcaBeamSpotManager {
   std::string beamSpotOutputBase_;
   std::string beamSpotModuleName_;
   std::string beamSpotLabel_;
-
+  double sigmaZCut_;
   edm::InputTag beamSpotTag_;
   edm::EDGetTokenT<reco::BeamSpot> beamSpotToken_;
 

diff --git a/Calibration/TkAlCaRecoProducers/plugins/AlcaBeamSpotHarvester.cc b/Calibration/TkAlCaRecoProducers/plugins/AlcaBeamSpotHarvester.cc
@@ -38,6 +38,7 @@ AlcaBeamSpotHarvester::AlcaBeamSpotHarvester(const edm::ParameterSet& iConfig) :
   beamSpotOutputBase_    (iConfig.getParameter<ParameterSet>("AlcaBeamSpotHarvesterParameters").getUntrackedParameter<std::string>("BeamSpotOutputBase")),
   outputrecordName_      (iConfig.getParameter<ParameterSet>("AlcaBeamSpotHarvesterParameters").getUntrackedParameter<std::string>("outputRecordName", "BeamSpotObjectsRcd")),
   sigmaZValue_           (iConfig.getParameter<ParameterSet>("AlcaBeamSpotHarvesterParameters").getUntrackedParameter<double>("SigmaZValue")),
+  sigmaZCut_           (iConfig.getParameter<ParameterSet>("AlcaBeamSpotHarvesterParameters").getUntrackedParameter<double>("SigmaZCut")),
   theAlcaBeamSpotManager_(iConfig, consumesCollector()) {  
 }
 

diff --git a/Calibration/TkAlCaRecoProducers/python/AlcaBeamSpotHarvester_cfi.py b/Calibration/TkAlCaRecoProducers/python/AlcaBeamSpotHarvester_cfi.py
@@ -5,8 +5,9 @@
 	BeamSpotOutputBase = cms.untracked.string("lumibased"), #runbased 
 	BeamSpotModuleName = cms.untracked.string("alcaBeamSpotProducer"),
 	BeamSpotLabel      = cms.untracked.string("alcaBeamSpot"),
-	outputRecordName   = cms.untracked.string("BeamSpotObjectsRcdByLumi"),
-	SigmaZValue        = cms.untracked.double(-1) 
+	outputRecordName   = cms.untracked.string("BeamSpotObjectsRcd"),
+	SigmaZValue        = cms.untracked.double(-1),
+	SigmaZCut        = cms.untracked.double(1) 
     )
 )
 
diff --git a/Calibration/TkAlCaRecoProducers/src/AlcaBeamSpotManager.cc b/Calibration/TkAlCaRecoProducers/src/AlcaBeamSpotManager.cc
@@ -24,7 +24,8 @@ AlcaBeamSpotManager::AlcaBeamSpotManager(void){
 AlcaBeamSpotManager::AlcaBeamSpotManager(const ParameterSet& iConfig, edm::ConsumesCollector&& iC) :
   beamSpotOutputBase_(iConfig.getParameter<ParameterSet>("AlcaBeamSpotHarvesterParameters").getUntrackedParameter<std::string>("BeamSpotOutputBase")),
   beamSpotModuleName_(iConfig.getParameter<ParameterSet>("AlcaBeamSpotHarvesterParameters").getUntrackedParameter<std::string>("BeamSpotModuleName")),
-  beamSpotLabel_     (iConfig.getParameter<ParameterSet>("AlcaBeamSpotHarvesterParameters").getUntrackedParameter<std::string>("BeamSpotLabel"))
+  beamSpotLabel_     (iConfig.getParameter<ParameterSet>("AlcaBeamSpotHarvesterParameters").getUntrackedParameter<std::string>("BeamSpotLabel")),
+  sigmaZCut_    (iConfig.getParameter<ParameterSet>("AlcaBeamSpotHarvesterParameters").getUntrackedParameter<double>("SigmaZCut"))
 {
   edm::InputTag beamSpotTag_(beamSpotModuleName_, beamSpotLabel_);
   beamSpotToken_ = iC.consumes<reco::BeamSpot,edm::InLumi>(beamSpotTag_);
@@ -70,7 +71,7 @@ void AlcaBeamSpotManager::readLumi(const LuminosityBlock& iLumi){
 void AlcaBeamSpotManager::createWeightedPayloads(void){
   vector<bsMap_iterator> listToErase;
   for(bsMap_iterator it=beamSpotMap_.begin(); it!=beamSpotMap_.end();it++){
-    if(it->second.type() != BeamSpot::Tracker){
+    if(it->second.type() != BeamSpot::Tracker || it->second.sigmaZ()<sigmaZCut_ ) {
       listToErase.push_back(it);
     }
   }