Merge branch 'from-CMSSW_10_1_X_2018-03-12-2300' into CMSSW_10_1_X_ta…

…u-pog_recoOnMiniAOD
cms-tau-pog · Mar 13, 2018 · 8001aa7 · 8001aa7
2 parents 4bdc092 + 78e824d
commit 8001aa7
Show file tree

Hide file tree

Showing 606 changed files with 21,260 additions and 6,347 deletions.
diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaNArrayD.cc b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaNArrayD.cc
@@ -357,25 +357,25 @@ Double_t &TEcnaNArrayD::operator()(Int_t i1,Int_t i2,Int_t i3,Int_t i4,Int_t i5,
 }
 const Double_t &TEcnaNArrayD::operator()(Int_t i1) const
 {
-   return (Double_t&)(this->operator()(i1));
+   return const_cast< TEcnaNArrayD *>(this)->operator()(i1);
 }
 const Double_t &TEcnaNArrayD::operator()(Int_t i1,Int_t i2) const
 {
-   return (Double_t&)(this->operator()(i1,i2));
+   return const_cast< TEcnaNArrayD *>(this)->operator()(i1,i2);
 }
 const Double_t &TEcnaNArrayD::operator()(Int_t i1,Int_t i2,Int_t i3) const
 {
-   return (Double_t&)(this->operator()(i1,i2,i3));
+   return const_cast< TEcnaNArrayD *>(this)->operator()(i1,i2,i3);
 }
 const Double_t &TEcnaNArrayD::operator()(Int_t i1,Int_t i2,Int_t i3,Int_t i4) const
 {
-   return (Double_t&)(this->operator()(i1,i2,i3,i4));
+   return const_cast< TEcnaNArrayD *>(this)->operator()(i1,i2,i3,i4);
 }
 const Double_t &TEcnaNArrayD::operator()(Int_t i1,Int_t i2,Int_t i3,Int_t i4,Int_t i5) const
 {
-   return (Double_t&)(this->operator()(i1,i2,i3,i4,i5));
+   return const_cast< TEcnaNArrayD *>(this)->operator()(i1,i2,i3,i4,i5);
 }
 const Double_t &TEcnaNArrayD::operator()(Int_t i1,Int_t i2,Int_t i3,Int_t i4,Int_t i5,Int_t i6) const
 {
-   return (Double_t&)(this->operator()(i1,i2,i3,i4,i5,i6));
+   return const_cast< TEcnaNArrayD *>(this)->operator()(i1,i2,i3,i4,i5,i6);
 }
diff --git a/CalibCalorimetry/EcalPedestalOffsets/src/testChannel.cc b/CalibCalorimetry/EcalPedestalOffsets/src/testChannel.cc
@@ -10,6 +10,7 @@
 #include "DataFormats/EcalRawData/interface/EcalRawDataCollections.h"
 
 #include "TFile.h"
+#include "TString.h"
 
 #include "CalibCalorimetry/EcalPedestalOffsets/interface/testChannel.h"
 
@@ -25,9 +26,9 @@ testChannel::testChannel (const edm::ParameterSet& paramSet) :
   m_bestPed (paramSet.getParameter<int> ("bestPed")) ,
   m_xtal (paramSet.getParameter<int> ("xtal")) ,
   m_pedVSDAC ("pedVSDAC","pedVSDAC",100,150,250,m_DACmax-m_DACmin,m_DACmin,m_DACmax) ,
