Merge pull request #14750 from jfernan2/TwinMux-ThetaPlots

Twin mux theta plots
cms-sw · Oct 6, 2016 · c5dabb6 · c5dabb6
2 parents 1fd622b + 0656885
commit c5dabb6
Show file tree

Hide file tree

Showing 19 changed files with 394 additions and 194 deletions.
diff --git a/DQM/DTMonitorClient/src/DTLocalTriggerTPTest.cc b/DQM/DTMonitorClient/src/DTLocalTriggerTPTest.cc
@@ -100,7 +100,7 @@ void DTLocalTriggerTPTest::runClientDiagnostic(DQMStore::IBooker & ibooker,
 	    DTChamberId chId(wh,stat,sect);
 
 	    // Perform TM/DDU common plot analysis (Phi ones)
-	    TH2F * BXvsQual      = getHisto<TH2F>(igetter.get(getMEName("BXvsQual","LocalTriggerPhi", chId)));
+	    TH2F * BXvsQual      = getHisto<TH2F>(igetter.get(getMEName("BXvsQual_In","LocalTriggerPhiIn", chId)));
 	    if ( BXvsQual ) {
 
 	      if (BXvsQual->GetEntries()>1) {

diff --git a/DQM/DTMonitorClient/src/DTLocalTriggerTest.cc b/DQM/DTMonitorClient/src/DTLocalTriggerTest.cc
@@ -155,7 +155,7 @@ void DTLocalTriggerTest::runClientDiagnostic(DQMStore::IBooker & ibooker, DQMSto
 
 	    if (hwSource=="COM") {
 	      // Perform TM-DDU matching test and generates summaries (Phi view)
-	      TH2F * DDUvsTM = getHisto<TH2F>(igetter.get(getMEName("QualDDUvsQualTM","LocalTriggerPhi", chId)));
+	      TH2F * DDUvsTM = getHisto<TH2F>(igetter.get(getMEName("QualDDUvsQualTM","LocalTriggerPhiIn", chId)));
 	      if (DDUvsTM) {
 
 		int matchSummary   = 1;
@@ -193,9 +193,9 @@ void DTLocalTriggerTest::runClientDiagnostic(DQMStore::IBooker & ibooker, DQMSto
 	    }
 	    else {
 	      // Perform TM/DDU common plot analysis (Phi ones)
-	      TH2F * BXvsQual      = getHisto<TH2F>(igetter.get(getMEName("BXvsQual","LocalTriggerPhi", chId)));
-	      TH1F * BestQual      = getHisto<TH1F>(igetter.get(getMEName("BestQual","LocalTriggerPhi", chId)));
-	      TH2F * Flag1stvsQual = getHisto<TH2F>(igetter.get(getMEName("Flag1stvsQual","LocalTriggerPhi", chId))); 
+	      TH2F * BXvsQual      = getHisto<TH2F>(igetter.get(getMEName("BXvsQual_In","LocalTriggerPhiIn", chId)));
+	      TH1F * BestQual      = getHisto<TH1F>(igetter.get(getMEName("BestQual_In","LocalTriggerPhiIn", chId)));
+	      TH2F * Flag1stvsQual = getHisto<TH2F>(igetter.get(getMEName("Flag1stvsQual_In","LocalTriggerPhiIn", chId))); 
 	      if (BXvsQual && Flag1stvsQual && BestQual) {
 
 		int corrSummary   = 1;

diff --git a/DQM/DTMonitorModule/python/dtTriggerBaseTask_cfi.py b/DQM/DTMonitorModule/python/dtTriggerBaseTask_cfi.py
@@ -11,7 +11,10 @@
     nTimeBins = cms.untracked.int32(100),
     nLSTimeBin = cms.untracked.int32(15),    
     ResetCycle = cms.untracked.int32(9999),
-    inputTagTM = cms.untracked.InputTag('twinMuxStage2Digis'),
+    inputTagTM = cms.untracked.InputTag('twinMuxStage2Digis:PhIn'),
+    inputTagTMphIn = cms.untracked.InputTag('twinMuxStage2Digis:PhIn'),
+    inputTagTMphOut = cms.untracked.InputTag('twinMuxStage2Digis:PhOut'),
+    inputTagTMth = cms.untracked.InputTag('twinMuxStage2Digis:ThIn'),
     inputTagDDU = cms.untracked.InputTag('dtunpacker'),
     minBXDDU = cms.untracked.int32(0), 
     maxBXDDU = cms.untracked.int32(20),

diff --git a/DQM/DTMonitorModule/python/dtTriggerLutTask_cfi.py b/DQM/DTMonitorModule/python/dtTriggerLutTask_cfi.py
@@ -2,7 +2,7 @@
 
 dtTriggerLutMonitor = cms.EDAnalyzer("DTLocalTriggerLutTask",
     # labels of DDU/TM data and 4D segments
-    inputTagTM = cms.untracked.InputTag("twinMuxStage2Digis"),
+    inputTagTM = cms.untracked.InputTag("twinMuxStage2Digis:PhIn"),
     inputTagSEG = cms.untracked.InputTag("dt4DSegments"),
     # set static booking (all the detector)
     staticBooking = cms.untracked.bool(True),

diff --git a/DQM/DTMonitorModule/python/dtTriggerTask_TP_cfi.py b/DQM/DTMonitorModule/python/dtTriggerTask_TP_cfi.py
@@ -4,7 +4,7 @@
     # set static booking (all the detector)
     staticBooking = cms.untracked.bool(True),
     # labels of DDU/TM data and 4D segments
-    dcc_label = cms.untracked.string('twinMuxStage2Digis'),
+    tm_label = cms.untracked.string('twinMuxStage2Digis:PhIn'),
     ros_label = cms.untracked.string('dtunpacker'),
     seg_label = cms.untracked.string('dt4DSegments'),
     minBXDDU = cms.untracked.int32(0),  # min BX for DDU plots
@@ -13,7 +13,7 @@
     maxBXTM = cms.untracked.int32(2),  # max BX for TM plots
     process_seg = cms.untracked.bool(False), # if true enables comparisons with reconstructed segments    
     process_ros = cms.untracked.bool(True),  # if true enables DDU data analysis
-    process_dcc = cms.untracked.bool(True),  # if true enables TM data analysis
+    process_tm = cms.untracked.bool(True),  # if true enables TM data analysis
     testPulseMode = cms.untracked.bool(True), #if true enables test pulse mode
     detailedAnalysis = cms.untracked.bool(False), #if true enables detailed analysis plots
     enableTMTheta = cms.untracked.bool(False), # if true enables theta plots for TM

diff --git a/DQM/DTMonitorModule/python/dtTriggerTask_cfi.py b/DQM/DTMonitorModule/python/dtTriggerTask_cfi.py
@@ -4,7 +4,7 @@
     # set static booking (all the detector)
     staticBooking = cms.untracked.bool(True),
     # labels of DDU/TM data and 4D segments
-    dcc_label = cms.untracked.string('twinMuxStage2Digis'),
+    tm_label = cms.untracked.string('twinMuxStage2Digis:PhIn'),
     ros_label = cms.untracked.string('dtunpacker'),
     seg_label = cms.untracked.string('dt4DSegments'),
     minBXDDU = cms.untracked.int32(0),  # min BX for DDU plots
@@ -13,7 +13,7 @@
     minBXTM = cms.untracked.int32(0), # min BX for TM plots
     process_seg = cms.untracked.bool(False), # if true enables comparisons with reconstructed segments    
     process_ros = cms.untracked.bool(True),  # if true enables DDU data analysis
-    process_dcc = cms.untracked.bool(True), # if true enables TM data analysis
+    process_tm = cms.untracked.bool(True), # if true enables TM data analysis
     testPulseMode = cms.untracked.bool(False), # if true enables test pluse mode
     detailedAnalysis = cms.untracked.bool(False), #if true enables detailed analysis plots
     enableTMTheta = cms.untracked.bool(True), # if true enables theta plots for TM

diff --git a/DQM/DTMonitorModule/python/test/hltdt_dqm_sourceclient-live_GlobalRun_cfg.py b/DQM/DTMonitorModule/python/test/hltdt_dqm_sourceclient-live_GlobalRun_cfg.py
@@ -84,7 +84,7 @@
 
 process.dtDQMTest = cms.Sequence(segmentTest + dtResolutionAnalysisTest)
 
-process.dtDQMPathPhys = cms.Path(process.dqmmodules + process.physicsEventsFilter * process.dtDQMTask + process.dtDQMTest)
+process.dtDQMPathPhys = cms.Path(process.unpackers + process.dqmmodules + process.physicsEventsFilter * process.dtDQMTask + process.dtDQMTest)