Removed unused getByLabel calls

Signed-off-by: Antanas Norkus <[email protected]>

Calibration/TkAlCaRecoProducers/src/AlcaBeamSpotManager.cc

@@ -46,8 +46,6 @@ void AlcaBeamSpotManager::reset(void){
 void AlcaBeamSpotManager::readLumi(const LuminosityBlock& iLumi){
 
   Handle<BeamSpot> beamSpotHandle;
-  iLumi.getByLabel(beamSpotModuleName_,beamSpotLabel_, beamSpotHandle);
-  //iLumi.getByLabel("beamspot","alcaBeamSpot", beamSpotHandle); 
   iLumi.getByToken(beamSpotToken_, beamSpotHandle);
 
   if(beamSpotHandle.isValid()) { // check the product

DQM/CastorMonitor/src/CastorMonitorModule.cc

@@ -459,16 +459,14 @@ void CastorMonitorModule::analyze(const edm::Event& iEvent, const edm::EventSetu
   //-- TAKE IT AWAY for the time being
   ////---- try to get raw data and unpacker report
   edm::Handle<FEDRawDataCollection> RawData;  
-  //iEvent.getByLabel(inputLabelRaw_,RawData);
   iEvent.getByToken(inputLabelRawToken_, RawData);
   if (!RawData.isValid()) {
     rawOK_=false;
     if (fVerbosity>0)  std::cout << "RAW DATA NOT FOUND!" << std::endl;
   }
 
 
-  edm::Handle<HcalUnpackerReport> report; 
-  //iEvent.getByLabel(inputLabelReport_,report);
+  edm::Handle<HcalUnpackerReport> report;
   iEvent.getByToken(inputLabelReportToken_, report);
   if (!report.isValid()) {
     rawOK_=false;
@@ -490,7 +488,6 @@ void CastorMonitorModule::analyze(const edm::Event& iEvent, const edm::EventSetu
   //---------------------------------------------------------------//
 
   edm::Handle<CastorDigiCollection> CastorDigi;
-  //iEvent.getByLabel(inputLabelDigi_,CastorDigi);
   iEvent.getByToken(inputLabelDigiToken_, CastorDigi);
   if (!CastorDigi.isValid()) {
     digiOK_=false;
@@ -509,7 +506,6 @@ void CastorMonitorModule::analyze(const edm::Event& iEvent, const edm::EventSetu
   //------------------- try to get RecHits ------------------------//
   //---------------------------------------------------------------//
   edm::Handle<CastorRecHitCollection> CastorHits;
-  //iEvent.getByLabel(inputLabelRecHitCASTOR_,CastorHits);
   iEvent.getByToken(inputLabelRecHitCASTORToken_, CastorHits);
   if (!CastorHits.isValid()) {
     rechitOK_ = false;

DQM/DTMonitorModule/src/DTAlbertoBenvenutiTask.cc

@@ -234,7 +234,6 @@ void DTAlbertoBenvenutiTask::analyze(const edm::Event& e, const edm::EventSetup&
   if (nevents%1000 == 0 && debug) {}
 
   edm::Handle<DTDigiCollection> dtdigis;
-  //e.getByLabel("dtunpacker", dtdigis);
   e.getByToken(DTUnpackerToken_, dtdigis);
 
   bool checkNoisyChannels = parameters.getUntrackedParameter<bool>("checkNoisyChannels",false);

DQM/DataScouting/plugins/AlphaTVarAnalyzer.cc

@@ -31,7 +31,6 @@ AlphaTVarAnalyzer::~AlphaTVarAnalyzer(){}
 void AlphaTVarAnalyzer::analyze( const edm::Event & iEvent, const edm::EventSetup & c ){
 
   edm::Handle<std::vector<double> > alphaTvar_handle;
-  //iEvent.getByLabel(m_alphaTVarCollectionTag,alphaTvar_handle);
   iEvent.getByToken(m_alphaTVarCollectionTagToken_, alphaTvar_handle);
 
 

DQM/DataScouting/plugins/DiJetVarAnalyzer.cc

@@ -68,7 +68,6 @@ void DiJetVarAnalyzer::analyze( const edm::Event & iEvent, const edm::EventSetup
 
   // ## Get jet collection
   edm::Handle<reco::CaloJetCollection> calojets_handle;
-  //iEvent.getByLabel(jetCollectionTag_,calojets_handle);
   iEvent.getByToken(jetCollectionTagToken_,calojets_handle);
 
 
@@ -92,7 +91,6 @@ void DiJetVarAnalyzer::analyze( const edm::Event & iEvent, const edm::EventSetup
 
   // ## Get widejets 
   edm::Handle< vector<math::PtEtaPhiMLorentzVector> > widejets_handle;
-  //iEvent.getByLabel (widejetsCollectionTag_,widejets_handle);
   iEvent.getByToken(widejetsCollectionTagToken_, widejets_handle);
 
   TLorentzVector wj1;
@@ -133,12 +131,10 @@ void DiJetVarAnalyzer::analyze( const edm::Event & iEvent, const edm::EventSetup
 
   // met
   edm::Handle<reco::CaloMETCollection> calomet_handle;
-  //iEvent.getByLabel(metCollectionTag_,calomet_handle);
   iEvent.getByToken(metCollectionTagToken_, calomet_handle);
 
   // met cleaned
   edm::Handle<reco::CaloMETCollection> calometClean_handle;
-  //iEvent.getByLabel(metCleanCollectionTag_,calometClean_handle);
   iEvent.getByToken(metCleanCollectionTagToken_, calometClean_handle);
 
   if( calomet_handle.isValid() && calometClean_handle.isValid() )

DQM/DataScouting/plugins/RazorVarAnalyzer.cc

@@ -37,7 +37,6 @@ void RazorVarAnalyzer::analyze( const edm::Event & iEvent, const edm::EventSetup
 
   //count the number of jets with a minimal selection
   edm::Handle<reco::CaloJetCollection> calojets_handle;
-  //iEvent.getByLabel(m_jetCollectionTag,calojets_handle);
   iEvent.getByToken(m_jetCollectionTagToken_, calojets_handle);
 
 
@@ -50,7 +49,6 @@ void RazorVarAnalyzer::analyze( const edm::Event & iEvent, const edm::EventSetup
 
   //count the number of muons
   edm::Handle<std::vector<reco::RecoChargedCandidate> > muon_handle;
-  //iEvent.getByLabel(m_muCollectionTag,muon_handle);
   iEvent.getByToken(m_muCollectionTagToken_, muon_handle);
 
   unsigned int nmu_loose = 0;
@@ -64,7 +62,6 @@ void RazorVarAnalyzer::analyze( const edm::Event & iEvent, const edm::EventSetup
 
   //count the number of electrons
   edm::Handle<reco::ElectronCollection> ele_handle;
-  //iEvent.getByLabel(m_eleCollectionTag,ele_handle);
   iEvent.getByToken(m_eleCollectionTagToken_, ele_handle);
 
   unsigned int nele_loose = 0;
@@ -91,7 +88,6 @@ void RazorVarAnalyzer::analyze( const edm::Event & iEvent, const edm::EventSetup
   }
 
   edm::Handle<std::vector<double> > razorvar_handle;
-  //iEvent.getByLabel(m_razorVarCollectionTag,razorvar_handle);
   iEvent.getByToken(m_razorVarCollectionTagToken_, razorvar_handle);
 
   if(razorvar_handle->size() > 1){

DQM/DataScouting/plugins/ScoutingTestAnalyzer.cc

@@ -25,7 +25,6 @@ void ScoutingTestAnalyzer::analyze( const edm::Event & iEvent, const edm::EventS
 
 
   edm::Handle<reco::CaloJetCollection> calojets_handle ;
-  //iEvent.getByLabel(m_pfJetsCollectionTag,calojets_handle) ;
   iEvent.getByToken(m_pfJetsCollectionTagToken_, calojets_handle);
 
   /* This is an example of how C++11 can simplify or lifes. The auto keyword 

DQM/DataScouting/src/AlphaTVarProducer.cc

@@ -50,7 +50,6 @@ AlphaTVarProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
 
    // get hold of collection of objects
    edm::Handle<reco::CaloJetCollection> calojet_handle; 
-   iEvent.getByLabel(inputJetTag_,calojet_handle);
    iEvent.getByToken(inputJetTagToken_, calojet_handle);
 
    std::auto_ptr<std::vector<double> > result(new std::vector<double>); 

DQM/DataScouting/src/DiJetVarProducer.cc

@@ -54,7 +54,6 @@ DiJetVarProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
 
    // ## Get jet collection
    edm::Handle<reco::CaloJetCollection> calojets_handle;
-   iEvent.getByLabel(inputJetTag_,calojets_handle);
    iEvent.getByToken(inputJetTagToken_, calojets_handle);
    //cout << "size: " << calojets_handle->size() << endl;              
 

DQM/DataScouting/src/RazorVarProducer.cc

@@ -53,12 +53,10 @@ RazorVarProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
 
    // get hold of collection of objects
    Handle< vector<math::XYZTLorentzVector> > hemispheres;
-   //iEvent.getByLabel (inputTag_,hemispheres);
    iEvent.getByToken (inputTagToken_, hemispheres);
 
    // get hold of the MET Collection
    Handle<CaloMETCollection> inputMet;
-   iEvent.getByLabel(inputMetTag_,inputMet);
    iEvent.getByToken(inputMetTagToken_, inputMet);
 
    std::auto_ptr<std::vector<double> > result(new std::vector<double>); 

DQM/HcalMonitorTasks/src/HcalDataIntegrityTask.cc

@@ -158,8 +158,7 @@ void HcalDataIntegrityTask::analyze(edm::Event const&e, edm::EventSetup const&s)
   // Now get the collections we need
 
   edm::Handle<FEDRawDataCollection> rawraw;
-
-  // Trying new getByLabel
+
   if (!(e.getByToken(tok_raw_,rawraw)))
     {
       if (debug_>0) edm::LogWarning("HcalDataIntegrityTask")<<" raw data with label "<<inputLabelRawData_<<" not available";

DQM/HcalMonitorTasks/src/HcalDigiMonitor.cc

@@ -461,7 +461,6 @@ void HcalDigiMonitor::analyze(edm::Event const&e, edm::EventSetup const&s)
   /////////////////////////////////////////////////////////////////
   // check if detectors whether they were ON
   edm::Handle<DcsStatusCollection> dcsStatus;
-  //e.getByLabel("scalersRawToDigi", dcsStatus);
   e.getByToken(dcsStatusToken_, dcsStatus);
 
   if (dcsStatus.isValid() && dcsStatus->size() != 0) 
@@ -560,7 +559,6 @@ void HcalDigiMonitor::analyze(edm::Event const&e, edm::EventSetup const&s)
     }
   // try to get Raw Data
   edm::Handle<FEDRawDataCollection> rawraw;
-  //if (!(e.getByLabel(FEDRawDataCollection_,rawraw)))
   if ( !(e.getByToken(FEDRawDataCollectionToken_, rawraw)))
     {
       edm::LogWarning("HcalRawDataMonitor")<<" raw data with label "<<FEDRawDataCollection_<<" not available";

DQM/L1TMonitor/interface/CompareTwoInstances.hh

@@ -105,8 +105,8 @@ public:
 // relevant guy.
 //    using namespace edm;
 //    Handle<L1GctEmCandCollection> p1, p2;
-//    iEvent.getByLabel(Coll1_,p1);
-//    iEvent.getByLabel(Coll2_,p2);
+//    iEvent.getByToken(Coll1Token_,p1);
+//    iEvent.getByToken(Coll2Token_,p2);
 
 //    a_(p1,p2);
 //

DQM/L1TMonitor/src/L1GtHwValidation.cc

@@ -1600,7 +1600,6 @@ void L1GtHwValidation::compareDaqRecord(const edm::Event& iEvent,
 
     // get the L1 GT hardware DAQ record L1GlobalTriggerReadoutRecord
     edm::Handle<L1GlobalTriggerReadoutRecord> gtReadoutRecordData;
-    //iEvent.getByLabel(m_l1GtDataDaqInputTag, gtReadoutRecordData);
     iEvent.getByToken(m_l1GtDataDaqInputToken_, gtReadoutRecordData);
 
     bool validData = false;
@@ -1613,7 +1612,6 @@ void L1GtHwValidation::compareDaqRecord(const edm::Event& iEvent,
 
     // get the L1 GT emulator DAQ record L1GlobalTriggerReadoutRecord
     edm::Handle<L1GlobalTriggerReadoutRecord> gtReadoutRecordEmul;
-    //iEvent.getByLabel(m_l1GtEmulDaqInputTag, gtReadoutRecordEmul);
     iEvent.getByToken(m_l1GtEmulDaqInputToken_, gtReadoutRecordEmul);
 
     bool validEmul = false;
@@ -1769,7 +1767,6 @@ void L1GtHwValidation::compareEvmRecord(const edm::Event& iEvent,
 
     // get the L1 GT hardware EVM record L1GlobalTriggerEvmReadoutRecord
     edm::Handle<L1GlobalTriggerEvmReadoutRecord> gtReadoutRecordData;
-    //iEvent.getByLabel(m_l1GtDataEvmInputTag, gtReadoutRecordData);
     iEvent.getByToken(m_l1GtDataEvmInputToken_, gtReadoutRecordData);
 
     bool validData = false;
@@ -1782,7 +1779,6 @@ void L1GtHwValidation::compareEvmRecord(const edm::Event& iEvent,
 
     // get the L1 GT emulator EVM record L1GlobalTriggerEvmReadoutRecord
     edm::Handle<L1GlobalTriggerEvmReadoutRecord> gtReadoutRecordEmul;
-    iEvent.getByLabel(m_l1GtEmulEvmInputTag, gtReadoutRecordEmul);
     iEvent.getByToken(m_l1GtEmulEvmInputToken_, gtReadoutRecordEmul);
 
     bool validEmul = false;

DQM/L1TMonitor/src/L1TCSCTF.cc

@@ -448,7 +448,6 @@ void L1TCSCTF::analyze(const Event& e, const EventSetup& c)
   edm::Handle<L1MuGMTReadoutCollection> pCollection;
   if( gmtProducer.label() != "null" )
     { // GMT block
-      //e.getByLabel(gmtProducer,pCollection);
       e.getByToken(gmtProducerToken_, pCollection);
       if (!pCollection.isValid()) 
         {
@@ -507,7 +506,6 @@ void L1TCSCTF::analyze(const Event& e, const EventSetup& c)
   if( statusProducer.label() != "null" )
     {
       edm::Handle<L1CSCStatusDigiCollection> status;
-      //e.getByLabel(statusProducer.label(),statusProducer.instance(),status);
       e.getByToken(statusToken_, status);
       bool integrity=status->first, se=false, sm=false, bx=false, af=false, fmm=false;
       int nStat = 0;
@@ -543,7 +541,6 @@ void L1TCSCTF::analyze(const Event& e, const EventSetup& c)
       CSCTriggerGeometry::setGeometry(pDD);
 
       edm::Handle<CSCCorrelatedLCTDigiCollection> corrlcts;
-      //e.getByLabel(lctProducer.label(),lctProducer.instance(),corrlcts);
       e.getByToken(corrlctsToken_, corrlcts);
 
       for(CSCCorrelatedLCTDigiCollection::DigiRangeIterator csc=corrlcts.product()->begin(); csc!=corrlcts.product()->end(); csc++)
@@ -638,7 +635,6 @@ void L1TCSCTF::analyze(const Event& e, const EventSetup& c)
   if( trackProducer.label() != "null" )
     {
       edm::Handle<L1CSCTrackCollection> tracks;
-      //e.getByLabel(trackProducer.label(),trackProducer.instance(),tracks);
       e.getByToken(tracksToken_, tracks);
       for(L1CSCTrackCollection::const_iterator trk=tracks->begin(); trk<tracks->end(); trk++)
         {
@@ -742,7 +738,6 @@ void L1TCSCTF::analyze(const Event& e, const EventSetup& c)
              }
 				
              edm::Handle<CSCCorrelatedLCTDigiCollection> corrlcts;
-             e.getByLabel(lctProducer.label(),lctProducer.instance(),corrlcts);
              for(CSCCorrelatedLCTDigiCollection::DigiRangeIterator csc=corrlcts.product()->begin(); csc!=corrlcts.product()->end(); csc++)
              {
              CSCCorrelatedLCTDigiCollection::Range range1 = corrlcts.product()->get((*csc).first);
@@ -853,10 +848,8 @@ void L1TCSCTF::analyze(const Event& e, const EventSetup& c)
     {
       // handle to needed collections
       edm::Handle<CSCTriggerContainer<csctf::TrackStub> > dtStubs;
-      //e.getByLabel(mbProducer.label(),  mbProducer.instance(),  dtStubs);
       e.getByToken(dtStubsToken_, dtStubs);
       edm::Handle<L1CSCTrackCollection> tracks;
-      //e.getByLabel(trackProducer.label(),trackProducer.instance(),tracks);
       e.getByToken(mbtracksToken_, tracks);
 
       // loop on the DT stubs

DQM/L1TMonitor/src/L1TCompare.cc

@@ -292,11 +292,6 @@ void L1TCompare::analyze(const Event & e, const EventSetup & c)
     return;
   }
 
-
-  //e.getByLabel(gctSource_.label(),"cenJets", gctCenJets);
-  //e.getByLabel(gctSource_.label(), "isoEm", gctIsoEmCands);
-  //e.getByLabel(gctSource_.label(), "nonIsoEm", gctNonIsoEmCands);
-
   e.getByToken(gctCenJetsToken_, gctCenJets);
   e.getByToken(gctIsoEmCandsToken_, gctIsoEmCands);
   e.getByToken(gctNonIsoEmCandsToken_, gctNonIsoEmCands);

DQM/L1TMonitor/src/L1TDEMON.cc

@@ -340,7 +340,6 @@ void L1TDEMON::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
 
     /// get the comparison results
     edm::Handle < L1DataEmulRecord > deRecord;
-    //iEvent.getByLabel(DEsource_, deRecord);
     iEvent.getByToken(DEsourceToken_, deRecord);
 
     if (!deRecord.isValid()) {

DQM/L1TMonitor/src/L1TDTTF.cc

@@ -623,7 +623,6 @@ void L1TDTTF::analyze(const edm::Event& event,
   /// tracks handle
   edm::Handle<L1MuDTTrackContainer > myL1MuDTTrackContainer;
   try {
-    //event.getByLabel(trackInputTag_, myL1MuDTTrackContainer);
     event.getByToken(trackInputToken_, myL1MuDTTrackContainer);
   } catch (cms::Exception& iException) {
     edm::LogError("L1TDTTF::analyze::DataNotFound")
@@ -657,7 +656,6 @@ void L1TDTTF::analyze(const edm::Event& event,
     try {
 
       edm::Handle<reco::MuonCollection> muons;
-      //event.getByLabel(muonCollectionLabel_, muons);
       event.getByToken(muonCollectionToken_, muons);
       accept = false;
       if ( muons.isValid() ) {
@@ -711,7 +709,6 @@ void L1TDTTF::analyze(const edm::Event& event,
   try {
 
     edm::Handle<L1MuGMTReadoutCollection> pCollection;
-    //event.getByLabel(gmtSource_, pCollection);
     event.getByToken(gmtSourceToken_, pCollection);
 
     if ( !pCollection.isValid() ) {

DQM/L1TMonitor/src/L1TGCT.cc

@@ -483,18 +483,6 @@ void L1TGCT::analyze(const edm::Event & e, const edm::EventSetup & c)
   edm::Handle < L1GctEtHadCollection >   l1EtHad;
   edm::Handle < L1GctEtTotalCollection > l1EtTotal;
 
-  //e.getByLabel(gctIsoEmSource_, l1IsoEm);
-  //e.getByLabel(gctNonIsoEmSource_, l1NonIsoEm);
-  //e.getByLabel(gctCenJetsSource_, l1CenJets);
-  //e.getByLabel(gctForJetsSource_, l1ForJets);
-  //e.getByLabel(gctTauJetsSource_, l1TauJets);
-  //e.getByLabel(gctEnergySumsSource_, l1HFSums);
-  //e.getByLabel(gctEnergySumsSource_, l1HFCounts);
-  //e.getByLabel(gctEnergySumsSource_, l1EtMiss);
-  //e.getByLabel(gctEnergySumsSource_, l1HtMiss);
-  //e.getByLabel(gctEnergySumsSource_, l1EtHad);
-  //e.getByLabel(gctEnergySumsSource_, l1EtTotal);
-
   e.getByToken(gctIsoEmSourceToken_, l1IsoEm);
   e.getByToken(gctNonIsoEmSourceToken_, l1NonIsoEm);
   e.getByToken(gctCenJetsSourceToken_, l1CenJets);

DQM/L1TMonitor/src/L1TdeRCT.cc

@@ -303,7 +303,6 @@ void L1TdeRCT::analyze(const Event & e, const EventSetup & c)
   edm::Handle < L1CaloEmCollection > emEmul;
   edm::Handle < L1CaloRegionCollection > rgnEmul;
 
-  // need to change to getByLabel
   // bool doEm = true; FIXME gcc461: variable 'doEm' set but not used
   // bool doHd = true; FIXME gcc461: variable 'doHd' set but not used
   bool doEcal = true;

DQM/PhysicsObjectsMonitoring/src/PhysicsObjectsMonitor.cc

@@ -109,7 +109,6 @@ void PhysicsObjectsMonitor::analyze(const Event & event, const EventSetup& event
 
   // Get the RecTrack collection from the event
   Handle<reco::TrackCollection> staTracks;
-  //event.getByLabel(theSTAMuonLabel, staTracks);
   event.getByToken(theSTAMuonToken_, staTracks);
 
   ESHandle<MagneticField> theMGField;
@@ -122,7 +121,6 @@ void PhysicsObjectsMonitor::analyze(const Event & event, const EventSetup& event
   // Get the SimTrack collection from the event
   //  if(theDataType == "SimData"){
   //  Handle<SimTrackContainer> simTracks;
-  //  event.getByLabel("g4SimHits",simTracks);
 
   //  numberOfRecTracks += staTracks->size();
 

DQM/RCTMonitor/src/RCTMonitor.cc

@@ -72,12 +72,8 @@ float DynamicScale(int EtaStamp)
   // Get the RCT digis
   edm::Handle<L1CaloEmCollection> em;
  //  edm::Handle<L1CaloRegionCollection> rgn;
-
- // iEvent.getByType(em);
- // iEvent.getByType(rgn);
 
-   //iEvent.getByLabel(m_rctSource,em);
-   iEvent.getByToken(m_rctSourceToken_, em);
+  iEvent.getByToken(m_rctSourceToken_, em);
 
 
 

DQM/SiPixelMonitorClient/src/SiPixelDaqInfo.cc

@@ -170,7 +170,6 @@ void SiPixelDaqInfo::analyze(const edm::Event& iEvent, const edm::EventSetup& iS
   if(NEvents_>=1 && NEvents_<=100){
     // check if any Pixel FED is in readout:
     edm::Handle<FEDRawDataCollection> rawDataHandle;
-    //iEvent.getByLabel(daqSource_, rawDataHandle);
     iEvent.getByToken(daqSourceToken_, rawDataHandle);
     if(!rawDataHandle.isValid()){
       edm::LogInfo("SiPixelDaqInfo") << daqSource_ << " is empty!";

DQM/SiPixelMonitorClient/src/SiPixelEDAClient.cc

@@ -213,7 +213,6 @@ void SiPixelEDAClient::analyze(const edm::Event& e, const edm::EventSetup& eSetu
     if(nEvents_==1){
       // check if any Pixel FED is in readout:
       edm::Handle<FEDRawDataCollection> rawDataHandle;
-      //e.getByLabel(inputSource_, rawDataHandle);
       e.getByToken(inputSourceToken_, rawDataHandle);
       if(!rawDataHandle.isValid()){
         edm::LogInfo("SiPixelEDAClient") << inputSource_ << " is empty";