-  m_singlePedVSDAC_1 ("singlePedVSDAC_1","pedVSDAC (g1) for xtal "+m_xtal,100,150,250,m_DACmax-m_DACmin,m_DACmin,m_DACmax) ,
-  m_singlePedVSDAC_2 ("singlePedVSDAC_2","pedVSDAC (g2) for xtal "+m_xtal,100,150,250,m_DACmax-m_DACmin,m_DACmin,m_DACmax) ,
-  m_singlePedVSDAC_3 ("singlePedVSDAC_3","pedVSDAC (g3) for xtal "+m_xtal,100,150,250,m_DACmax-m_DACmin,m_DACmin,m_DACmax)
+  m_singlePedVSDAC_1 ("singlePedVSDAC_1","pedVSDAC (g1) for xtal "+TString(m_xtal),100,150,250,m_DACmax-m_DACmin,m_DACmin,m_DACmax) ,
+  m_singlePedVSDAC_2 ("singlePedVSDAC_2","pedVSDAC (g2) for xtal "+TString(m_xtal),100,150,250,m_DACmax-m_DACmin,m_DACmin,m_DACmax) ,
+  m_singlePedVSDAC_3 ("singlePedVSDAC_3","pedVSDAC (g3) for xtal "+TString(m_xtal),100,150,250,m_DACmax-m_DACmin,m_DACmin,m_DACmax)
 {
   edm::LogInfo ("testChannel") << " reading "
                                << " m_DACmin: " << m_DACmin

diff --git a/CalibCalorimetry/EcalTrivialCondModules/src/EcalTrivialConditionRetriever.cc b/CalibCalorimetry/EcalTrivialCondModules/src/EcalTrivialConditionRetriever.cc
@@ -176,7 +176,7 @@ EcalTrivialConditionRetriever::EcalTrivialConditionRetriever( const edm::Paramet
   mappingFile_ = ps.getUntrackedParameter<std::string>("mappingFile","");
 
   if ( producedEcalMappingElectronics_ ) {
-    if ( mappingFile_ != "" ) { // if file provided read channel map
+    if ( !mappingFile_.empty() ) { // if file provided read channel map
       setWhatProduced( this, &EcalTrivialConditionRetriever::getMappingFromConfiguration );
     } else { 
       setWhatProduced( this, &EcalTrivialConditionRetriever::produceEcalMappingElectronics );
@@ -229,7 +229,7 @@ EcalTrivialConditionRetriever::EcalTrivialConditionRetriever( const edm::Paramet
   linearCorrectionsFile_ = ps.getUntrackedParameter<std::string>("linearCorrectionsFile","") ;
 
   if (producedEcalLinearCorrections_) { // user asks to produce constants
-    if(linearCorrectionsFile_ != "") {  // if file provided read constants
+    if(!linearCorrectionsFile_.empty()) {  // if file provided read constants
       setWhatProduced (this, &EcalTrivialConditionRetriever::produceEcalLinearCorrections );
     } else { // set all constants to 1. or smear as specified by user
         setWhatProduced (this, &EcalTrivialConditionRetriever::produceEcalLinearCorrections ) ;
@@ -246,7 +246,7 @@ EcalTrivialConditionRetriever::EcalTrivialConditionRetriever( const edm::Paramet
   intercalibConstantsMCFile_ = ps.getUntrackedParameter<std::string>("intercalibConstantsMCFile","") ;
 
   if (producedEcalIntercalibConstants_) { // user asks to produce constants
-    if(intercalibConstantsFile_ != "") {  // if file provided read constants
+    if(!intercalibConstantsFile_.empty()) {  // if file provided read constants
         setWhatProduced (this, &EcalTrivialConditionRetriever::getIntercalibConstantsFromConfiguration ) ;
     } else { // set all constants to 1. or smear as specified by user
         setWhatProduced (this, &EcalTrivialConditionRetriever::produceEcalIntercalibConstants ) ;
@@ -257,7 +257,7 @@ EcalTrivialConditionRetriever::EcalTrivialConditionRetriever( const edm::Paramet
   producedEcalIntercalibConstantsMC_ = ps.getUntrackedParameter<bool>("producedEcalIntercalibConstantsMC",true);
 
   if (producedEcalIntercalibConstantsMC_) { // user asks to produce constants
-    if(intercalibConstantsMCFile_ != "") {  // if file provided read constants
+    if(!intercalibConstantsMCFile_.empty()) {  // if file provided read constants
         setWhatProduced (this, &EcalTrivialConditionRetriever::getIntercalibConstantsMCFromConfiguration ) ;
     } else { // set all constants to 1. or smear as specified by user
         setWhatProduced (this, &EcalTrivialConditionRetriever::produceEcalIntercalibConstantsMC ) ;
@@ -270,7 +270,7 @@ EcalTrivialConditionRetriever::EcalTrivialConditionRetriever( const edm::Paramet
   intercalibErrorsFile_ = ps.getUntrackedParameter<std::string>("intercalibErrorsFile","") ;
 
   if (producedEcalIntercalibErrors_) { // user asks to produce constants
-    if(intercalibErrorsFile_ != "") {  // if file provided read constants
+    if(!intercalibErrorsFile_.empty()) {  // if file provided read constants
         setWhatProduced (this, &EcalTrivialConditionRetriever::getIntercalibErrorsFromConfiguration ) ;
     } else { // set all constants to 1. or smear as specified by user
         setWhatProduced (this, &EcalTrivialConditionRetriever::produceEcalIntercalibErrors ) ;
@@ -283,7 +283,7 @@ EcalTrivialConditionRetriever::EcalTrivialConditionRetriever( const edm::Paramet
   timeCalibConstantsFile_ = ps.getUntrackedParameter<std::string>("timeCalibConstantsFile","") ;
 
   if (producedEcalTimeCalibConstants_) { // user asks to produce constants
-    if(timeCalibConstantsFile_ != "") {  // if file provided read constants
+    if(!timeCalibConstantsFile_.empty()) {  // if file provided read constants
         setWhatProduced (this, &EcalTrivialConditionRetriever::getTimeCalibConstantsFromConfiguration ) ;
     } else { // set all constants to 1. or smear as specified by user
         setWhatProduced (this, &EcalTrivialConditionRetriever::produceEcalTimeCalibConstants ) ;
@@ -296,7 +296,7 @@ EcalTrivialConditionRetriever::EcalTrivialConditionRetriever( const edm::Paramet
   timeCalibErrorsFile_ = ps.getUntrackedParameter<std::string>("timeCalibErrorsFile","") ;
 
   if (producedEcalTimeCalibErrors_) { // user asks to produce constants
-    if(timeCalibErrorsFile_ != "") {  // if file provided read constants
+    if(!timeCalibErrorsFile_.empty()) {  // if file provided read constants
         setWhatProduced (this, &EcalTrivialConditionRetriever::getTimeCalibErrorsFromConfiguration ) ;
     } else { // set all constants to 1. or smear as specified by user
         setWhatProduced (this, &EcalTrivialConditionRetriever::produceEcalTimeCalibErrors ) ;
@@ -372,7 +372,7 @@ EcalTrivialConditionRetriever::EcalTrivialConditionRetriever( const edm::Paramet
   channelStatusFile_ = ps.getUntrackedParameter<std::string>("channelStatusFile","");
 
   if ( producedEcalChannelStatus_ ) {
-          if ( channelStatusFile_ != "" ) { // if file provided read channel map
+          if ( !channelStatusFile_.empty() ) { // if file provided read channel map
                   setWhatProduced( this, &EcalTrivialConditionRetriever::getChannelStatusFromConfiguration );
           } else { // set all channels to working -- FIXME might be changed
                   setWhatProduced( this, &EcalTrivialConditionRetriever::produceEcalChannelStatus );
@@ -409,7 +409,7 @@ EcalTrivialConditionRetriever::EcalTrivialConditionRetriever( const edm::Paramet
   trgChannelStatusFile_ = ps.getUntrackedParameter<std::string>("trgChannelStatusFile","");
 
   if ( producedEcalTrgChannelStatus_ ) {
-          if ( trgChannelStatusFile_ != "" ) { // if file provided read channel map
+          if ( !trgChannelStatusFile_.empty() ) { // if file provided read channel map
                   setWhatProduced( this, &EcalTrivialConditionRetriever::getTrgChannelStatusFromConfiguration );
           } else { // set all channels to working -- FIXME might be changed
                   setWhatProduced( this, &EcalTrivialConditionRetriever::produceEcalTrgChannelStatus );
@@ -1101,7 +1101,7 @@ EcalTrivialConditionRetriever::produceEcalLaserAlphas( const EcalLaserAlphasRcd&
 	}
 	ical->setValue( ebdetid, alpha );
 
-	if((ic==1650 )){
+	if( ic==1650  ){
 	  std::cout << " ic/alpha "<<ic<<"/"<<alpha<<std::endl; 
 	}
 
@@ -1124,7 +1124,7 @@ EcalTrivialConditionRetriever::produceEcalLaserAlphas( const EcalLaserAlphasRcd&
 	ical->setValue( ebid, alpha );
 	std::cout << " ieta/iphi/alpha "<<ieta<<"/"<<iphi<<"/"<<alpha<<std::endl; 
       }
-      if((ieta==10)){
+      if( ieta==10 ){
 	std::cout << "I will print some alphas from the file... ieta/iphi/alpha "<<ieta<<"/"<<iphi<<"/"<<alpha<<std::endl; 
       }
     }

diff --git a/CalibCalorimetry/HcalAlgos/src/HcalLogicalMapGenerator.cc b/CalibCalorimetry/HcalAlgos/src/HcalLogicalMapGenerator.cc
@@ -1659,10 +1659,9 @@ void HcalLogicalMapGenerator::buildCALIBMap(const HcalTopology* topo,
       }
     }
   }
-  ic++;
 
   /*HO calibration channels*/
-  for(ic=ic; ic<NCALIBCR; ic++){
+  for(ic=ic+1 ; ic<NCALIBCR; ic++){
     icrate=calibcrate[ic];
     irm_fi = 1;// everything other than he is on A
     ifed=fedcalibnum[ic][idcc-1];

diff --git a/CalibCalorimetry/HcalPlugins/src/HcalTextCalibrations.cc b/CalibCalorimetry/HcalPlugins/src/HcalTextCalibrations.cc
@@ -43,7 +43,7 @@ HcalTextCalibrations::HcalTextCalibrations ( const edm::ParameterSet& iConfig )
       setWhatProduced (this, &HcalTextCalibrations::producePedestalWidths);
       findingRecord <HcalPedestalWidthsRcd> ();
     }
-    if (objectName == "EffectivePedestals") {
+    else if (objectName == "EffectivePedestals") {
       setWhatProduced (this, &HcalTextCalibrations::produceEffectivePedestals, edm::es::Label("effective"));
       findingRecord <HcalPedestalsRcd> ();
     }

diff --git a/CalibFormats/SiPixelObjects/interface/PixelTrimCommon.h b/CalibFormats/SiPixelObjects/interface/PixelTrimCommon.h
@@ -44,6 +44,9 @@ namespace pos{
 
     void         writeASCII(std::string filename)                                                           const override  ;
     void         writeXML(      pos::PixelConfigKey key, int version, std::string path)                     const override {;}
+    using PixelTrimBase::writeXMLHeader;
+    using PixelTrimBase::writeXML;
+    using PixelTrimBase::writeXMLTrailer;
     void writeXMLHeader(pos::PixelConfigKey key, int version, std::string path, std::ofstream *out) const override {;}
     void writeXML(                                                              std::ofstream *out) const override {;}
     void writeXMLTrailer(                                                       std::ofstream *out) const override {;}

diff --git a/CalibMuon/DTCalibration/test/stubs/DTTimeBoxPlotter.cc b/CalibMuon/DTCalibration/test/stubs/DTTimeBoxPlotter.cc
@@ -170,7 +170,7 @@ TCanvas * DTTimeBoxPlotter::newCanvas(TString name, TString title,
 				    int xdiv, int ydiv, int form, int w){
   static int i = 1;
   if (name == "") {
-    name = TString("Canvas "+i);
+    name = TString("Canvas ") + TString(i);
     i++;
   }
   TCanvas *c = 0;

diff --git a/CalibTracker/SiPixelTools/plugins/SiPixelErrorsDigisToCalibDigis.cc b/CalibTracker/SiPixelTools/plugins/SiPixelErrorsDigisToCalibDigis.cc
@@ -146,7 +146,7 @@ SiPixelErrorsDigisToCalibDigis::endJob() {
   if (!outputFilename_.empty() && createOutputFile_)
     {
       edm::LogInfo("SiPixelErrorCalibDigis") << "Writing ROOT file to: " << outputFilename_ << std::endl;
-      if ( &*edm::Service<DQMStore>()) edm::Service<DQMStore>()->save (outputFilename_);
+      if ( edm::Service<DQMStore>().isAvailable() ) edm::Service<DQMStore>()->save (outputFilename_);
     }
 }
 

diff --git a/CalibTracker/SiPixelTools/plugins/SiPixelFedFillerWordEventNumber.cc b/CalibTracker/SiPixelTools/plugins/SiPixelFedFillerWordEventNumber.cc
@@ -56,17 +56,17 @@ unsigned int SiPixelFedFillerWordEventNumber ::CalibStatFillWord(unsigned int to
   //     according to the value of the totword.
   if ((status == 0x1)||(status == 0x9)){
     CalibFiller1 = Filler1;
-    if((status == 0x9)){CalibFiller2 = Filler14;}
+    if( status == 0x9 ){CalibFiller2 = Filler14;}
   }
   if ((status == 0x2)||(status == 0xa)){
     CalibFiller1 = Filler2;
-    if((status == 0xa)){CalibFiller2 = Filler24;}
+    if( status == 0xa ){CalibFiller2 = Filler24;}
   }
   if ((status == 0x4)||(status == 0xc)){
     CalibFiller1 = Filler3;
-    if((status == 0xc)){CalibFiller2 = Filler4;}
+    if( status == 0xc ){CalibFiller2 = Filler4;}
   }
-  if ((status == 0x8)){CalibFiller2 = Filler4;}  
+  if ( status == 0x8 ){CalibFiller2 = Filler4;}
   if((status == 0x7)||(status == 0xf)){
     if((Filler1 == Filler2)&&(Filler1 == Filler3)&&(Filler2 == Filler3)){
       CalibFiller1 = Filler1;
@@ -81,7 +81,7 @@ unsigned int SiPixelFedFillerWordEventNumber ::CalibStatFillWord(unsigned int to
     }
   }
   if((status == 0x3)||(status == 0xb)){
-    if((Filler1 == Filler2)){
+    if( Filler1 == Filler2 ){
       CalibFiller1 = Filler1;
       BoolStat = true;
       if(status == 0xb){CalibFiller2 = Filler14;}
@@ -93,7 +93,7 @@ unsigned int SiPixelFedFillerWordEventNumber ::CalibStatFillWord(unsigned int to
     }
   }
   if((status == 0x5)||(status == 0xd)){
-    if((Filler1 == Filler3)){
+    if( Filler1 == Filler3 ){
       CalibFiller1 = Filler1;
       BoolStat = true;
       if(status == 0xd){CalibFiller2 = Filler4;}
@@ -105,7 +105,7 @@ unsigned int SiPixelFedFillerWordEventNumber ::CalibStatFillWord(unsigned int to
     }
   }
   if((status == 0x6)||(status == 0xe)){
-    if((Filler2 == Filler3)){
+    if( Filler2 == Filler3 ){
       CalibFiller1 = Filler2;
       BoolStat = true;
       if(status == 0xe){CalibFiller2 = Filler4;}
@@ -135,7 +135,7 @@ unsigned int SiPixelFedFillerWordEventNumber ::CalibStatFillWord(unsigned int to
     if((status == 0x9)||(status == 0xa)||(status == 0xc)){
       vecFillerWordsEventNumber2.push_back((((CalibFiller2%65536)&(0xff00))>>8));
       edm::LogInfo("AnazrFedFillerWords")<<"Filler2 Event ID:"<<(((CalibFiller2%65536)&(0xff00))>>8)<<std::endl;
-    }else if((status == 0x8)){
+    }else if( status == 0x8 ){
       edm::LogError("AnazrFedFillerWords")<<"Status: "<<status 
                                           <<" No Filler1 found, is not possible get any Event ID Number"
                                           <<std::endl;

diff --git a/CalibTracker/SiStripChannelGain/interface/SiStripGainsPCLWorker.h b/CalibTracker/SiStripChannelGain/interface/SiStripGainsPCLWorker.h
@@ -78,11 +78,11 @@ class SiStripGainsPCLWorker : public  DQMEDAnalyzer {
     static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
 private:
-    virtual void beginJob() ;
+    void beginJob() override;
     void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;   
     void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override;
     void analyze(const edm::Event&, const edm::EventSetup&) override;
-    virtual void endJob() ;
+    void endJob() override;
 
     void processEvent(const TrackerTopology* topo); //what really does the job
     virtual void checkBookAPVColls(const edm::EventSetup& setup);

diff --git a/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEffFromCalibTree.cc b/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEffFromCalibTree.cc
@@ -95,7 +95,7 @@ class SiStripHitEffFromCalibTree : public ConditionDBWriter<SiStripBadStrip> {
     ~SiStripHitEffFromCalibTree() override;
 
   private:
-    virtual void algoBeginJob();
+    void algoBeginJob(const edm::EventSetup&) override;
     void algoEndJob() override;
     void algoAnalyze(const edm::Event& e, const edm::EventSetup& c) override;
     void SetBadComponents(int i, int component,SiStripQuality::BadComponent& BC, std::stringstream ssV[4][19], int NBadComponent[4][19][4]);
@@ -199,7 +199,7 @@ SiStripHitEffFromCalibTree::SiStripHitEffFromCalibTree(const edm::ParameterSet&
 
 SiStripHitEffFromCalibTree::~SiStripHitEffFromCalibTree() { }
 
-void SiStripHitEffFromCalibTree::algoBeginJob() {
+void SiStripHitEffFromCalibTree::algoBeginJob(const edm::EventSetup&) {
   //I have no idea what goes here
   //fs->make<TTree>("HitEffHistos","Tree of the inefficient hit histograms");
 }
@@ -223,7 +223,7 @@ void SiStripHitEffFromCalibTree::algoAnalyze(const edm::Event& e, const edm::Eve
   // read bad modules to mask
   ifstream badModules_file;
   set<uint32_t> badModules_list;
-  if(_badModulesFile!="") {
+  if(!_badModulesFile.empty()) {
 	badModules_file.open(_badModulesFile.c_str());
 	uint32_t badmodule_detid;
 	int mods, fiber1, fiber2, fiber3;

diff --git a/Calibration/EcalCalibAlgos/interface/ECALpedestalPCLworker.h b/Calibration/EcalCalibAlgos/interface/ECALpedestalPCLworker.h
@@ -41,10 +41,10 @@ class ECALpedestalPCLworker : public  DQMEDAnalyzer {
 
 
 private:
-    virtual void beginJob() ;
+    void beginJob() override;
     void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;   
     void analyze(const edm::Event&, const edm::EventSetup&) override ;
-    virtual void endJob() ;
+    void endJob() override;
 
 
     edm::EDGetTokenT<EBDigiCollection> digiTokenEB_; 

diff --git a/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalHBHEMuonFilter_Output_cff.py b/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalHBHEMuonFilter_Output_cff.py
@@ -10,7 +10,6 @@
         ),
     outputCommands = cms.untracked.vstring(
         'keep *_hbhereco_*_*',
-        'keep *_hbheprereco_*_*',
         'keep *_ecalRecHit_*_*',
         'keep *_offlineBeamSpot_*_*',
         'keep *_TriggerResults_*_*',
@@ -23,6 +22,7 @@
         'keep recoTracks_tevMuons_*_*',
         'keep recoTrackExtras_tevMuons_*_*',
         'keep *_offlinePrimaryVertices_*_*',
+        'keep *_scalersRawToDigi_*_*',
         'keep *_muons_*_*',
         )
     )

diff --git a/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalIterativePhiSym_Output_cff.py b/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalIterativePhiSym_Output_cff.py
@@ -9,11 +9,11 @@
         SelectEvents = cms.vstring('pathALCARECOHcalCalIterativePhiSym')
     ),
     outputCommands = cms.untracked.vstring(
-
                                             "keep *_horeco_*_*",
                                             "keep *_hfreco_*_*",
                                             "keep *_hbhereco_*_*",
                                             "keep *_offlinePrimaryVertices_*_*",
+                                            "keep *_scalersRawToDigi_*_*",
                                             "keep edmTriggerResults_*_*_HLT")
 
 )

diff --git a/Calibration/HcalCalibAlgos/macros/CalibCorr.C b/Calibration/HcalCalibAlgos/macros/CalibCorr.C
@@ -51,6 +51,22 @@ unsigned int truncateId(unsigned int detId, int truncateFlag, bool debug=false){
   return id;
 }
 
+double puFactor(int ieta, double pmom, double eHcal, double ediff) {
+
+  double fac(1.0);
+  static const double frac(0.02);
+  if (pmom > 0 && ediff >  frac*pmom) {
+    double a1(-0.35), a2(-0.65);
+    if (std::abs(ieta) == 25) {
+      a2 = -0.30;
+    } else if (std::abs(ieta) > 25) {
+      a1 = -0.45; a2 = -0.10;
+    }
+    fac = (1.0+a1*(eHcal/pmom)*(ediff/pmom)*(1+a2*(ediff/pmom)));
+  }
+  return fac;
+}
+
 class CalibCorr {
 public :
   CalibCorr(const char* infile, bool debug=false);

diff --git a/Calibration/HcalCalibAlgos/macros/CalibMonitor.C b/Calibration/HcalCalibAlgos/macros/CalibMonitor.C
@@ -978,15 +978,8 @@ bool CalibMonitor::GoodTrack(double& eHcal, double &cuti, bool debug) {
       }
       ediff = (Etot3-Etot1);
     }
-    if (ediff >  0.02*pmom) {
-      double a1(-0.35), a2(-0.65);
-      if (std::abs(t_ieta) == 25) {
-	a2 = -0.30;
-      } else if (std::abs(t_ieta) > 25) {
-	a1 = -0.45; a2 = -0.10;
-      }
-      double fac = (1.0+a1*(t_eHcal/pmom)*(ediff/pmom)*(1+a2*(ediff/pmom)));
-      eHcal *= fac;
+    double fac = puFactor(t_ieta,pmom,eHcal,ediff);
+    eHcal     *= fac;
     }
   }
   select = ((t_qltyFlag) && (t_selectTk) && (t_hmaxNearP < cut) &&