more hiSelectedTracks->hiGeneralTracks

cms-sw · Sep 24, 2014 · 03f71c1 · 03f71c1
1 parent 61dba0a
commit 03f71c1
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 24 deletions.
diff --git a/DQM/BeamMonitor/test/HeavyIonTest_cfg.py b/DQM/BeamMonitor/test/HeavyIonTest_cfg.py
@@ -127,8 +127,7 @@
     process.firstStep)
 
 # Needed, as the event content is different!
-process.dqmBeamMonitor.BeamFitter.TrackCollection = \
-        cms.untracked.InputTag('hiSelectedTracks')
+process.dqmBeamMonitor.BeamFitter.TrackCollection = cms.untracked.InputTag('hiGeneralTracks')
 
 process.pp = cms.Path(
     process.dqmTKStatus*

diff --git a/DQM/SiStripMonitorDigi/interface/SiStripBaselineValidator.h b/DQM/SiStripMonitorDigi/interface/SiStripBaselineValidator.h
@@ -23,14 +23,6 @@
 #include <iostream>
 #include <stdlib.h>
 
-/*#include "DataFormats/TrackReco/interface/Track.h"
-#include "DataFormats/TrackCandidate/interface/TrackCandidateCollection.h" 
-#include "DataFormats/TrackCandidate/interface/TrackCandidate.h" 
-#include "DataFormats/TrackReco/interface/Track.h" 
-#include "DataFormats/TrackReco/interface/TrackFwd.h" 
-#include "DataFormats/VertexReco/interface/VertexFwd.h"
-#include "DataFormats/VertexReco/interface/Vertex.h"
-*/
 
 #include <DQMServices/Core/interface/DQMEDAnalyzer.h>
 
@@ -57,7 +49,6 @@ class SiStripBaselineValidator : public DQMEDAnalyzer
 
   edm::InputTag srcProcessedRawDigi_;
   edm::EDGetTokenT<edm::DetSetVector<SiStripRawDigi> > moduleRawDigiToken_;
- // edm::InputTag hiSelectedTracks;
   std::string outputFile_;
   bool createOutputFile_;
 

diff --git a/DQM/SiStripMonitorDigi/src/SiStripBaselineValidator.cc b/DQM/SiStripMonitorDigi/src/SiStripBaselineValidator.cc
@@ -19,14 +19,6 @@
 #include "DataFormats/Common/interface/DetSet.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 
-/*#include "DataFormats/TrackReco/interface/Track.h"
-#include "DataFormats/TrackCandidate/interface/TrackCandidateCollection.h" 
-#include "DataFormats/TrackCandidate/interface/TrackCandidate.h" 
-#include "DataFormats/TrackReco/interface/Track.h" 
-#include "DataFormats/TrackReco/interface/TrackFwd.h" 
-#include "DataFormats/VertexReco/interface/VertexFwd.h"
-#include "DataFormats/VertexReco/interface/Vertex.h"
-*/
 
 //ROOT inclusion
 #include "TH1F.h"
@@ -45,7 +37,6 @@ using namespace std;
 SiStripBaselineValidator::SiStripBaselineValidator(const edm::ParameterSet& conf){
 
   srcProcessedRawDigi_ =  conf.getParameter<edm::InputTag>( "srcProcessedRawDigi" );
- // hiSelectedTracks =  conf.getParameter<edm::InputTag>( "hiSelectedTracks" );
   createOutputFile_ = conf.getUntrackedParameter<bool>("saveFile",false);
   outputFile_   = conf.getParameter<std::string>("outputFile");
   dbe = &*edm::Service<DQMStore>();

diff --git a/HeavyIonsAnalysis/Configuration/test/SDmaker_3SD_3CS_PDMinBias_cfg.py b/HeavyIonsAnalysis/Configuration/test/SDmaker_3SD_3CS_PDMinBias_cfg.py
@@ -132,7 +132,7 @@
 
 process.outputCsJetHI.outputCommands.extend([
     "keep recoVertexs_hiSelectedVertex__RECO",
-    "keep recoTracks_hiSelectedTracks__RECO",
+    "keep recoTracks_hiGeneralTracks__RECO",
     "keep recoPhotons_*_*_*" ,
     "keep edmTriggerResults_TriggerResults__*" ,
     "keep triggerTriggerEvent_hltTriggerSummaryAOD__*"

diff --git a/RecoHI/Configuration/python/customise_PF.py b/RecoHI/Configuration/python/customise_PF.py
@@ -11,7 +11,7 @@ def customise(process):
     process.load("RecoParticleFlow.PFTracking.pfTrack_cfi")
     process.pfTrack.UseQuality = cms.bool(True)   
     process.pfTrack.TrackQuality = cms.string('highPurity')   
-    process.pfTrack.TkColList = cms.VInputTag("hiSelectedTracks")  
+    process.pfTrack.TkColList = cms.VInputTag("hiGeneralTracks")  
     process.pfTrack.PrimaryVertexLabel = cms.InputTag("hiSelectedVertex")
     process.pfTrack.MuColl = cms.InputTag("muons")
     process.pfTrack.GsfTracksInEvents = cms.bool(False)

diff --git a/RecoHI/HiEvtPlaneAlgos/python/HiEvtPlane_cfi.py b/RecoHI/HiEvtPlaneAlgos/python/HiEvtPlane_cfi.py
@@ -3,8 +3,7 @@
 hiEvtPlane = cms.EDProducer("EvtPlaneProducer",
                             vtxCollection_=cms.InputTag("hiSelectedVertex"),
                             caloCollection_=cms.InputTag("towerMaker"),
-#                            trackCollection_=cms.InputTag("hiGoodTightMergedTracks"),
-                            trackCollection_=cms.InputTag("hiSelectedTracks"),                           
+                            trackCollection_=cms.InputTag("hiGeneralTracks"),                           
                             useECAL_ = cms.untracked.bool(True),
                             useHCAL_ = cms.untracked.bool(True),
                             useTrackPtWeight_ = cms.untracked.bool(True),