Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleaned unused config parameters in Strip DQM for 7_5_X #8971

Merged
merged 1 commit into from May 11, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -21,7 +21,6 @@
# SiStripMonitorCluster
import DQM.SiStripMonitorCluster.SiStripMonitorCluster_cfi
SiStripMonitorClusterCAF = DQM.SiStripMonitorCluster.SiStripMonitorCluster_cfi.SiStripMonitorCluster.clone()
SiStripMonitorClusterCAF.OutputMEsInRootFile = False
SiStripMonitorClusterCAF.SelectAllDetectors = True
SiStripMonitorClusterCAF.StripQualityLabel = ''

Expand All @@ -48,19 +47,16 @@
MonitorTrackResidualsCAF_cosmicTk = DQM.TrackerMonitorTrack.MonitorTrackResiduals_cfi.MonitorTrackResiduals.clone()
MonitorTrackResidualsCAF_cosmicTk.Tracks = 'cosmictrackfinderP5'
MonitorTrackResidualsCAF_cosmicTk.trajectoryInput = 'cosmictrackfinderP5Refitter'
MonitorTrackResidualsCAF_cosmicTk.OutputMEsInRootFile = False
# clone for CTF track finder
import DQM.TrackerMonitorTrack.MonitorTrackResiduals_cfi
MonitorTrackResidualsCAF_ckf = DQM.TrackerMonitorTrack.MonitorTrackResiduals_cfi.MonitorTrackResiduals.clone()
MonitorTrackResidualsCAF_ckf.Tracks = 'ctfWithMaterialTracksP5'
MonitorTrackResidualsCAF_ckf.trajectoryInput = 'ctfWithMaterialTracksP5Refitter'
MonitorTrackResidualsCAF_ckf.OutputMEsInRootFile = False
# clone for RS track finder
import DQM.TrackerMonitorTrack.MonitorTrackResiduals_cfi
MonitorTrackResidualsCAF_rs = DQM.TrackerMonitorTrack.MonitorTrackResiduals_cfi.MonitorTrackResiduals.clone()
MonitorTrackResidualsCAF_rs.Tracks = 'rsWithMaterialTracksP5'
MonitorTrackResidualsCAF_rs.trajectoryInput = 'rsWithMaterialTracksP5Refitter'
MonitorTrackResidualsCAF_rs.OutputMEsInRootFile = False

# TrackingMonitor
# clone for cosmic track finder
Expand Down
@@ -1,7 +1,6 @@
# SiStripMonitorDigi ####
import DQM.SiStripMonitorDigi.SiStripMonitorDigi_cfi
SiStripMonitorDigiHVOff = DQM.SiStripMonitorDigi.SiStripMonitorDigi_cfi.SiStripMonitorDigi.clone()
SiStripMonitorDigiHVOff.OutputMEsInRootFile = False
SiStripMonitorDigiHVOff.SelectAllDetectors = True
SiStripMonitorDigiHVOff.Mod_On = False
SiStripMonitorDigiHVOff.TkHistoMap_On = False
Expand Down Expand Up @@ -29,7 +28,6 @@
# SiStripMonitorCluster ####
import DQM.SiStripMonitorCluster.SiStripMonitorCluster_cfi
SiStripMonitorClusterHVOff = DQM.SiStripMonitorCluster.SiStripMonitorCluster_cfi.SiStripMonitorCluster.clone()
SiStripMonitorClusterHVOff.OutputMEsInRootFile = False
SiStripMonitorClusterHVOff.SelectAllDetectors = True
SiStripMonitorClusterHVOff.Mod_On = False
SiStripMonitorClusterHVOff.TkHistoMap_On = False
Expand Down
6 changes: 0 additions & 6 deletions DQM/SiStripMonitorClient/python/SiStripSourceConfigP5_cff.py
Expand Up @@ -38,7 +38,6 @@
# SiStripMonitorCluster ####
import DQM.SiStripMonitorCluster.SiStripMonitorCluster_cfi
SiStripMonitorClusterReal = DQM.SiStripMonitorCluster.SiStripMonitorCluster_cfi.SiStripMonitorCluster.clone()
SiStripMonitorClusterReal.OutputMEsInRootFile = False
SiStripMonitorClusterReal.SelectAllDetectors = True
SiStripMonitorClusterReal.TProfTotalNumberOfClusters.subdetswitchon = True
SiStripMonitorClusterReal.TProfClustersApvCycle.subdetswitchon = True
Expand Down Expand Up @@ -94,39 +93,34 @@
#MonitorTrackResiduals_cosmicTk = DQM.TrackerMonitorTrack.MonitorTrackResiduals_cfi.MonitorTrackResiduals.clone()
#MonitorTrackResiduals_cosmicTk.Tracks = 'cosmictrackfinderP5'
#MonitorTrackResiduals_cosmicTk.trajectoryInput = 'cosmictrackfinderP5'
#MonitorTrackResiduals_cosmicTk.OutputMEsInRootFile = False
#MonitorTrackResiduals_cosmicTk.Mod_On = False

