From cd59556f61e0c9186460795f6ddd3f41180cdbc0 Mon Sep 17 00:00:00 2001 From: Javier Date: Wed, 23 Nov 2016 09:57:56 +0100 Subject: [PATCH 01/10] Changes to disable DDU trigger plots in DT DQM Online Trigger checks and disable check on RPC paths for TriggerEfficiency studies in DT DQM Offline. Port to 90X of PR 16679 --- .../dtLocalTriggerEfficiencyTest_cfi.py | 2 +- .../python/dtLocalTriggerTest_cfi.py | 2 +- .../python/dtTriggerEfficiencyTest_cfi.py | 2 +- DQM/DTMonitorClient/src/DTLocalTriggerTest.cc | 21 ------------------- .../python/dtTriggerBaseTask_cfi.py | 2 +- .../python/dtTriggerEfficiencyTask_cfi.py | 7 ++++--- .../src/DTLocalTriggerBaseTask.cc | 3 +-- DQM/DTMonitorModule/src/DTLocalTriggerTask.cc | 18 ++++++++-------- .../src/DTTriggerEfficiencyTask.cc | 14 +------------ 9 files changed, 19 insertions(+), 52 deletions(-) diff --git a/DQM/DTMonitorClient/python/dtLocalTriggerEfficiencyTest_cfi.py b/DQM/DTMonitorClient/python/dtLocalTriggerEfficiencyTest_cfi.py index bb1216bb4855f..440f3b7c1943e 100644 --- a/DQM/DTMonitorClient/python/dtLocalTriggerEfficiencyTest_cfi.py +++ b/DQM/DTMonitorClient/python/dtLocalTriggerEfficiencyTest_cfi.py @@ -6,7 +6,7 @@ # run in online environment runOnline = cms.untracked.bool(True), # kind of trigger data processed by DTLocalTriggerTask - hwSources = cms.untracked.vstring('TM','DDU'), + hwSources = cms.untracked.vstring('TM'), # false if DTLocalTriggerTask used LTC digis localrun = cms.untracked.bool(True), # root folder for booking of histograms diff --git a/DQM/DTMonitorClient/python/dtLocalTriggerTest_cfi.py b/DQM/DTMonitorClient/python/dtLocalTriggerTest_cfi.py index 7921a21519d4d..97c55f6bbb518 100644 --- a/DQM/DTMonitorClient/python/dtLocalTriggerTest_cfi.py +++ b/DQM/DTMonitorClient/python/dtLocalTriggerTest_cfi.py @@ -6,7 +6,7 @@ # run in online environment runOnline = cms.untracked.bool(True), # kind of trigger data processed by DTLocalTriggerTask - hwSources = cms.untracked.vstring('TM','DDU','COM'), + hwSources = cms.untracked.vstring('TM'), # false if DTLocalTriggerTask used LTC digis localrun = cms.untracked.bool(True), # root folder for booking of histograms diff --git a/DQM/DTMonitorClient/python/dtTriggerEfficiencyTest_cfi.py b/DQM/DTMonitorClient/python/dtTriggerEfficiencyTest_cfi.py index 8c8dd5d152c76..e11e600206c58 100644 --- a/DQM/DTMonitorClient/python/dtTriggerEfficiencyTest_cfi.py +++ b/DQM/DTMonitorClient/python/dtTriggerEfficiencyTest_cfi.py @@ -6,7 +6,7 @@ # run in online environment runOnline = cms.untracked.bool(False), # kind of trigger data processed by DTLocalTriggerTask - hwSources = cms.untracked.vstring('TM','DDU'), + hwSources = cms.untracked.vstring('TM'), # false if DTLocalTriggerTask used LTC digis localrun = cms.untracked.bool(True), # root folder for booking of histograms diff --git a/DQM/DTMonitorClient/src/DTLocalTriggerTest.cc b/DQM/DTMonitorClient/src/DTLocalTriggerTest.cc index e55949db69c55..93532746d4c7b 100644 --- a/DQM/DTMonitorClient/src/DTLocalTriggerTest.cc +++ b/DQM/DTMonitorClient/src/DTLocalTriggerTest.cc @@ -82,15 +82,6 @@ void DTLocalTriggerTest::Bookings(DQMStore::IBooker & ibooker, DQMStore::IGetter bookWheelHistos(ibooker,wh,"CorrFractionPhi"); bookWheelHistos(ibooker,wh,"2ndFractionPhi"); bookWheelHistos(ibooker,wh,"TriggerInclusivePhi"); - bookWheelHistos(ibooker,wh,"CorrectBXTheta"); - // Changed after TM implementation, now we have always Theta information - // Changed 11/10/2916 M.C Fouz - /* - if (hwSource=="DDU") { - bookWheelHistos(ibooker,wh,"HFractionTheta"); - } - */ - bookWheelHistos(ibooker,wh,"HFractionTheta"); } } } @@ -197,25 +188,14 @@ void DTLocalTriggerTest::runClientDiagnostic(DQMStore::IBooker & ibooker, DQMSto } } else { - // Changed by M.C.Fouz (11/10/2016) - // Perform TM/DDU common plot analysis (Phi ones) - // This was changed for DQM after TM IN but, in the Modules Source part, they are not defined as *_In - // and the histograms are not being filled, renamed with the same names as the modules - /* TH2F * BXvsQual = getHisto(igetter.get(getMEName("BXvsQual_In","LocalTriggerPhiIn", chId))); TH1F * BestQual = getHisto(igetter.get(getMEName("BestQual_In","LocalTriggerPhiIn", chId))); TH2F * Flag1stvsQual = getHisto(igetter.get(getMEName("Flag1stvsQual_In","LocalTriggerPhiIn", chId))); - */ - TH2F * BXvsQual = getHisto(igetter.get(getMEName("BXvsQual","LocalTriggerPhiIn", chId))); - TH1F * BestQual = getHisto(igetter.get(getMEName("BestQual","LocalTriggerPhiIn", chId))); - TH2F * Flag1stvsQual = getHisto(igetter.get(getMEName("Flag1stvsQual","LocalTriggerPhiIn", chId))); if (BXvsQual && Flag1stvsQual && BestQual) { - int corrSummary = 1; int secondSummary = 1; if (BestQual->GetEntries()>1) { - TH1D* BXHH = BXvsQual->ProjectionY("",6,7,""); TH1D* Flag1st = Flag1stvsQual->ProjectionY(); int BXOK_bin = BXHH->GetEntries()>=1 ? BXHH->GetMaximumBin() : 51; @@ -287,7 +267,6 @@ void DTLocalTriggerTest::runClientDiagnostic(DQMStore::IBooker & ibooker, DQMSto innerME->find(fullName("CorrFractionPhi"))->second->setBinContent(sect,stat,corrFrac); innerME->find(fullName("TriggerInclusivePhi"))->second->setBinContent(sect,stat,besttrigs); innerME->find(fullName("2ndFractionPhi"))->second->setBinContent(sect,stat,secondFrac); - } whME[wh].find(fullName("CorrFractionSummary"))->second->setBinContent(sect,stat,corrSummary); diff --git a/DQM/DTMonitorModule/python/dtTriggerBaseTask_cfi.py b/DQM/DTMonitorModule/python/dtTriggerBaseTask_cfi.py index 13c36206f629f..c0be582717ef2 100644 --- a/DQM/DTMonitorModule/python/dtTriggerBaseTask_cfi.py +++ b/DQM/DTMonitorModule/python/dtTriggerBaseTask_cfi.py @@ -6,7 +6,7 @@ targetBXTM = cms.untracked.int32(0), targetBXDDU = cms.untracked.int32(9), bestTrigAccRange = cms.untracked.int32(3), - processDDU = cms.untracked.bool(True), + processDDU = cms.untracked.bool(False), processTM = cms.untracked.bool(True), nTimeBins = cms.untracked.int32(100), nLSTimeBin = cms.untracked.int32(15), diff --git a/DQM/DTMonitorModule/python/dtTriggerEfficiencyTask_cfi.py b/DQM/DTMonitorModule/python/dtTriggerEfficiencyTask_cfi.py index 8fe52db419aa0..598801a3b0667 100644 --- a/DQM/DTMonitorModule/python/dtTriggerEfficiencyTask_cfi.py +++ b/DQM/DTMonitorModule/python/dtTriggerEfficiencyTask_cfi.py @@ -7,11 +7,12 @@ SegmArbitration = cms.untracked.string("SegmentAndTrackArbitration"), # labels of DDU/TM data and 4D segments - inputTagTM = cms.untracked.InputTag('dttfDigis'), - inputTagDDU = cms.untracked.InputTag('muonDTDigis'), + inputTagTM = cms.untracked.InputTag('twinMuxStage2Digis:PhIn'), +# inputTagTM = cms.untracked.InputTag('dttfDigis'), + inputTagDDU = cms.untracked.InputTag('dtunpacker'), inputTagSEG = cms.untracked.InputTag('dt4DSegments'), inputTagGMT = cms.untracked.InputTag('gtDigis'), - processDDU = cms.untracked.bool(True), # if true enables DDU data analysis + processDDU = cms.untracked.bool(False), # if true enables DDU data analysis processTM = cms.untracked.bool(True), # if true enables TM data analysis minBXDDU = cms.untracked.int32(7), # min BX for DDU eff computation maxBXDDU = cms.untracked.int32(15), # max BX for DDU eff computation diff --git a/DQM/DTMonitorModule/src/DTLocalTriggerBaseTask.cc b/DQM/DTMonitorModule/src/DTLocalTriggerBaseTask.cc index bd0749b4a252d..98f5001fd69eb 100644 --- a/DQM/DTMonitorModule/src/DTLocalTriggerBaseTask.cc +++ b/DQM/DTMonitorModule/src/DTLocalTriggerBaseTask.cc @@ -119,7 +119,7 @@ void DTLocalTriggerBaseTask::bookHistograms(DQMStore::IBooker & ibooker, edm::Ru bookHistos(ibooker, DTChamberId(wh,stat,sect)); } } - bookHistos(ibooker, wh); + if (processDDU) bookHistos(ibooker, wh); } } @@ -401,7 +401,6 @@ void DTLocalTriggerBaseTask::runTMAnalysis( std::vector const int qual = iph->code(); int is1st = iph->Ts2Tag() ? 1 : 0; int bx = iph->bxNum() - is1st; - if (qual <0 || qual>6) continue; // Check that quality is in a valid range DTChamberId dtChId(wh,st,sec); diff --git a/DQM/DTMonitorModule/src/DTLocalTriggerTask.cc b/DQM/DTMonitorModule/src/DTLocalTriggerTask.cc index 00f455e33f693..7ec1abf8eb851 100644 --- a/DQM/DTMonitorModule/src/DTLocalTriggerTask.cc +++ b/DQM/DTMonitorModule/src/DTLocalTriggerTask.cc @@ -140,13 +140,13 @@ void DTLocalTriggerTask::bookHistograms(DQMStore::IBooker & ibooker, edm::Run co DTChamberId dtChId(wh,stat,sect); if (parameters.getUntrackedParameter("process_tm", true)){ // TM data - bookHistos(ibooker, dtChId,"LocalTriggerPhiIn","TM_BXvsQual"+(*trigSrcIt)); + bookHistos(ibooker, dtChId,"LocalTriggerPhiIn","TM_BXvsQual_In"+(*trigSrcIt)); if (detailedAnalysis) { - bookHistos(ibooker, dtChId,"LocalTriggerPhiIn","TM_QualvsPhirad"+(*trigSrcIt)); - bookHistos(ibooker, dtChId,"LocalTriggerPhiIn","TM_QualvsPhibend"+(*trigSrcIt)); + bookHistos(ibooker, dtChId,"LocalTriggerPhiIn","TM_QualvsPhirad_In"+(*trigSrcIt)); + bookHistos(ibooker, dtChId,"LocalTriggerPhiIn","TM_QualvsPhibend_In"+(*trigSrcIt)); } - bookHistos(ibooker, dtChId,"LocalTriggerPhiIn","TM_Flag1stvsQual"+(*trigSrcIt)); - bookHistos(ibooker, dtChId,"LocalTriggerPhiIn","TM_BestQual"+(*trigSrcIt)); + bookHistos(ibooker, dtChId,"LocalTriggerPhiIn","TM_Flag1stvsQual_In"+(*trigSrcIt)); + bookHistos(ibooker, dtChId,"LocalTriggerPhiIn","TM_BestQual_In"+(*trigSrcIt)); if (stat!=4 && doTMTheta){ bookHistos(ibooker, dtChId,"LocalTriggerTheta","TM_PositionvsBX"+(*trigSrcIt)); bookHistos(ibooker, dtChId,"LocalTriggerTheta","TM_QualityvsBX"+(*trigSrcIt)); @@ -559,11 +559,11 @@ void DTLocalTriggerTask::runTMAnalysis(std::vector const* phT innerME.find("TM_QualvsPhirad"+trigsrc)->second->Fill(x,phcode); // SM Qual vs radial angle Phi view } else { - innerME.find("TM_BXvsQual"+trigsrc)->second->Fill(phcode,phbx-phi1st); // SM BX vs Qual Phi view (1st tracks) - innerME.find("TM_Flag1stvsQual"+trigsrc)->second->Fill(phcode,phi1st); // SM Qual 1st/2nd track flag Phi view + innerME.find("TM_BXvsQual_In"+trigsrc)->second->Fill(phcode,phbx-phi1st); // SM BX vs Qual Phi view (1st tracks) + innerME.find("TM_Flag1stvsQual_In"+trigsrc)->second->Fill(phcode,phi1st); // SM Qual 1st/2nd track flag Phi view if (detailedAnalysis) { - innerME.find("TM_QualvsPhirad"+trigsrc)->second->Fill(x,phcode); // SM Qual vs radial angle Phi view - innerME.find("TM_QualvsPhibend"+trigsrc)->second->Fill(angle,phcode); // SM Qual vs bending Phi view + innerME.find("TM_QualvsPhirad_In"+trigsrc)->second->Fill(x,phcode); // SM Qual vs radial angle Phi view + innerME.find("TM_QualvsPhibend_In"+trigsrc)->second->Fill(angle,phcode); // SM Qual vs bending Phi view } } diff --git a/DQM/DTMonitorModule/src/DTTriggerEfficiencyTask.cc b/DQM/DTMonitorModule/src/DTTriggerEfficiencyTask.cc index 327d44b54ade2..17bd8121590d3 100644 --- a/DQM/DTMonitorModule/src/DTTriggerEfficiencyTask.cc +++ b/DQM/DTMonitorModule/src/DTTriggerEfficiencyTask.cc @@ -94,7 +94,6 @@ void DTTriggerEfficiencyTask::bookHistograms(DQMStore::IBooker & ibooker, LogTrace ("DTDQM|DTMonitorModule|DTTriggerEfficiencyTask") << "[DTTriggerEfficiencyTask]: bookHistograms" << endl; nevents = 0; - for (int wh=-2;wh<=2;++wh){ vector::const_iterator tagIt = processTags.begin(); vector::const_iterator tagEnd = processTags.end(); @@ -122,11 +121,9 @@ void DTTriggerEfficiencyTask::analyze(const edm::Event& e, const edm::EventSetup nevents++; - if (!hasRPCTriggers(e)) { return; } - +// if (!hasRPCTriggers(e)) { return; } map phBestTM; map phBestDDU; - // Getting best TM Stuff edm::Handle l1DTTPGPh; e.getByToken(tm_Token_, l1DTTPGPh); @@ -222,7 +219,6 @@ void DTTriggerEfficiencyTask::analyze(const edm::Event& e, const edm::EventSetup // Plot filling vector::const_iterator btrack; for ( btrack = best4DSegments.begin(); btrack != best4DSegments.end(); ++btrack ){ - int wheel = (*btrack)->chamberId().wheel(); int station = (*btrack)->chamberId().station(); int scsector = 0; @@ -235,16 +231,12 @@ void DTTriggerEfficiencyTask::analyze(const edm::Event& e, const edm::EventSetup map &innerWhME = wheelHistos[wheel]; if (fabs(xdir)=nMinHitsPhi){ - vector::const_iterator tagIt = processTags.begin(); vector::const_iterator tagEnd = processTags.end(); - for (; tagIt!=tagEnd; ++tagIt) { - int qual = (*tagIt) == "TM" ? phBestTM.find(dtChId) != phBestTM.end() ? phBestTM[dtChId]->code() : -1 : phBestDDU.find(dtChId) != phBestDDU.end() ? phBestDDU[dtChId]->quality() : -1; - innerWhME.find((*tagIt) + "_TrigEffDenum")->second->Fill(scsector,station); if ( qual>=0 && qual<7 ) { innerWhME.find((*tagIt) + "_TrigEffNum")->second->Fill(scsector,station); @@ -395,7 +387,3 @@ void DTTriggerEfficiencyTask::bookWheelHistos(DQMStore::IBooker& ibooker,int whe } -// Local Variables: -// show-trailing-whitespace: t -// truncate-lines: t -// End: From c134746ecef690e68c2b9fa33382c88997ef4f65 Mon Sep 17 00:00:00 2001 From: Javier Date: Mon, 28 Nov 2016 18:38:38 +0100 Subject: [PATCH 02/10] Fix to solve runMatrix problem --- .../python/dtDQMOfflineSources_Cosmics_cff.py | 40 ++++++++++++++----- .../python/dtDQMOfflineSources_HI_cff.py | 22 +++++++++- .../python/dtDQMOfflineSources_cff.py | 22 +++++++++- 3 files changed, 72 insertions(+), 12 deletions(-) diff --git a/DQM/DTMonitorModule/python/dtDQMOfflineSources_Cosmics_cff.py b/DQM/DTMonitorModule/python/dtDQMOfflineSources_Cosmics_cff.py index 11d624cf43c5c..8a152c14ca331 100644 --- a/DQM/DTMonitorModule/python/dtDQMOfflineSources_Cosmics_cff.py +++ b/DQM/DTMonitorModule/python/dtDQMOfflineSources_Cosmics_cff.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms from DQM.DTMonitorModule.dtChamberEfficiency_Cosmics_cfi import * -from DQM.DTMonitorModule.dtDCSByLumiTask_cfi import * from DQM.DTMonitorModule.dtSegmentTask_cfi import * +from DQM.DTMonitorModule.dtDCSByLumiTask_cfi import * from DQM.DTMonitorModule.dtRunConditionVar_cfi import * dtSegmentAnalysisMonitor.detailedAnalysis = True dtSegmentAnalysisMonitor.slideTimeBins = False @@ -14,6 +14,25 @@ subSystemFolder = cms.untracked.string('DT') ) +# Scalers info +from EventFilter.ScalersRawToDigi.ScalersRawToDigi_cfi import * +scalersRawToDigi.scalersInputTag = 'rawDataCollector' + +# DT digitization and reconstruction +# Switched to TwinMux +from EventFilter.L1TXRawToDigi.twinMuxStage2Digis_cfi import * +twinMuxStage2Digis.DTTM7_FED_Source = 'rawDataCollector' + +from EventFilter.DTRawToDigi.dtunpackerDDUGlobal_cfi import * +#from EventFilter.DTRawToDigi.dtunpackerDDULocal_cfi import * +dtunpacker.readOutParameters.performDataIntegrityMonitor = True +dtunpacker.readOutParameters.rosParameters.performDataIntegrityMonitor = True +dtunpacker.readOutParameters.debug = False +dtunpacker.readOutParameters.rosParameters.debug = False +dtunpacker.inputLabel = 'rawDataCollector' + +unpackers = cms.Sequence(dtunpacker + twinMuxStage2Digis + scalersRawToDigi) + dtDataIntegrityUnpacker = cms.EDProducer("DTUnpackingModule", dataType = cms.string('DDU'), @@ -41,12 +60,13 @@ from DQM.DTMonitorModule.dtTriggerEfficiencyTask_cfi import * -dtSourcesCosmics = cms.Sequence(dtDataIntegrityUnpacker + - DTDataIntegrityTask + - dtDCSByLumiMonitor + - dtRunConditionVar + - dtSegmentAnalysisMonitor + - dtResolutionAnalysisMonitor + - dtEfficiencyMonitor + - dtTriggerEfficiencyMonitor + - dqmInfoDT) +dtSourcesCosmics = cms.Sequence(#dtDataIntegrityUnpacker + + unpackers + + DTDataIntegrityTask + + dtDCSByLumiMonitor + + dtRunConditionVar + + dtSegmentAnalysisMonitor + + dtResolutionAnalysisMonitor + + dtEfficiencyMonitor + + dtTriggerEfficiencyMonitor + + dqmInfoDT) diff --git a/DQM/DTMonitorModule/python/dtDQMOfflineSources_HI_cff.py b/DQM/DTMonitorModule/python/dtDQMOfflineSources_HI_cff.py index 495bac59cb72b..927f55ccc90df 100644 --- a/DQM/DTMonitorModule/python/dtDQMOfflineSources_HI_cff.py +++ b/DQM/DTMonitorModule/python/dtDQMOfflineSources_HI_cff.py @@ -14,6 +14,25 @@ subSystemFolder = cms.untracked.string('DT') ) +# Scalers info +from EventFilter.ScalersRawToDigi.ScalersRawToDigi_cfi import * +scalersRawToDigi.scalersInputTag = 'rawDataCollector' + +# DT digitization and reconstruction +# Switched to TwinMux +from EventFilter.L1TXRawToDigi.twinMuxStage2Digis_cfi import * +twinMuxStage2Digis.DTTM7_FED_Source = 'rawDataCollector' + +from EventFilter.DTRawToDigi.dtunpackerDDUGlobal_cfi import * +#from EventFilter.DTRawToDigi.dtunpackerDDULocal_cfi import * +dtunpacker.readOutParameters.performDataIntegrityMonitor = True +dtunpacker.readOutParameters.rosParameters.performDataIntegrityMonitor = True +dtunpacker.readOutParameters.debug = False +dtunpacker.readOutParameters.rosParameters.debug = False +dtunpacker.inputLabel = 'rawDataCollector' + +unpackers = cms.Sequence(dtunpacker + twinMuxStage2Digis + scalersRawToDigi) + dtDataIntegrityUnpacker = cms.EDProducer("DTUnpackingModule", dataType = cms.string('DDU'), @@ -41,7 +60,8 @@ from DQM.DTMonitorModule.dtTriggerEfficiencyTask_cfi import * -dtSources = cms.Sequence(dtDataIntegrityUnpacker + +dtSources = cms.Sequence(#dtDataIntegrityUnpacker + + unpackers + DTDataIntegrityTask + dtDCSByLumiMonitor + dtRunConditionVar + diff --git a/DQM/DTMonitorModule/python/dtDQMOfflineSources_cff.py b/DQM/DTMonitorModule/python/dtDQMOfflineSources_cff.py index 844b82929ce6c..84b96adcb3ded 100644 --- a/DQM/DTMonitorModule/python/dtDQMOfflineSources_cff.py +++ b/DQM/DTMonitorModule/python/dtDQMOfflineSources_cff.py @@ -14,6 +14,25 @@ subSystemFolder = cms.untracked.string('DT') ) +# Scalers info +from EventFilter.ScalersRawToDigi.ScalersRawToDigi_cfi import * +scalersRawToDigi.scalersInputTag = 'rawDataCollector' + +# DT digitization and reconstruction +# Switched to TwinMux +from EventFilter.L1TXRawToDigi.twinMuxStage2Digis_cfi import * +twinMuxStage2Digis.DTTM7_FED_Source = 'rawDataCollector' + +from EventFilter.DTRawToDigi.dtunpackerDDUGlobal_cfi import * +#from EventFilter.DTRawToDigi.dtunpackerDDULocal_cfi import * +dtunpacker.readOutParameters.performDataIntegrityMonitor = True +dtunpacker.readOutParameters.rosParameters.performDataIntegrityMonitor = True +dtunpacker.readOutParameters.debug = False +dtunpacker.readOutParameters.rosParameters.debug = False +dtunpacker.inputLabel = 'rawDataCollector' + +unpackers = cms.Sequence(dtunpacker + twinMuxStage2Digis + scalersRawToDigi) + dtDataIntegrityUnpacker = cms.EDProducer("DTUnpackingModule", dataType = cms.string('DDU'), @@ -41,7 +60,8 @@ from DQM.DTMonitorModule.dtTriggerEfficiencyTask_cfi import * -dtSources = cms.Sequence(dtDataIntegrityUnpacker + +dtSources = cms.Sequence(#dtDataIntegrityUnpacker + + unpackers + DTDataIntegrityTask + dtDCSByLumiMonitor + dtRunConditionVar + From 0adab095c7ab58c0e8216aec876558441bb80127 Mon Sep 17 00:00:00 2001 From: Javier Date: Tue, 29 Nov 2016 21:24:09 +0100 Subject: [PATCH 03/10] Fix for special BeamHalo RelVal configuration --- .../python/dtDQMOfflineSources_Cosmics_cff.py | 6 +----- DQM/DTMonitorModule/python/dtDQMOfflineSources_HI_cff.py | 6 +----- DQM/DTMonitorModule/python/dtDQMOfflineSources_cff.py | 6 +----- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/DQM/DTMonitorModule/python/dtDQMOfflineSources_Cosmics_cff.py b/DQM/DTMonitorModule/python/dtDQMOfflineSources_Cosmics_cff.py index 8a152c14ca331..fc0f059decb7b 100644 --- a/DQM/DTMonitorModule/python/dtDQMOfflineSources_Cosmics_cff.py +++ b/DQM/DTMonitorModule/python/dtDQMOfflineSources_Cosmics_cff.py @@ -14,10 +14,6 @@ subSystemFolder = cms.untracked.string('DT') ) -# Scalers info -from EventFilter.ScalersRawToDigi.ScalersRawToDigi_cfi import * -scalersRawToDigi.scalersInputTag = 'rawDataCollector' - # DT digitization and reconstruction # Switched to TwinMux from EventFilter.L1TXRawToDigi.twinMuxStage2Digis_cfi import * @@ -31,7 +27,7 @@ dtunpacker.readOutParameters.rosParameters.debug = False dtunpacker.inputLabel = 'rawDataCollector' -unpackers = cms.Sequence(dtunpacker + twinMuxStage2Digis + scalersRawToDigi) +unpackers = cms.Sequence(dtunpacker + twinMuxStage2Digis ) dtDataIntegrityUnpacker = cms.EDProducer("DTUnpackingModule", diff --git a/DQM/DTMonitorModule/python/dtDQMOfflineSources_HI_cff.py b/DQM/DTMonitorModule/python/dtDQMOfflineSources_HI_cff.py index 927f55ccc90df..1498466573164 100644 --- a/DQM/DTMonitorModule/python/dtDQMOfflineSources_HI_cff.py +++ b/DQM/DTMonitorModule/python/dtDQMOfflineSources_HI_cff.py @@ -14,10 +14,6 @@ subSystemFolder = cms.untracked.string('DT') ) -# Scalers info -from EventFilter.ScalersRawToDigi.ScalersRawToDigi_cfi import * -scalersRawToDigi.scalersInputTag = 'rawDataCollector' - # DT digitization and reconstruction # Switched to TwinMux from EventFilter.L1TXRawToDigi.twinMuxStage2Digis_cfi import * @@ -31,7 +27,7 @@ dtunpacker.readOutParameters.rosParameters.debug = False dtunpacker.inputLabel = 'rawDataCollector' -unpackers = cms.Sequence(dtunpacker + twinMuxStage2Digis + scalersRawToDigi) +unpackers = cms.Sequence(dtunpacker + twinMuxStage2Digis ) dtDataIntegrityUnpacker = cms.EDProducer("DTUnpackingModule", diff --git a/DQM/DTMonitorModule/python/dtDQMOfflineSources_cff.py b/DQM/DTMonitorModule/python/dtDQMOfflineSources_cff.py index 84b96adcb3ded..fb291425b4a9e 100644 --- a/DQM/DTMonitorModule/python/dtDQMOfflineSources_cff.py +++ b/DQM/DTMonitorModule/python/dtDQMOfflineSources_cff.py @@ -14,10 +14,6 @@ subSystemFolder = cms.untracked.string('DT') ) -# Scalers info -from EventFilter.ScalersRawToDigi.ScalersRawToDigi_cfi import * -scalersRawToDigi.scalersInputTag = 'rawDataCollector' - # DT digitization and reconstruction # Switched to TwinMux from EventFilter.L1TXRawToDigi.twinMuxStage2Digis_cfi import * @@ -31,7 +27,7 @@ dtunpacker.readOutParameters.rosParameters.debug = False dtunpacker.inputLabel = 'rawDataCollector' -unpackers = cms.Sequence(dtunpacker + twinMuxStage2Digis + scalersRawToDigi) +unpackers = cms.Sequence(dtunpacker + twinMuxStage2Digis) dtDataIntegrityUnpacker = cms.EDProducer("DTUnpackingModule", From e3c42fd9bf302e6a0ee479544791c2655d15d962 Mon Sep 17 00:00:00 2001 From: Javier Date: Wed, 7 Dec 2016 10:02:14 +0100 Subject: [PATCH 04/10] Changes in Digis and unpacker moved to EventFilter package --- .../python/dtDQMOfflineSources_Cosmics_cff.py | 6 ------ DQM/DTMonitorModule/python/dtDQMOfflineSources_HI_cff.py | 6 ------ DQM/DTMonitorModule/python/dtDQMOfflineSources_cff.py | 6 ------ EventFilter/DTRawToDigi/python/dtunpackerDDUGlobal_cfi.py | 4 ++-- 4 files changed, 2 insertions(+), 20 deletions(-) diff --git a/DQM/DTMonitorModule/python/dtDQMOfflineSources_Cosmics_cff.py b/DQM/DTMonitorModule/python/dtDQMOfflineSources_Cosmics_cff.py index fc0f059decb7b..c2a97c174dd0f 100644 --- a/DQM/DTMonitorModule/python/dtDQMOfflineSources_Cosmics_cff.py +++ b/DQM/DTMonitorModule/python/dtDQMOfflineSources_Cosmics_cff.py @@ -17,15 +17,9 @@ # DT digitization and reconstruction # Switched to TwinMux from EventFilter.L1TXRawToDigi.twinMuxStage2Digis_cfi import * -twinMuxStage2Digis.DTTM7_FED_Source = 'rawDataCollector' from EventFilter.DTRawToDigi.dtunpackerDDUGlobal_cfi import * #from EventFilter.DTRawToDigi.dtunpackerDDULocal_cfi import * -dtunpacker.readOutParameters.performDataIntegrityMonitor = True -dtunpacker.readOutParameters.rosParameters.performDataIntegrityMonitor = True -dtunpacker.readOutParameters.debug = False -dtunpacker.readOutParameters.rosParameters.debug = False -dtunpacker.inputLabel = 'rawDataCollector' unpackers = cms.Sequence(dtunpacker + twinMuxStage2Digis ) diff --git a/DQM/DTMonitorModule/python/dtDQMOfflineSources_HI_cff.py b/DQM/DTMonitorModule/python/dtDQMOfflineSources_HI_cff.py index 1498466573164..40e9ed0c74d3b 100644 --- a/DQM/DTMonitorModule/python/dtDQMOfflineSources_HI_cff.py +++ b/DQM/DTMonitorModule/python/dtDQMOfflineSources_HI_cff.py @@ -17,15 +17,9 @@ # DT digitization and reconstruction # Switched to TwinMux from EventFilter.L1TXRawToDigi.twinMuxStage2Digis_cfi import * -twinMuxStage2Digis.DTTM7_FED_Source = 'rawDataCollector' from EventFilter.DTRawToDigi.dtunpackerDDUGlobal_cfi import * #from EventFilter.DTRawToDigi.dtunpackerDDULocal_cfi import * -dtunpacker.readOutParameters.performDataIntegrityMonitor = True -dtunpacker.readOutParameters.rosParameters.performDataIntegrityMonitor = True -dtunpacker.readOutParameters.debug = False -dtunpacker.readOutParameters.rosParameters.debug = False -dtunpacker.inputLabel = 'rawDataCollector' unpackers = cms.Sequence(dtunpacker + twinMuxStage2Digis ) diff --git a/DQM/DTMonitorModule/python/dtDQMOfflineSources_cff.py b/DQM/DTMonitorModule/python/dtDQMOfflineSources_cff.py index fb291425b4a9e..6068e04709d10 100644 --- a/DQM/DTMonitorModule/python/dtDQMOfflineSources_cff.py +++ b/DQM/DTMonitorModule/python/dtDQMOfflineSources_cff.py @@ -17,15 +17,9 @@ # DT digitization and reconstruction # Switched to TwinMux from EventFilter.L1TXRawToDigi.twinMuxStage2Digis_cfi import * -twinMuxStage2Digis.DTTM7_FED_Source = 'rawDataCollector' from EventFilter.DTRawToDigi.dtunpackerDDUGlobal_cfi import * #from EventFilter.DTRawToDigi.dtunpackerDDULocal_cfi import * -dtunpacker.readOutParameters.performDataIntegrityMonitor = True -dtunpacker.readOutParameters.rosParameters.performDataIntegrityMonitor = True -dtunpacker.readOutParameters.debug = False -dtunpacker.readOutParameters.rosParameters.debug = False -dtunpacker.inputLabel = 'rawDataCollector' unpackers = cms.Sequence(dtunpacker + twinMuxStage2Digis) diff --git a/EventFilter/DTRawToDigi/python/dtunpackerDDUGlobal_cfi.py b/EventFilter/DTRawToDigi/python/dtunpackerDDUGlobal_cfi.py index e0a4f82e2929d..cb98d8106e6ac 100644 --- a/EventFilter/DTRawToDigi/python/dtunpackerDDUGlobal_cfi.py +++ b/EventFilter/DTRawToDigi/python/dtunpackerDDUGlobal_cfi.py @@ -14,11 +14,11 @@ rosParameters = cms.PSet( writeSC = cms.untracked.bool(True), readingDDU = cms.untracked.bool(True), - performDataIntegrityMonitor = cms.untracked.bool(False), + performDataIntegrityMonitor = cms.untracked.bool(True), readDDUIDfromDDU = cms.untracked.bool(True), debug = cms.untracked.bool(False), localDAQ = cms.untracked.bool(False) ), localDAQ = cms.untracked.bool(False), - performDataIntegrityMonitor = cms.untracked.bool(False) + performDataIntegrityMonitor = cms.untracked.bool(True) ) From 38e35b4fede974885c318bde37fc0f2bc7c2d04a Mon Sep 17 00:00:00 2001 From: Javier Date: Wed, 14 Dec 2016 19:01:09 +0100 Subject: [PATCH 05/10] Modification for 2016 running Era --- DQM/DTMonitorModule/python/dtTriggerEfficiencyTask_cfi.py | 7 ++++++- DQM/DTMonitorModule/src/DTTriggerEfficiencyTask.cc | 5 ++++- DQM/DTMonitorModule/src/DTTriggerEfficiencyTask.h | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/DQM/DTMonitorModule/python/dtTriggerEfficiencyTask_cfi.py b/DQM/DTMonitorModule/python/dtTriggerEfficiencyTask_cfi.py index 598801a3b0667..c72025780d954 100644 --- a/DQM/DTMonitorModule/python/dtTriggerEfficiencyTask_cfi.py +++ b/DQM/DTMonitorModule/python/dtTriggerEfficiencyTask_cfi.py @@ -17,10 +17,15 @@ minBXDDU = cms.untracked.int32(7), # min BX for DDU eff computation maxBXDDU = cms.untracked.int32(15), # max BX for DDU eff computation + checkRPCtriggers = cms.untracked.bool(True), nMinHitsPhi = cms.untracked.int32(5), phiAccRange = cms.untracked.double(30.), detailedAnalysis = cms.untracked.bool(False), #if true enables detailed analysis plots ) - +# +# Modify for running in run 2 2016 data +# +from Configuration.Eras.Modifier_run2_25ns_specific_cff import run2_25ns_specific +run2_25ns_specific.toModify( dtTriggerEfficiencyMonitor, checkRPCtriggers = cms.untracked.bool(False)) diff --git a/DQM/DTMonitorModule/src/DTTriggerEfficiencyTask.cc b/DQM/DTMonitorModule/src/DTTriggerEfficiencyTask.cc index 17bd8121590d3..84885f7d5962a 100644 --- a/DQM/DTMonitorModule/src/DTTriggerEfficiencyTask.cc +++ b/DQM/DTMonitorModule/src/DTTriggerEfficiencyTask.cc @@ -64,6 +64,7 @@ DTTriggerEfficiencyTask::DTTriggerEfficiencyTask(const edm::ParameterSet& ps) : minBXDDU = parameters.getUntrackedParameter("minBXDDU"); maxBXDDU = parameters.getUntrackedParameter("maxBXDDU"); + checkRPCtriggers = parameters.getUntrackedParameter("checkRPCtriggers"); nMinHitsPhi = parameters.getUntrackedParameter("nMinHitsPhi"); phiAccRange = parameters.getUntrackedParameter("phiAccRange"); @@ -121,7 +122,9 @@ void DTTriggerEfficiencyTask::analyze(const edm::Event& e, const edm::EventSetup nevents++; -// if (!hasRPCTriggers(e)) { return; } + if (checkRPCtriggers){ //For pre-2016 Era compatibility + if (!hasRPCTriggers(e)) { return; } + } map phBestTM; map phBestDDU; // Getting best TM Stuff diff --git a/DQM/DTMonitorModule/src/DTTriggerEfficiencyTask.h b/DQM/DTMonitorModule/src/DTTriggerEfficiencyTask.h index f72e59ef98bb3..154e047ba7b19 100644 --- a/DQM/DTMonitorModule/src/DTTriggerEfficiencyTask.h +++ b/DQM/DTMonitorModule/src/DTTriggerEfficiencyTask.h @@ -83,7 +83,7 @@ class DTTriggerEfficiencyTask: public DQMEDAnalyzer{ std::string SegmArbitration; - bool processTM, processDDU, detailedPlots; + bool processTM, processDDU, detailedPlots, checkRPCtriggers; std::vector processTags; int minBXDDU, maxBXDDU; From 8f292b6e50f37996c46ae7f316beb453e7a94495 Mon Sep 17 00:00:00 2001 From: Javier Date: Tue, 20 Dec 2016 17:42:23 +0100 Subject: [PATCH 06/10] Final fix Run2 Era configuration preserving the previous data formats --- .../python/dtLocalTriggerEfficiencyTest_cfi.py | 4 +++- DQM/DTMonitorClient/python/dtLocalTriggerTest_cfi.py | 4 +++- .../python/dtTriggerEfficiencyTest_cfi.py | 4 +++- .../python/dtDQMOfflineSources_Cosmics_cff.py | 9 ++------- .../python/dtDQMOfflineSources_HI_cff.py | 10 ++-------- DQM/DTMonitorModule/python/dtDQMOfflineSources_cff.py | 9 ++------- DQM/DTMonitorModule/python/dtTriggerBaseTask_cfi.py | 4 +++- .../python/dtTriggerEfficiencyTask_cfi.py | 8 ++++---- 8 files changed, 22 insertions(+), 30 deletions(-) diff --git a/DQM/DTMonitorClient/python/dtLocalTriggerEfficiencyTest_cfi.py b/DQM/DTMonitorClient/python/dtLocalTriggerEfficiencyTest_cfi.py index 440f3b7c1943e..4ea35cf74f405 100644 --- a/DQM/DTMonitorClient/python/dtLocalTriggerEfficiencyTest_cfi.py +++ b/DQM/DTMonitorClient/python/dtLocalTriggerEfficiencyTest_cfi.py @@ -6,11 +6,13 @@ # run in online environment runOnline = cms.untracked.bool(True), # kind of trigger data processed by DTLocalTriggerTask - hwSources = cms.untracked.vstring('TM'), + hwSources = cms.untracked.vstring('TM','DDU'), # false if DTLocalTriggerTask used LTC digis localrun = cms.untracked.bool(True), # root folder for booking of histograms folderRoot = cms.untracked.string('') ) +from Configuration.Eras.Modifier_run2_25ns_specific_cff import run2_25ns_specific +run2_25ns_specific.toModify( triggerEfficiencyTest,hwSources = cms.untracked.vstring('TM') ) diff --git a/DQM/DTMonitorClient/python/dtLocalTriggerTest_cfi.py b/DQM/DTMonitorClient/python/dtLocalTriggerTest_cfi.py index 97c55f6bbb518..823785e477a56 100644 --- a/DQM/DTMonitorClient/python/dtLocalTriggerTest_cfi.py +++ b/DQM/DTMonitorClient/python/dtLocalTriggerTest_cfi.py @@ -6,7 +6,7 @@ # run in online environment runOnline = cms.untracked.bool(True), # kind of trigger data processed by DTLocalTriggerTask - hwSources = cms.untracked.vstring('TM'), + hwSources = cms.untracked.vstring('TM','DDU'), # false if DTLocalTriggerTask used LTC digis localrun = cms.untracked.bool(True), # root folder for booking of histograms @@ -25,4 +25,6 @@ ) +from Configuration.Eras.Modifier_run2_25ns_specific_cff import run2_25ns_specific +run2_25ns_specific.toModify( triggerTest,hwSources = cms.untracked.vstring('TM') ) diff --git a/DQM/DTMonitorClient/python/dtTriggerEfficiencyTest_cfi.py b/DQM/DTMonitorClient/python/dtTriggerEfficiencyTest_cfi.py index e11e600206c58..1cad6bf2d30a2 100644 --- a/DQM/DTMonitorClient/python/dtTriggerEfficiencyTest_cfi.py +++ b/DQM/DTMonitorClient/python/dtTriggerEfficiencyTest_cfi.py @@ -6,7 +6,7 @@ # run in online environment runOnline = cms.untracked.bool(False), # kind of trigger data processed by DTLocalTriggerTask - hwSources = cms.untracked.vstring('TM'), + hwSources = cms.untracked.vstring('TM','DDU'), # false if DTLocalTriggerTask used LTC digis localrun = cms.untracked.bool(True), # root folder for booking of histograms @@ -15,4 +15,6 @@ detailedAnalysis = cms.untracked.bool(False) ) +from Configuration.Eras.Modifier_run2_25ns_specific_cff import run2_25ns_specific +run2_25ns_specific.toModify( triggerEffTest,hwSources = cms.untracked.vstring('TM') ) diff --git a/DQM/DTMonitorModule/python/dtDQMOfflineSources_Cosmics_cff.py b/DQM/DTMonitorModule/python/dtDQMOfflineSources_Cosmics_cff.py index c2a97c174dd0f..d74ebaedadbe7 100644 --- a/DQM/DTMonitorModule/python/dtDQMOfflineSources_Cosmics_cff.py +++ b/DQM/DTMonitorModule/python/dtDQMOfflineSources_Cosmics_cff.py @@ -17,12 +17,7 @@ # DT digitization and reconstruction # Switched to TwinMux from EventFilter.L1TXRawToDigi.twinMuxStage2Digis_cfi import * - from EventFilter.DTRawToDigi.dtunpackerDDUGlobal_cfi import * -#from EventFilter.DTRawToDigi.dtunpackerDDULocal_cfi import * - -unpackers = cms.Sequence(dtunpacker + twinMuxStage2Digis ) - dtDataIntegrityUnpacker = cms.EDProducer("DTUnpackingModule", dataType = cms.string('DDU'), @@ -50,8 +45,8 @@ from DQM.DTMonitorModule.dtTriggerEfficiencyTask_cfi import * -dtSourcesCosmics = cms.Sequence(#dtDataIntegrityUnpacker + - unpackers + +dtSourcesCosmics = cms.Sequence(dtDataIntegrityUnpacker + + twinMuxStage2Digis + DTDataIntegrityTask + dtDCSByLumiMonitor + dtRunConditionVar + diff --git a/DQM/DTMonitorModule/python/dtDQMOfflineSources_HI_cff.py b/DQM/DTMonitorModule/python/dtDQMOfflineSources_HI_cff.py index 40e9ed0c74d3b..3295c4d0a751a 100644 --- a/DQM/DTMonitorModule/python/dtDQMOfflineSources_HI_cff.py +++ b/DQM/DTMonitorModule/python/dtDQMOfflineSources_HI_cff.py @@ -17,12 +17,7 @@ # DT digitization and reconstruction # Switched to TwinMux from EventFilter.L1TXRawToDigi.twinMuxStage2Digis_cfi import * - from EventFilter.DTRawToDigi.dtunpackerDDUGlobal_cfi import * -#from EventFilter.DTRawToDigi.dtunpackerDDULocal_cfi import * - -unpackers = cms.Sequence(dtunpacker + twinMuxStage2Digis ) - dtDataIntegrityUnpacker = cms.EDProducer("DTUnpackingModule", dataType = cms.string('DDU'), @@ -44,14 +39,13 @@ performDataIntegrityMonitor = cms.untracked.bool(True) ) ) - from DQM.DTMonitorModule.dtDataIntegrityTask_cfi import * DTDataIntegrityTask.processingMode = "Offline" from DQM.DTMonitorModule.dtTriggerEfficiencyTask_cfi import * -dtSources = cms.Sequence(#dtDataIntegrityUnpacker + - unpackers + +dtSources = cms.Sequence(dtDataIntegrityUnpacker + + twinMuxStage2Digis + DTDataIntegrityTask + dtDCSByLumiMonitor + dtRunConditionVar + diff --git a/DQM/DTMonitorModule/python/dtDQMOfflineSources_cff.py b/DQM/DTMonitorModule/python/dtDQMOfflineSources_cff.py index 6068e04709d10..b4d75b2cca3cf 100644 --- a/DQM/DTMonitorModule/python/dtDQMOfflineSources_cff.py +++ b/DQM/DTMonitorModule/python/dtDQMOfflineSources_cff.py @@ -17,12 +17,7 @@ # DT digitization and reconstruction # Switched to TwinMux from EventFilter.L1TXRawToDigi.twinMuxStage2Digis_cfi import * - from EventFilter.DTRawToDigi.dtunpackerDDUGlobal_cfi import * -#from EventFilter.DTRawToDigi.dtunpackerDDULocal_cfi import * - -unpackers = cms.Sequence(dtunpacker + twinMuxStage2Digis) - dtDataIntegrityUnpacker = cms.EDProducer("DTUnpackingModule", dataType = cms.string('DDU'), @@ -50,8 +45,8 @@ from DQM.DTMonitorModule.dtTriggerEfficiencyTask_cfi import * -dtSources = cms.Sequence(#dtDataIntegrityUnpacker + - unpackers + +dtSources = cms.Sequence(dtDataIntegrityUnpacker + + twinMuxStage2Digis + DTDataIntegrityTask + dtDCSByLumiMonitor + dtRunConditionVar + diff --git a/DQM/DTMonitorModule/python/dtTriggerBaseTask_cfi.py b/DQM/DTMonitorModule/python/dtTriggerBaseTask_cfi.py index c0be582717ef2..97d42a665f72c 100644 --- a/DQM/DTMonitorModule/python/dtTriggerBaseTask_cfi.py +++ b/DQM/DTMonitorModule/python/dtTriggerBaseTask_cfi.py @@ -6,7 +6,7 @@ targetBXTM = cms.untracked.int32(0), targetBXDDU = cms.untracked.int32(9), bestTrigAccRange = cms.untracked.int32(3), - processDDU = cms.untracked.bool(False), + processDDU = cms.untracked.bool(True), processTM = cms.untracked.bool(True), nTimeBins = cms.untracked.int32(100), nLSTimeBin = cms.untracked.int32(15), @@ -22,4 +22,6 @@ maxBXTM = cms.untracked.int32(2) ) +from Configuration.Eras.Modifier_run2_25ns_specific_cff import run2_25ns_specific +run2_25ns_specific.toModify( dtTriggerBaseMonitor, processDDU = cms.untracked.bool(False)) diff --git a/DQM/DTMonitorModule/python/dtTriggerEfficiencyTask_cfi.py b/DQM/DTMonitorModule/python/dtTriggerEfficiencyTask_cfi.py index c72025780d954..ecd88c4004aa5 100644 --- a/DQM/DTMonitorModule/python/dtTriggerEfficiencyTask_cfi.py +++ b/DQM/DTMonitorModule/python/dtTriggerEfficiencyTask_cfi.py @@ -7,12 +7,12 @@ SegmArbitration = cms.untracked.string("SegmentAndTrackArbitration"), # labels of DDU/TM data and 4D segments - inputTagTM = cms.untracked.InputTag('twinMuxStage2Digis:PhIn'), + inputTagTM = cms.untracked.InputTag('dttfDigis'), # inputTagTM = cms.untracked.InputTag('dttfDigis'), - inputTagDDU = cms.untracked.InputTag('dtunpacker'), + inputTagDDU = cms.untracked.InputTag('muonDTDigis'), inputTagSEG = cms.untracked.InputTag('dt4DSegments'), inputTagGMT = cms.untracked.InputTag('gtDigis'), - processDDU = cms.untracked.bool(False), # if true enables DDU data analysis + processDDU = cms.untracked.bool(True), # if true enables DDU data analysis processTM = cms.untracked.bool(True), # if true enables TM data analysis minBXDDU = cms.untracked.int32(7), # min BX for DDU eff computation maxBXDDU = cms.untracked.int32(15), # max BX for DDU eff computation @@ -28,4 +28,4 @@ # Modify for running in run 2 2016 data # from Configuration.Eras.Modifier_run2_25ns_specific_cff import run2_25ns_specific -run2_25ns_specific.toModify( dtTriggerEfficiencyMonitor, checkRPCtriggers = cms.untracked.bool(False)) +run2_25ns_specific.toModify( dtTriggerEfficiencyMonitor, checkRPCtriggers = cms.untracked.bool(False),processDDU = cms.untracked.bool(False)) From 70cfcb04298257c9bf5442e911186ff32da70d25 Mon Sep 17 00:00:00 2001 From: Javier Date: Mon, 9 Jan 2017 16:10:38 +0100 Subject: [PATCH 07/10] Move from tabs to spaces --- DQM/DTMonitorModule/python/dtDQMOfflineSources_Cosmics_cff.py | 2 +- DQM/DTMonitorModule/python/dtDQMOfflineSources_cff.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DQM/DTMonitorModule/python/dtDQMOfflineSources_Cosmics_cff.py b/DQM/DTMonitorModule/python/dtDQMOfflineSources_Cosmics_cff.py index d74ebaedadbe7..a3b6eba281914 100644 --- a/DQM/DTMonitorModule/python/dtDQMOfflineSources_Cosmics_cff.py +++ b/DQM/DTMonitorModule/python/dtDQMOfflineSources_Cosmics_cff.py @@ -46,7 +46,7 @@ from DQM.DTMonitorModule.dtTriggerEfficiencyTask_cfi import * dtSourcesCosmics = cms.Sequence(dtDataIntegrityUnpacker + - twinMuxStage2Digis + + twinMuxStage2Digis + DTDataIntegrityTask + dtDCSByLumiMonitor + dtRunConditionVar + diff --git a/DQM/DTMonitorModule/python/dtDQMOfflineSources_cff.py b/DQM/DTMonitorModule/python/dtDQMOfflineSources_cff.py index b4d75b2cca3cf..255fd35287e9d 100644 --- a/DQM/DTMonitorModule/python/dtDQMOfflineSources_cff.py +++ b/DQM/DTMonitorModule/python/dtDQMOfflineSources_cff.py @@ -46,7 +46,7 @@ from DQM.DTMonitorModule.dtTriggerEfficiencyTask_cfi import * dtSources = cms.Sequence(dtDataIntegrityUnpacker + - twinMuxStage2Digis + + twinMuxStage2Digis + DTDataIntegrityTask + dtDCSByLumiMonitor + dtRunConditionVar + From a0d32963b3274176ae24fddaa721c10ae7e88278 Mon Sep 17 00:00:00 2001 From: Javier Date: Tue, 10 Jan 2017 11:53:06 +0100 Subject: [PATCH 08/10] Another tab --- DQM/DTMonitorModule/python/dtDQMOfflineSources_HI_cff.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DQM/DTMonitorModule/python/dtDQMOfflineSources_HI_cff.py b/DQM/DTMonitorModule/python/dtDQMOfflineSources_HI_cff.py index 3295c4d0a751a..b9c23d3a25a26 100644 --- a/DQM/DTMonitorModule/python/dtDQMOfflineSources_HI_cff.py +++ b/DQM/DTMonitorModule/python/dtDQMOfflineSources_HI_cff.py @@ -45,7 +45,7 @@ from DQM.DTMonitorModule.dtTriggerEfficiencyTask_cfi import * dtSources = cms.Sequence(dtDataIntegrityUnpacker + - twinMuxStage2Digis + + twinMuxStage2Digis + DTDataIntegrityTask + dtDCSByLumiMonitor + dtRunConditionVar + From ff549f2b7a24ca9a1a17a2a317852d731769b2d9 Mon Sep 17 00:00:00 2001 From: Javier Date: Tue, 10 Jan 2017 17:10:37 +0100 Subject: [PATCH 09/10] Removed all tabs from python files in DQM/DT* packages --- .../python/dtSegmentAnalysisTest_cfi.py | 2 +- .../src/DTLocalTriggerSynchTest.cc | 2 +- DQM/DTMonitorClient/src/DTResolutionTest.cc | 2 +- .../python/dtDQMOfflineSources_Cosmics_cff.py | 2 +- .../python/dtDQMOfflineSources_HI_cff.py | 2 +- .../python/dtDQMOfflineSources_cff.py | 2 +- DQM/DTMonitorModule/src/DTEfficiencyTask.cc | 2 +- .../src/DTResolutionAnalysisTask.cc | 4 +- .../test/DTkFactValidation_2_DQM_TEMPL_cfg.py | 42 +++++++++---------- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/DQM/DTMonitorClient/python/dtSegmentAnalysisTest_cfi.py b/DQM/DTMonitorClient/python/dtSegmentAnalysisTest_cfi.py index 42331f79c78a9..40e1618defc9c 100644 --- a/DQM/DTMonitorClient/python/dtSegmentAnalysisTest_cfi.py +++ b/DQM/DTMonitorClient/python/dtSegmentAnalysisTest_cfi.py @@ -2,7 +2,7 @@ segmentTest = cms.EDAnalyzer("DTSegmentAnalysisTest", detailedAnalysis = cms.untracked.bool(False), - #Perform basic diagnostic in endLumi/EndRun + #Perform basic diagnostic in endLumi/EndRun runOnline = cms.untracked.bool(True), #Names of the quality tests: they must match those specified in "qtList" chi2TestName = cms.untracked.string('chi2InRange'), diff --git a/DQM/DTMonitorClient/src/DTLocalTriggerSynchTest.cc b/DQM/DTMonitorClient/src/DTLocalTriggerSynchTest.cc index 324c1d2e035dc..02bbff9fa412b 100644 --- a/DQM/DTMonitorClient/src/DTLocalTriggerSynchTest.cc +++ b/DQM/DTMonitorClient/src/DTLocalTriggerSynchTest.cc @@ -135,7 +135,7 @@ void DTLocalTriggerSynchTest::runClientDiagnostic(DQMStore::IBooker & ibooker, D MonitorElement* ratioH = innerME.find(fullName(ratioHistoTag))->second; makeRatioME(numH,denH,ratioH); try { - //Need our own copy to avoid threading problems + //Need our own copy to avoid threading problems TF1 mypol8("mypol8","pol8"); getHisto(ratioH)->Fit(&mypol8,"CQO"); } catch (cms::Exception& iException) { diff --git a/DQM/DTMonitorClient/src/DTResolutionTest.cc b/DQM/DTMonitorClient/src/DTResolutionTest.cc index 74ed5b760268a..59506f3dd757b 100644 --- a/DQM/DTMonitorClient/src/DTResolutionTest.cc +++ b/DQM/DTMonitorClient/src/DTResolutionTest.cc @@ -245,7 +245,7 @@ DTResolutionTest::~DTResolutionTest(){ TProfile* prof = res_histo_2D_root->ProfileX(); prof->GetXaxis()->SetRangeUser(0,2); //prof->Fit("pol1","Q0"); - //need our own copy to avoid threading problems + //need our own copy to avoid threading problems TF1 fitting("mypol1","pol1"); try { prof->Fit(&fitting,"Q0"); diff --git a/DQM/DTMonitorModule/python/dtDQMOfflineSources_Cosmics_cff.py b/DQM/DTMonitorModule/python/dtDQMOfflineSources_Cosmics_cff.py index a3b6eba281914..91844581bfb0c 100644 --- a/DQM/DTMonitorModule/python/dtDQMOfflineSources_Cosmics_cff.py +++ b/DQM/DTMonitorModule/python/dtDQMOfflineSources_Cosmics_cff.py @@ -46,7 +46,7 @@ from DQM.DTMonitorModule.dtTriggerEfficiencyTask_cfi import * dtSourcesCosmics = cms.Sequence(dtDataIntegrityUnpacker + - twinMuxStage2Digis + + twinMuxStage2Digis + DTDataIntegrityTask + dtDCSByLumiMonitor + dtRunConditionVar + diff --git a/DQM/DTMonitorModule/python/dtDQMOfflineSources_HI_cff.py b/DQM/DTMonitorModule/python/dtDQMOfflineSources_HI_cff.py index b9c23d3a25a26..c2a3b8f58f602 100644 --- a/DQM/DTMonitorModule/python/dtDQMOfflineSources_HI_cff.py +++ b/DQM/DTMonitorModule/python/dtDQMOfflineSources_HI_cff.py @@ -45,7 +45,7 @@ from DQM.DTMonitorModule.dtTriggerEfficiencyTask_cfi import * dtSources = cms.Sequence(dtDataIntegrityUnpacker + - twinMuxStage2Digis + + twinMuxStage2Digis + DTDataIntegrityTask + dtDCSByLumiMonitor + dtRunConditionVar + diff --git a/DQM/DTMonitorModule/python/dtDQMOfflineSources_cff.py b/DQM/DTMonitorModule/python/dtDQMOfflineSources_cff.py index 255fd35287e9d..2d6d979fce6e8 100644 --- a/DQM/DTMonitorModule/python/dtDQMOfflineSources_cff.py +++ b/DQM/DTMonitorModule/python/dtDQMOfflineSources_cff.py @@ -46,7 +46,7 @@ from DQM.DTMonitorModule.dtTriggerEfficiencyTask_cfi import * dtSources = cms.Sequence(dtDataIntegrityUnpacker + - twinMuxStage2Digis + + twinMuxStage2Digis + DTDataIntegrityTask + dtDCSByLumiMonitor + dtRunConditionVar + diff --git a/DQM/DTMonitorModule/src/DTEfficiencyTask.cc b/DQM/DTMonitorModule/src/DTEfficiencyTask.cc index e30dea57395a7..347488f604dac 100644 --- a/DQM/DTMonitorModule/src/DTEfficiencyTask.cc +++ b/DQM/DTMonitorModule/src/DTEfficiencyTask.cc @@ -250,7 +250,7 @@ void DTEfficiencyTask::analyze(const edm::Event& event, const edm::EventSetup& s << " hits, skipping" << endl; // FIXME: info output continue; } - copy(zRecHits.begin(), zRecHits.end(), back_inserter(recHits1D)); + copy(zRecHits.begin(), zRecHits.end(), back_inserter(recHits1D)); } // Skip the segment if it has more than 1 hit on the same layer diff --git a/DQM/DTMonitorModule/src/DTResolutionAnalysisTask.cc b/DQM/DTMonitorModule/src/DTResolutionAnalysisTask.cc index c004cc9e3932e..83a840bae3a71 100644 --- a/DQM/DTMonitorModule/src/DTResolutionAnalysisTask.cc +++ b/DQM/DTMonitorModule/src/DTResolutionAnalysisTask.cc @@ -158,7 +158,7 @@ void DTResolutionAnalysisTask::analyze(const edm::Event& event, const edm::Event if(phiRecHits.size() < thePhiHitsCut) { continue; } - copy(phiRecHits.begin(), phiRecHits.end(), back_inserter(recHits1D_S3)); + copy(phiRecHits.begin(), phiRecHits.end(), back_inserter(recHits1D_S3)); } else { } @@ -170,7 +170,7 @@ void DTResolutionAnalysisTask::analyze(const edm::Event& event, const edm::Event continue; } - copy(zRecHits.begin(), zRecHits.end(), back_inserter(recHits1D_S3)); + copy(zRecHits.begin(), zRecHits.end(), back_inserter(recHits1D_S3)); } // Loop over 1D RecHit inside 4D segment diff --git a/DQM/DTMonitorModule/test/DTkFactValidation_2_DQM_TEMPL_cfg.py b/DQM/DTMonitorModule/test/DTkFactValidation_2_DQM_TEMPL_cfg.py index 9e64925ff2be2..352ddb3cff0c4 100644 --- a/DQM/DTMonitorModule/test/DTkFactValidation_2_DQM_TEMPL_cfg.py +++ b/DQM/DTMonitorModule/test/DTkFactValidation_2_DQM_TEMPL_cfg.py @@ -16,27 +16,27 @@ process.source = cms.Source("PoolSource", processingMode = cms.untracked.string("RunsLumisAndEvents"), fileNames = cms.untracked.vstring( - 'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_1.root', - 'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_10.root', - 'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_11.root', - 'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_12.root', - 'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_13.root', - 'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_14.root', - 'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_15.root', - 'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_16.root', - 'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_17.root', - 'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_18.root', - 'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_2.root', - 'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_20.root', - 'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_21.root', - 'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_22.root', - 'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_3.root', - 'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_4.root', - 'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_5.root', - 'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_6.root', - 'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_7.root', - 'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_8.root', - 'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_9.root' +'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_1.root', +'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_10.root', +'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_11.root', +'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_12.root', +'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_13.root', +'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_14.root', +'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_15.root', +'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_16.root', +'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_17.root', +'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_18.root', +'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_2.root', +'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_20.root', +'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_21.root', +'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_22.root', +'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_3.root', +'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_4.root', +'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_5.root', +'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_6.root', +'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_7.root', +'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_8.root', +'file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_MUONCALIB/DTCALIB/LHC/Temp/ttrig/Run121475/Ttrig/Validation/crab_0_091123_221340/res/DQM_9.root' ) From d1813282ddfa9e7599f354304dca4affc55cefe5 Mon Sep 17 00:00:00 2001 From: Javier Date: Wed, 25 Jan 2017 13:04:59 +0100 Subject: [PATCH 10/10] Removed producers from source configuration cffs --- .../python/dtDQMOfflineSources_Cosmics_cff.py | 23 ++++++++----------- .../python/dtDQMOfflineSources_HI_cff.py | 6 +---- .../python/dtDQMOfflineSources_cff.py | 5 ---- 3 files changed, 10 insertions(+), 24 deletions(-) diff --git a/DQM/DTMonitorModule/python/dtDQMOfflineSources_Cosmics_cff.py b/DQM/DTMonitorModule/python/dtDQMOfflineSources_Cosmics_cff.py index 91844581bfb0c..11d624cf43c5c 100644 --- a/DQM/DTMonitorModule/python/dtDQMOfflineSources_Cosmics_cff.py +++ b/DQM/DTMonitorModule/python/dtDQMOfflineSources_Cosmics_cff.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms from DQM.DTMonitorModule.dtChamberEfficiency_Cosmics_cfi import * -from DQM.DTMonitorModule.dtSegmentTask_cfi import * from DQM.DTMonitorModule.dtDCSByLumiTask_cfi import * +from DQM.DTMonitorModule.dtSegmentTask_cfi import * from DQM.DTMonitorModule.dtRunConditionVar_cfi import * dtSegmentAnalysisMonitor.detailedAnalysis = True dtSegmentAnalysisMonitor.slideTimeBins = False @@ -14,10 +14,6 @@ subSystemFolder = cms.untracked.string('DT') ) -# DT digitization and reconstruction -# Switched to TwinMux -from EventFilter.L1TXRawToDigi.twinMuxStage2Digis_cfi import * -from EventFilter.DTRawToDigi.dtunpackerDDUGlobal_cfi import * dtDataIntegrityUnpacker = cms.EDProducer("DTUnpackingModule", dataType = cms.string('DDU'), @@ -46,12 +42,11 @@ from DQM.DTMonitorModule.dtTriggerEfficiencyTask_cfi import * dtSourcesCosmics = cms.Sequence(dtDataIntegrityUnpacker + - twinMuxStage2Digis + - DTDataIntegrityTask + - dtDCSByLumiMonitor + - dtRunConditionVar + - dtSegmentAnalysisMonitor + - dtResolutionAnalysisMonitor + - dtEfficiencyMonitor + - dtTriggerEfficiencyMonitor + - dqmInfoDT) + DTDataIntegrityTask + + dtDCSByLumiMonitor + + dtRunConditionVar + + dtSegmentAnalysisMonitor + + dtResolutionAnalysisMonitor + + dtEfficiencyMonitor + + dtTriggerEfficiencyMonitor + + dqmInfoDT) diff --git a/DQM/DTMonitorModule/python/dtDQMOfflineSources_HI_cff.py b/DQM/DTMonitorModule/python/dtDQMOfflineSources_HI_cff.py index c2a3b8f58f602..495bac59cb72b 100644 --- a/DQM/DTMonitorModule/python/dtDQMOfflineSources_HI_cff.py +++ b/DQM/DTMonitorModule/python/dtDQMOfflineSources_HI_cff.py @@ -14,10 +14,6 @@ subSystemFolder = cms.untracked.string('DT') ) -# DT digitization and reconstruction -# Switched to TwinMux -from EventFilter.L1TXRawToDigi.twinMuxStage2Digis_cfi import * -from EventFilter.DTRawToDigi.dtunpackerDDUGlobal_cfi import * dtDataIntegrityUnpacker = cms.EDProducer("DTUnpackingModule", dataType = cms.string('DDU'), @@ -39,13 +35,13 @@ performDataIntegrityMonitor = cms.untracked.bool(True) ) ) + from DQM.DTMonitorModule.dtDataIntegrityTask_cfi import * DTDataIntegrityTask.processingMode = "Offline" from DQM.DTMonitorModule.dtTriggerEfficiencyTask_cfi import * dtSources = cms.Sequence(dtDataIntegrityUnpacker + - twinMuxStage2Digis + DTDataIntegrityTask + dtDCSByLumiMonitor + dtRunConditionVar + diff --git a/DQM/DTMonitorModule/python/dtDQMOfflineSources_cff.py b/DQM/DTMonitorModule/python/dtDQMOfflineSources_cff.py index 2d6d979fce6e8..844b82929ce6c 100644 --- a/DQM/DTMonitorModule/python/dtDQMOfflineSources_cff.py +++ b/DQM/DTMonitorModule/python/dtDQMOfflineSources_cff.py @@ -14,10 +14,6 @@ subSystemFolder = cms.untracked.string('DT') ) -# DT digitization and reconstruction -# Switched to TwinMux -from EventFilter.L1TXRawToDigi.twinMuxStage2Digis_cfi import * -from EventFilter.DTRawToDigi.dtunpackerDDUGlobal_cfi import * dtDataIntegrityUnpacker = cms.EDProducer("DTUnpackingModule", dataType = cms.string('DDU'), @@ -46,7 +42,6 @@ from DQM.DTMonitorModule.dtTriggerEfficiencyTask_cfi import * dtSources = cms.Sequence(dtDataIntegrityUnpacker + - twinMuxStage2Digis + DTDataIntegrityTask + dtDCSByLumiMonitor + dtRunConditionVar +