Merge pull request #23240 from CTPPS/ctpps_dqm_fix_10_2_0_pre3

CTPPS: DQM fix
cms-sw · May 20, 2018 · 7ba18fe · 7ba18fe
2 parents ad766cf + b5f351f
commit 7ba18fe
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 10 deletions.
diff --git a/DQM/CTPPS/plugins/CTPPSDiamondDQMSource.cc b/DQM/CTPPS/plugins/CTPPSDiamondDQMSource.cc
@@ -477,7 +477,7 @@ CTPPSDiamondDQMSource::analyze( const edm::Event& event, const edm::EventSetup&
   if ( !valid ) {
     if ( verbosity_ ) {
       edm::LogProblem("CTPPSDiamondDQMSource")
-        << "ERROR in TotemDQMModuleRP::analyze > some of the required inputs are not valid. Skipping this event.\n"
+        << "ERROR in CTPPSDiamondDQMSource::analyze > some of the required inputs are not valid. Skipping this event.\n"
         << "    diamondVFATStatus.isValid = " << diamondVFATStatus.isValid() << "\n"
         << "    diamondDigis.isValid = " << diamondDigis.isValid() << "\n"
         << "    fedInfo.isValid = " << fedInfo.isValid();

diff --git a/DQM/CTPPS/plugins/ElasticPlotDQMSource.cc b/DQM/CTPPS/plugins/ElasticPlotDQMSource.cc
@@ -206,9 +206,11 @@ void ElasticPlotDQMSource::bookHistograms(DQMStore::IBooker &ibooker, edm::Run c
   ibooker.cd();
   ibooker.setCurrentFolder("CTPPS");
 
-  // initialize diagonal plots
+  // initialize (anti-)diagonal plots
+  diagonalPlots[0] = DiagonalPlots(ibooker, 0);  // 45 bot - 56 bot
   diagonalPlots[1] = DiagonalPlots(ibooker, 1);  // 45 bot - 56 top
-  diagonalPlots[2] = DiagonalPlots(ibooker, 2);  // 45 top - 45 bot
+  diagonalPlots[2] = DiagonalPlots(ibooker, 2);  // 45 top - 56 bot
+  diagonalPlots[3] = DiagonalPlots(ibooker, 3);  // 45 top - 56 top
 
   // loop over arms
   for (unsigned int arm = 0; arm < 2; arm++)
@@ -251,7 +253,7 @@ void ElasticPlotDQMSource::analyze(edm::Event const& event, edm::EventSetup cons
     if (verbosity)
     {
       LogProblem("ElasticPlotDQMSource") <<
-        "ERROR in TotemDQMModuleRP::analyze > some of the required inputs are not valid. Skipping this event.\n"
+        "ERROR in ElasticPlotDQMSource::analyze > some of the required inputs are not valid. Skipping this event.\n"
         << "    hits.isValid = " << hits.isValid() << "\n"
         << "    patterns.isValid = " << patterns.isValid() << "\n"
         << "    tracks.isValid = " << tracks.isValid();

diff --git a/DQM/CTPPS/plugins/TotemTimingDQMSource.cc b/DQM/CTPPS/plugins/TotemTimingDQMSource.cc
@@ -529,7 +529,7 @@ void TotemTimingDQMSource::analyze(const edm::Event &event,
     if (verbosity_)
     {
       edm::LogProblem("TotemTimingDQMSource")
-          << "ERROR in TotemDQMModuleRP::analyze > some of the required inputs "
+          << "ERROR in TotemTimingDQMSource::analyze > some of the required inputs "
              "are not valid. Skipping this event.\n"
           << "    timingDigis.isValid = " << timingDigis.isValid() << "\n"
           << "    fedInfo.isValid = " << fedInfo.isValid();

diff --git a/DQM/CTPPS/test/all_ctpps_dqm_test_from_aod_cfg.py b/DQM/CTPPS/test/all_ctpps_dqm_test_from_aod_cfg.py
@@ -1,6 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-process = cms.Process('RECODQM')
+from Configuration.StandardSequences.Eras import eras
+process = cms.Process('ctppsDQMfromAOD', eras.ctpps_2016)
 
 # minimum of logs
 process.MessageLogger = cms.Service("MessageLogger",

diff --git a/DQM/CTPPS/test/all_ctpps_dqm_test_from_raw_cfg.py b/DQM/CTPPS/test/all_ctpps_dqm_test_from_raw_cfg.py
@@ -1,6 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-process = cms.Process('RECODQM')
+from Configuration.StandardSequences.Eras import eras
+process = cms.Process('ctppsDQMfromRAW', eras.ctpps_2016)
 
 # minimum of logs
 process.MessageLogger = cms.Service("MessageLogger",
@@ -26,10 +27,13 @@
     #'root://eostotem.cern.ch//eos/totem/user/j/jkaspar/04C8034A-9626-E611-9B6E-02163E011F93.root'
 
     # run 283877, fill 5442, 23 Oct 2016 (after TS2)
-    '/store/data/Run2016H/HLTPhysics/RAW/v1/000/283/877/00000/F28F8896-999B-E611-93D8-02163E013706.root',
+    #'/store/data/Run2016H/HLTPhysics/RAW/v1/000/283/877/00000/F28F8896-999B-E611-93D8-02163E013706.root',
 
     # test file for 2017 mapping (vertical RPs only)
     #'root://eostotem.cern.ch//eos/totem/data/ctpps/run290874.root'
+
+    # 900GeV test, 8 May 2018
+    '/store/data/Run2018A/Totem1/RAW/v1/000/315/956/00000/B2AB3BFA-8D53-E811-ACFA-FA163E63AE40.root'
   ),
   inputCommands = cms.untracked.vstring(
     'drop *',
@@ -41,11 +45,14 @@
   input = cms.untracked.int32(8000)
 )
 
+# global tag - conditions for P5 cluster
+process.load("DQM.Integration.config.FrontierCondition_GT_cfi")
+
 # raw-to-digi conversion
 process.load("EventFilter.CTPPSRawToDigi.ctppsRawToDigi_cff")
 
 # local RP reconstruction chain with standard settings
-process.load("RecoCTPPS.Configuration.recoCTPPS_cff")
+process.load("RecoCTPPS.Configuration.recoCTPPS_DD_cff")
 
 # CTPPS DQM modules
 process.load("DQM.CTPPS.ctppsDQM_cff")

diff --git a/DQM/Integration/python/clients/ctpps_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/ctpps_dqm_sourceclient-live_cfg.py
@@ -1,6 +1,7 @@
 import FWCore.ParameterSet.Config as cms
+from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process("DQM")
+process = cms.Process('CTPPSDQM', eras.Run2_2018)
 
 test = False