# Clone for CKF Tracks
#import DQM.TrackerMonitorTrack.MonitorTrackResiduals_cfi
#MonitorTrackResiduals_ckf = DQM.TrackerMonitorTrack.MonitorTrackResiduals_cfi.MonitorTrackResiduals.clone()
#MonitorTrackResiduals_ckf.Tracks = 'ctfWithMaterialTracksP5'
#MonitorTrackResiduals_ckf.trajectoryInput = 'ctfWithMaterialTracksP5'
#MonitorTrackResiduals_ckf.OutputMEsInRootFile = False
#MonitorTrackResiduals_ckf.Mod_On = False

# Clone for Road Search Tracks
#import DQM.TrackerMonitorTrack.MonitorTrackResiduals_cfi
#MonitorTrackResiduals_rs = DQM.TrackerMonitorTrack.MonitorTrackResiduals_cfi.MonitorTrackResiduals.clone()
#MonitorTrackResiduals_rs.Tracks = 'rsWithMaterialTracksP5'
#MonitorTrackResiduals_rs.trajectoryInput = 'rsWithMaterialTracksP5'
#MonitorTrackResiduals_rs.OutputMEsInRootFile = False
#MonitorTrackResiduals_rs.Mod_On = False

# Clone for General Track (for Collision data)
import DQM.TrackerMonitorTrack.MonitorTrackResiduals_cfi
MonitorTrackResiduals_gentk = DQM.TrackerMonitorTrack.MonitorTrackResiduals_cfi.MonitorTrackResiduals.clone()
MonitorTrackResiduals_gentk.Tracks = 'generalTracks'
MonitorTrackResiduals_gentk.trajectoryInput = 'generalTracks'
MonitorTrackResiduals_gentk.OutputMEsInRootFile = False
MonitorTrackResiduals_gentk.Mod_On = False

# Clone for Heavy Ion Tracks (for HI Collisions)
#import DQM.TrackerMonitorTrack.MonitorTrackResiduals_cfi
#MonitorTrackResiduals_hi = DQM.TrackerMonitorTrack.MonitorTrackResiduals_cfi.MonitorTrackResiduals.clone()
#MonitorTrackResiduals_hi.Tracks = 'hiGeneralTracks'
#MonitorTrackResiduals_hi.trajectoryInput = 'hiGeneralTracks'
#MonitorTrackResiduals_hi.OutputMEsInRootFile = False
#MonitorTrackResiduals_hi.Mod_On = False

