Merge pull request #24142 from popovvp/cas_dqm102x

castor dqm update
cms-sw · Aug 28, 2018 · 4336c71 · 4336c71
2 parents 6d16e38 + 507d5dc
commit 4336c71
Show file tree

Hide file tree

Showing 11 changed files with 974 additions and 959 deletions.
diff --git a/DQM/CastorMonitor/interface/CastorBaseMonitor.h b/DQM/CastorMonitor/interface/CastorBaseMonitor.h
diff --git a/DQM/CastorMonitor/interface/CastorDigiMonitor.h b/DQM/CastorMonitor/interface/CastorDigiMonitor.h
@@ -12,6 +12,11 @@
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
+#include "DataFormats/Common/interface/TriggerResults.h"
+#include "FWCore/Common/interface/TriggerNames.h"
+
+//#include "FWCore/Framework/interface/Run.h"
+
 
 class CastorDigiMonitor {
 
@@ -20,14 +25,22 @@ class CastorDigiMonitor {
   ~CastorDigiMonitor(); 
 
  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &);
- void processEvent(const CastorDigiCollection& cast,const CastorDbService& cond);
+ void processEvent(edm::Event const& event, const CastorDigiCollection& cast, 
+       const edm::TriggerResults& trig, const CastorDbService& cond);
+ void endRun();
+ void getDbData(const edm::EventSetup& iSetup);
  int ModSecToIndex(int module, int sector);
+ void fillTrigRes(edm::Event const& event,const edm::TriggerResults& TrigResults,
+	 double Etot);
+
 private:
   std::string subsystemname_;
   int fVerbosity;
   int ievt_;
   float Qrms_DEAD;
 
+  MonitorElement *hBX, *hpBXtrig;
+  MonitorElement* hpTrigRes;
   MonitorElement* h2QrmsTSvsCh;
   MonitorElement* hQIErms[10];
   MonitorElement* hTSratio;
@@ -37,13 +50,13 @@ class CastorDigiMonitor {
   MonitorElement* h2repsum;
   MonitorElement* h2qualityMap;
   MonitorElement* hReport;
-  MonitorElement* h2QtsvsCh;
   MonitorElement *h2QmeantsvsCh;
   MonitorElement *h2QmeanMap;
   MonitorElement *hModule;
   MonitorElement *hSector;
   MonitorElement* hdigisize;
-//  MonitorElement* hBunchOcc;
+  MonitorElement *h2towEMvsHAD;
+  MonitorElement *htowE;
 
   int TS_MAX = 10;
   float RatioThresh1 = 0.;

diff --git a/DQM/CastorMonitor/interface/CastorMonitorModule.h b/DQM/CastorMonitor/interface/CastorMonitorModule.h
@@ -10,6 +10,11 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
+#include "DataFormats/L1TGlobal/interface/GlobalAlgBlk.h"
+#include "DataFormats/L1TGlobal/interface/GlobalExtBlk.h"
+#include "DataFormats/L1Trigger/interface/BXVector.h"
+#include "L1Trigger/L1TGlobal/interface/L1TGlobalUtil.h"
+
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
@@ -29,10 +34,6 @@
 #include "FWCore/Utilities/interface/EDGetToken.h"
 #include "DataFormats/Provenance/interface/EventID.h"  
 
-#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetup.h"
-#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h"
-#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetupFwd.h"
-
 #include "DataFormats/Common/interface/TriggerResults.h"
 #include "FWCore/Common/interface/TriggerNames.h"
 
@@ -83,7 +84,11 @@ class CastorMonitorModule : public DQMEDAnalyzer{
   void dqmBeginRun(const edm::Run &, const edm::EventSetup &) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
+  void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, 
+                            const edm::EventSetup& eventSetup) override;
 
+  void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, 
+                          const edm::EventSetup& eventSetup) override;
 
   void endRun(const edm::Run& run, const edm::EventSetup& eventSetup) override;
 
@@ -93,9 +98,12 @@ class CastorMonitorModule : public DQMEDAnalyzer{
   bool rawOK_,reportOK_,digiOK_,rechitOK_ ;
   int irun_,ilumisec_,ievent_,ibunch_;
   std::string subsystemname_;
-  int NBunchesOrbit;
+//  int NBunchesOrbit;
   int ievt_;
+//  edm::EDGetTokenT<GlobalAlgBlkBxCollection> l1tStage2uGtSource_;//for L1 uGT DAQ readout record
+//  edm::EDGetTokenT<GlobalAlgBlkBxCollection> TokenL1TStage2uGtSource;
 
+  edm::EDGetTokenT<edm::TriggerResults> tokenTriggerResults;
   edm::EDGetTokenT<FEDRawDataCollection> inputTokenRaw_;
   edm::EDGetTokenT<HcalUnpackerReport> inputTokenReport_;
   edm::EDGetTokenT<CastorDigiCollection> inputTokenDigi_;
@@ -105,10 +113,14 @@ class CastorMonitorModule : public DQMEDAnalyzer{
    typedef std::vector<reco::BasicJet> BasicJetCollection;
   edm::EDGetTokenT<BasicJetCollection> JetAlgorithm;
 
+//  std::shared_ptr<l1t::L1TGlobalUtil> gtUtil_;
+
   CastorRecHitMonitor*      RecHitMon_;
   CastorDigiMonitor*        DigiMon_;
   CastorLEDMonitor*         LedMon_;
 
+//  MonitorElement* algoBits_before_bxmask_bx_inEvt;
+//  MonitorElement* algoBits_before_bxmask_bx_global;
   MonitorElement* CastorEventProduct;
   MonitorElement* hunpkrep;