# Services needed for TkHistoMap
Expand Down
Expand Up @@ -83,19 +83,16 @@
import DQM.TrackerMonitorTrack.MonitorTrackResiduals_cfi
MonitorTrackResiduals_cosmicTk = DQM.TrackerMonitorTrack.MonitorTrackResiduals_cfi.MonitorTrackResiduals.clone()
MonitorTrackResiduals_cosmicTk.trajectoryInput = 'cosmictrackfinderP5'
MonitorTrackResiduals_cosmicTk.OutputMEsInRootFile = False
MonitorTrackResiduals_cosmicTk.Mod_On = False
# Clone for CKF Tracks
import DQM.TrackerMonitorTrack.MonitorTrackResiduals_cfi
MonitorTrackResiduals_ckf = DQM.TrackerMonitorTrack.MonitorTrackResiduals_cfi.MonitorTrackResiduals.clone()
MonitorTrackResiduals_ckf.trajectoryInput = 'ctfWithMaterialTracksP5'
MonitorTrackResiduals_ckf.OutputMEsInRootFile = False
MonitorTrackResiduals_ckf.Mod_On = False
# Clone for Road Search Tracks
#import DQM.TrackerMonitorTrack.MonitorTrackResiduals_cfi
#MonitorTrackResiduals_rs = DQM.TrackerMonitorTrack.MonitorTrackResiduals_cfi.MonitorTrackResiduals.clone()
#MonitorTrackResiduals_rs.trajectoryInput = 'rsWithMaterialTracksP5'
#MonitorTrackResiduals_rs.OutputMEsInRootFile = False
#MonitorTrackResiduals_rs.Mod_On = False

# TrackingMonitor ####
Expand Down
Expand Up @@ -14,7 +14,6 @@
MonitorTrackResiduals_hi = DQM.TrackerMonitorTrack.MonitorTrackResiduals_cfi.MonitorTrackResiduals.clone()
MonitorTrackResiduals_hi.Tracks = 'hiGeneralTracks'
MonitorTrackResiduals_hi.trajectoryInput = "hiGeneralTracks"
MonitorTrackResiduals_hi.OutputMEsInRootFile = False
MonitorTrackResiduals_hi.Mod_On = False

SiStripDQMTier0_hi = cms.Sequence(APVPhases * consecutiveHEs *
Expand Down
Expand Up @@ -94,7 +94,6 @@
### TrackerMonitorTrack defined and used only for MinimumBias ####
from DQM.TrackerMonitorTrack.MonitorTrackResiduals_cfi import *
MonitorTrackResiduals.trajectoryInput = 'generalTracks'
MonitorTrackResiduals.OutputMEsInRootFile = False
MonitorTrackResiduals.Mod_On = False
MonitorTrackResiduals.andOr = cms.bool( False )
MonitorTrackResiduals.dbLabel = cms.string("SiStripDQMTrigger")
Expand Down
4 changes: 0 additions & 4 deletions DQM/SiStripMonitorClient/python/SiStripSourceConfig_cff.py
Expand Up @@ -5,7 +5,6 @@

# Pedestal Monitor ###
from DQM.SiStripMonitorPedestals.SiStripMonitorPedestals_cfi import *
PedsMon.OutputMEsInRootFile = False
PedsMon.StripQualityLabel = ''
PedsMon.RunTypeFlag = 'CalculatedPlotsOnly'

Expand All @@ -15,7 +14,6 @@

# Cluster Monitor ####
from DQM.SiStripMonitorCluster.SiStripMonitorCluster_cfi import *
SiStripMonitorCluster.OutputMEsInRootFile = False
SiStripMonitorCluster.SelectAllDetectors = True
SiStripMonitorCluster.StripQualityLabel = ''

Expand Down Expand Up @@ -54,13 +52,11 @@
import DQM.TrackerMonitorTrack.MonitorTrackResiduals_cfi
MonitorTrackResidualsReal.Tracks = 'ctfWithMaterialTracksP5'
MonitorTrackResidualsReal.trajectoryInput = 'ctfWithMaterialTracksP5'
MonitorTrackResidualsReal.OutputMEsInRootFile = False
# Clone for Real Data
MonitorTrackResidualsColl = DQM.TrackerMonitorTrack.MonitorTrackResiduals_cfi.MonitorTrackResiduals.clone()
import DQM.TrackerMonitorTrack.MonitorTrackResiduals_cfi
MonitorTrackResidualsColl.Tracks = 'generalTracks'
MonitorTrackResidualsColl.trajectoryInput = 'generalTracks'
MonitorTrackResidualsColl.OutputMEsInRootFile = False


# Tracking Monitor ####
Expand Down
4 changes: 1 addition & 3 deletions DQM/SiStripMonitorCluster/interface/MonitorLTC.h
Expand Up @@ -31,9 +31,7 @@ class MonitorLTC : public DQMEDAnalyzer {
explicit MonitorLTC(const edm::ParameterSet&);
~MonitorLTC(){};
virtual void analyze(const edm::Event&, const edm::EventSetup&);
virtual void beginJob() ;
virtual void endJob() ;
void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
private:
DQMStore* dqmStore_;
edm::ParameterSet conf_;
Expand Down
4 changes: 1 addition & 3 deletions DQM/SiStripMonitorCluster/interface/SiStripMonitorFilter.h
Expand Up @@ -28,9 +28,7 @@ class SiStripMonitorFilter : public DQMEDAnalyzer {
~SiStripMonitorFilter(){};

virtual void analyze(const edm::Event&, const edm::EventSetup&);
virtual void beginJob() ;
virtual void endJob() ;
void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;

private:
edm::EDGetTokenT<int> filerDecisionToken_;
Expand Down
2 changes: 0 additions & 2 deletions DQM/SiStripMonitorCluster/interface/SiStripMonitorHLT.h
Expand Up @@ -28,8 +28,6 @@ class SiStripMonitorHLT : public DQMEDAnalyzer {
~SiStripMonitorHLT(){};

virtual void analyze(const edm::Event&, const edm::EventSetup&);
virtual void beginJob() ;
virtual void endJob() ;
void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;

private:
Expand Down
Expand Up @@ -4,8 +4,7 @@

# SiStripMonitorCluster
SiStripCalZeroBiasMonitorCluster = DQM.SiStripMonitorCluster.SiStripMonitorCluster_cfi.SiStripMonitorCluster.clone()
# by default do not write out any file with histograms
# can overwrite this in .cfg file with: replace SiStripMonitorCluster.OutputMEsInRootFile = true

SiStripCalZeroBiasMonitorCluster.ClusterProducerStrip = cms.InputTag("calZeroBiasClusters")
SiStripCalZeroBiasMonitorCluster.ClusterProducerPix = cms.InputTag('siPixelClusters')

Expand Down
8 changes: 1 addition & 7 deletions DQM/SiStripMonitorCluster/python/SiStripMonitorFilter_cfi.py
@@ -1,11 +1,5 @@
import FWCore.ParameterSet.Config as cms

SiStripMonitorFilter = cms.EDAnalyzer("SiStripMonitorFilter",
# by default do not write out any file with histograms
# can overwrite this in .cfg file with: replace SiStripMonitorFilter.OutputMEsInRootFile = true
OutputMEsInRootFile = cms.bool(False),
FilterProducer = cms.string('ClusterMTCCFilter'),
OutputFileName = cms.string('dqm_sistrip_filter.root')
FilterProducer = cms.string('ClusterMTCCFilter')
)


8 changes: 1 addition & 7 deletions DQM/SiStripMonitorCluster/python/SiStripMonitorHLT_cfi.py
@@ -1,11 +1,5 @@
import FWCore.ParameterSet.Config as cms

SiStripMonitorHLT = cms.EDAnalyzer("SiStripMonitorHLT",
# by default do not write out any file with histograms
# can overwrite this in .cfg file with: replace SiStripMonitorHLT.OutputMEsInRootFile = true
OutputMEsInRootFile = cms.bool(False),
HLTProducer = cms.string('trigger'),
OutputFileName = cms.string('test_digi_hlt.root')
HLTProducer = cms.string('trigger')
)


13 changes: 0 additions & 13 deletions DQM/SiStripMonitorCluster/src/MonitorLTC.cc
Expand Up @@ -48,10 +48,6 @@ void MonitorLTC::bookHistograms(DQMStore::IBooker & ibooker, const edm::Run & ru
LTCTriggerDecision_all->setBinLabel(5, "RPCTB");
}

void MonitorLTC::beginJob(){

}

void MonitorLTC::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
{
edm::Handle<LTCDigiCollection> ltcdigis; iEvent.getByToken(ltcDigiCollectionTagToken_, ltcdigis);
Expand Down Expand Up @@ -93,12 +89,3 @@ void MonitorLTC::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup
}

}

void MonitorLTC::endJob(void){
bool outputMEsInRootFile = conf_.getParameter<bool>("OutputMEsInRootFile");
std::string outputFileName = conf_.getParameter<std::string>("OutputFileName");
if(outputMEsInRootFile){
dqmStore_->save(outputFileName);
}
}

18 changes: 0 additions & 18 deletions DQM/SiStripMonitorCluster/src/SiStripMonitorFilter.cc
Expand Up @@ -34,28 +34,10 @@ void SiStripMonitorFilter::bookHistograms(DQMStore::IBooker & ibooker, const edm

}

void SiStripMonitorFilter::beginJob(){
}

void SiStripMonitorFilter::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
{
edm::Handle<int> filter_decision; iEvent.getByToken(filerDecisionToken_,filter_decision); // filter decision

// trigger decision
FilterDecision->Fill(*filter_decision);
}

void SiStripMonitorFilter::endJob(void){
double events_accepted = FilterDecision->getBinContent(1);
double events_rejected = FilterDecision->getBinContent(2);
double events_total = events_accepted + events_rejected;
edm::LogInfo("DQM|SiStripMonitorFilter")<<"Total nr. of events "<<events_total;
edm::LogInfo("DQM|SiStripMonitorFilter")<<"Events rejected/accepted "<<events_accepted<<"/"<<events_rejected;
edm::LogInfo("DQM|SiStripMonitorFilter")<<"rejected/total : accepted/total "<<events_rejected/events_total<<" : "<<events_accepted/events_total;
bool outputMEsInRootFile = conf_.getParameter<bool>("OutputMEsInRootFile");
std::string outputFileName = conf_.getParameter<std::string>("OutputFileName");
if(outputMEsInRootFile){
dqmStore_->save(outputFileName);
}
}

22 changes: 0 additions & 22 deletions DQM/SiStripMonitorCluster/src/SiStripMonitorHLT.cc
Expand Up @@ -30,9 +30,6 @@ SiStripMonitorHLT::SiStripMonitorHLT(const edm::ParameterSet& iConfig)
clusterInSubComponentsToken_ = consumes<std::map<uint,std::vector<SiStripCluster> > >(conf_.getParameter<std::string>("HLTProducer") );
}

void SiStripMonitorHLT::beginJob(){
}

void SiStripMonitorHLT::bookHistograms(DQMStore::IBooker & ibooker, const edm::Run & run, const edm::EventSetup & es)
{
ibooker.setCurrentFolder(HLTDirectory);
Expand Down Expand Up @@ -104,22 +101,3 @@ void SiStripMonitorHLT::analyze(const edm::Event& iEvent, const edm::EventSetup&
}
}
}

void SiStripMonitorHLT::endJob(void){
edm::LogInfo("DQM|SiStripMonitorHLT")<<"Events rejected/accepted "<<HLTDecision->getBinContent(1)<<"/"<<HLTDecision->getBinContent(2);
bool outputMEsInRootFile = conf_.getParameter<bool>("OutputMEsInRootFile");
std::string outputFileName = conf_.getParameter<std::string>("OutputFileName");
if(outputMEsInRootFile){
dqmStore_->save(outputFileName);
}

// delete MEs
// LogInfo("SiStripTkDQM|SiStripMonitorHLT")<<"pwd="<<dqmStore_->pwd();
//// std::string folder_to_delete = dqmStore_->monitorDirName + "/" + HLTDirectory;
// dqmStore_->cd();
// std::string folder_to_delete = HLTDirectory;
// LogInfo("SiStripTkDQM|SiStripMonitorHLT")<<" Removing whole directory "<<folder_to_delete;
// dqmStore_->rmdir(folder_to_delete);

}

3 changes: 0 additions & 3 deletions DQM/SiStripMonitorCluster/test/MonitorCluster_RealData_cfg.py
Expand Up @@ -103,9 +103,6 @@
process.SiStripMonitorCluster.TH1MainDiagonalPosition.globalswitchon=True
process.SiStripMonitorCluster.TH1StripNoise2ApvCycle.globalswitchon=True
process.SiStripMonitorCluster.TH1StripNoise3ApvCycle.globalswitchon=True
process.SiStripMonitorCluster.OutputMEsInRootFile.globalswitchon=True

process.SiStripMonitorCluster.OutputFileName = 'SiStripMonitorCluster.root'


process.outP = cms.OutputModule("AsciiOutputModule")
Expand Down
2 changes: 0 additions & 2 deletions DQM/SiStripMonitorCluster/test/MonitorCluster_SimData_cfg.py
Expand Up @@ -74,8 +74,6 @@
#process.SiStripMonitorCluster.TProfTotalNumberOfClusters.subdetswitchon = True
process.SiStripMonitorCluster.TH1TotalNumberOfClusters.subdetswitchon = True
#process.SiStripMonitorCluster.TProfClustersApvCycle.subdetswitchon = True
process.SiStripMonitorCluster.OutputMEsInRootFile = True
process.SiStripMonitorCluster.OutputFileName = 'SiStripMonitorCluster.root'

##
process.outP = cms.OutputModule("AsciiOutputModule")
Expand Down
6 changes: 0 additions & 6 deletions DQM/SiStripMonitorDigi/interface/SiStripBaselineValidator.h
Expand Up @@ -35,22 +35,16 @@ class SiStripBaselineValidator : public DQMEDAnalyzer
explicit SiStripBaselineValidator(const edm::ParameterSet&);
virtual ~SiStripBaselineValidator();

virtual void beginJob();
virtual void endJob();
virtual void analyze(const edm::Event&, const edm::EventSetup&);
void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;

private:

DQMStore *dbe;

MonitorElement *h1NumbadAPVsRes_;
MonitorElement *h1ADC_vs_strip_;

edm::InputTag srcProcessedRawDigi_;
edm::EDGetTokenT<edm::DetSetVector<SiStripRawDigi> > moduleRawDigiToken_;
std::string outputFile_;
bool createOutputFile_;

};
#endif
2 changes: 0 additions & 2 deletions DQM/SiStripMonitorDigi/interface/SiStripMonitorDigi.h
Expand Up @@ -36,8 +36,6 @@ class SiStripMonitorDigi : public DQMEDAnalyzer {
explicit SiStripMonitorDigi(const edm::ParameterSet&);
~SiStripMonitorDigi();
virtual void analyze(const edm::Event&, const edm::EventSetup&);
virtual void beginJob();
virtual void endJob();
virtual void endRun(const edm::Run&, const edm::EventSetup&);
virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&);
virtual void endLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&);
Expand Down
8 changes: 2 additions & 6 deletions DQM/SiStripMonitorDigi/python/SiStripBaselineValidator_cfi.py
@@ -1,9 +1,5 @@
import FWCore.ParameterSet.Config as cms

SiStripBaselineValidator = cms.EDAnalyzer("SiStripBaselineValidator",
outputFile = cms.string("test.root"),
srcProcessedRawDigi = cms.InputTag('siStripZeroSuppression','VirginRaw'),


)

srcProcessedRawDigi = cms.InputTag('siStripZeroSuppression','VirginRaw')
)
4 changes: 0 additions & 4 deletions DQM/SiStripMonitorDigi/python/SiStripMonitorDigi_cfi.py
Expand Up @@ -193,8 +193,4 @@
ShowControlView = cms.bool(False),
CalculateStripOccupancy = cms.bool(False),
ResetMEsEachRun = cms.bool(False),
# by default do not write out any file with histograms
# can overwrite this in .cfg file with: replace SiStripMonitorDigi.OutputMEsInRootFile = true
OutputMEsInRootFile = cms.bool(False),
OutputFileName = cms.string('test_digi.root')
)