Make DetSetNew to support concurrent filler

DQM/BeamMonitor/plugins/Vx3DHLTAnalyzer.h

@@ -97,11 +97,12 @@ class Vx3DHLTAnalyzer : public DQMEDAnalyzer
   double yStep;
   double zRange;
   double zStep;
+  double VxErrCorr; // Coefficient to compensate the under-estimation of the vertex errors
   double minVxDoF;
   double minVxWgt;
   std::string fileName;
-  
-  
+
+
   // ##############
   // # Histograms #
   // ##############
@@ -160,18 +161,13 @@ class Vx3DHLTAnalyzer : public DQMEDAnalyzer
   unsigned int nParams;
   bool internalDebug;
 
-  // previously: static/global variables
   std::vector<VertexType> Vertices;
   bool considerVxCovariance;
   unsigned int counterVx; // Counts the number of vertices taken into account for the fit
   double maxTransRadius;  // Max transverse radius in which the vertices must be [cm]
   double maxLongLength;   // Max longitudinal length in which the vertices must be [cm]
   double xPos,yPos,zPos;  // x,y,z approximate positions of the beam spot
   double pi;
-  // ######################
-  // # cfg file parameter #
-  // ######################
-  double VxErrCorr;       // Coefficient to compensate the under-estimation of the vertex errors
 };
 
 #endif

DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py

@@ -103,7 +103,7 @@
                                             yStep              = cms.double(0.001),
                                             zRange             = cms.double(30.0),
                                             zStep              = cms.double(0.04),
-                                            VxErrCorr          = cms.double(1.3), # Keep checking this with later release
+                                            VxErrCorr          = cms.double(1.2), # Keep checking this with later release
                                             minVxDoF           = cms.double(10.0),
                                             minVxWgt           = cms.double(0.5),
                                             fileName           = cms.string("/nfshome0/dqmdev/BeamMonitorDQM/BeamPixelResults.txt"))
@@ -180,8 +180,8 @@
     # pixelVertexDQM Config
     #----------------------------
     process.pixelVertexDQM = cms.EDAnalyzer("Vx3DHLTAnalyzer",
-                                            vertexCollection   = cms.untracked.InputTag("hiSelectedVertex"),
-                                            pixelHitCollection = cms.untracked.InputTag("siPixelRecHits"),
+                                            vertexCollection   = cms.untracked.InputTag("hiSelectedVertexPreSplitting"),
+                                            pixelHitCollection = cms.untracked.InputTag("siPixelRecHitsPreSplitting"),
                                             debugMode          = cms.bool(True),
                                             nLumiFit           = cms.uint32(5),
                                             maxLumiIntegration = cms.uint32(15),
@@ -197,7 +197,7 @@
                                             yStep              = cms.double(0.001),
                                             zRange             = cms.double(30.0),
                                             zStep              = cms.double(0.04),
-                                            VxErrCorr          = cms.double(1.3), # Keep checking this with later release
+                                            VxErrCorr          = cms.double(1.2), # Keep checking this with later release
                                             minVxDoF           = cms.double(10.0),
                                             minVxWgt           = cms.double(0.5),
                                             fileName           = cms.string("/nfshome0/dqmdev/BeamMonitorDQM/BeamPixelResults.txt"))
@@ -208,14 +208,36 @@
     print "[beampixel_dqm_sourceclient-live_cfg]::saving DIP file into " + str(process.pixelVertexDQM.fileName)
 
 
+    #----------------------------
+    # Pixel-Tracks&Vertices Config
+    #----------------------------
+    from RecoHI.HiTracking.HIPixelVerticesPreSplitting_cff import *
+
+    process.PixelLayerTriplets.BPix.HitProducer = cms.string("siPixelRecHitsPreSplitting")
+    process.PixelLayerTriplets.FPix.HitProducer = cms.string("siPixelRecHitsPreSplitting")
+
+    process.hiPixel3PrimTracks.FilterPSet.VertexCollection     = cms.InputTag("hiSelectedVertexPreSplitting")
+    process.hiPixel3PrimTracks.FilterPSet.clusterShapeCacheSrc = cms.InputTag("siPixelClusterShapeCachePreSplitting")
+
+    process.hiPixel3PrimTracks.RegionFactoryPSet.ComponentName               = cms.string('GlobalTrackingRegionWithVerticesProducer')
+    process.hiPixel3PrimTracks.RegionFactoryPSet.RegionPSet.VertexCollection = cms.InputTag("hiSelectedVertexPreSplitting")
+    process.hiPixel3PrimTracks.RegionFactoryPSet.RegionPSet.ptMin            = cms.double(0.9)
+
+    process.hiPixel3PrimTracks.OrderedHitsFactoryPSet.GeneratorPSet.SeedComparitorPSet.clusterShapeCacheSrc = cms.InputTag('siPixelClusterShapeCachePreSplitting')
+
+    process.hiPixel3ProtoTracksPreSplitting.RegionFactoryPSet.RegionPSet.originRadius = 0.4
+    process.hiPixelAdaptiveVertexPreSplitting.vertexCollections.useBeamConstraint     = False
+
+
     #----------------------------
     # Pixel-Tracks&Vertices Reco
     #----------------------------
     process.reconstructionStep = cms.Sequence(process.siPixelDigis*
                                               process.offlineBeamSpot*
-                                              process.siPixelClusters*
-                                              process.siPixelRecHits*
-                                              process.hiPixelVertices*
+                                              process.pixeltrackerlocalreco*
+                                              process.siPixelClusterShapeCachePreSplitting*
+                                              process.hiPixelVerticesPreSplitting*
+                                              process.PixelLayerTriplets*
                                               process.hiPixel3PrimTracks)
 
 

DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualSource.cc

@@ -874,26 +874,26 @@ void SiPixelTrackResidualSource::analyze(const edm::Event& iEvent, const edm::Ev
   edm::Handle<std::vector<Trajectory> > trajCollectionHandle;
   //iEvent.getByLabel(tracksrc_,trajCollectionHandle);
   iEvent.getByToken ( tracksrcToken_, trajCollectionHandle );
-  const std::vector<Trajectory> trajColl = *(trajCollectionHandle.product());
+  auto const & trajColl = *(trajCollectionHandle.product());
 
   //get tracks
   edm::Handle<std::vector<reco::Track> > trackCollectionHandle;
   //iEvent.getByLabel(tracksrc_,trackCollectionHandle);
   iEvent.getByToken( trackToken_, trackCollectionHandle );
 
-  const std::vector<reco::Track> trackColl = *(trackCollectionHandle.product());
+  auto const & trackColl = *(trackCollectionHandle.product());
 
   //get the map
   edm::Handle<TrajTrackAssociationCollection> match;
   //iEvent.getByLabel(tracksrc_,match);
   iEvent.getByToken( trackAssociationToken_, match);
-  const TrajTrackAssociationCollection ttac = *(match.product());
+  auto const &  ttac = *(match.product());
 
   // get clusters
   edm::Handle< edmNew::DetSetVector<SiPixelCluster> >  clusterColl;
   //iEvent.getByLabel( clustersrc_, clusterColl );
   iEvent.getByToken( clustersrcToken_, clusterColl );
-  const edmNew::DetSetVector<SiPixelCluster> clustColl = *(clusterColl.product());
+  auto const & clustColl = *(clusterColl.product());
 
   if(debug_){
     std::cout << "Trajectories\t : " << trajColl.size() << std::endl;

DQMOffline/Trigger/BuildFile.xml

@@ -15,6 +15,7 @@
 <use   name="DataFormats/METReco"/>
 <use   name="DataFormats/JetReco"/>
 <use   name="DataFormats/CaloTowers"/>
+<use   name="DataFormats/HeavyIonEvent"/>
 <use   name="CommonTools/Utils"/>
 <use   name="RecoEcal/EgammaCoreTools"/>
 <use   name="RecoEgamma/EgammaHLTAlgos"/>

DQMOffline/Trigger/interface/EventShapeDQM.h

@@ -0,0 +1,45 @@
+#ifndef EventShapeDQM_H
+#define EventShapeDQM_H
+//event
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+
+//DQM
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
+
+//EP
+#include "DataFormats/HeavyIonEvent/interface/EvtPlane.h"
+
+// Trigger
+#include "DataFormats/Common/interface/TriggerResults.h"
+#include "DataFormats/HLTReco/interface/TriggerObject.h"
+#include "DataFormats/HLTReco/interface/TriggerEvent.h"
+#include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
+#include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
+#include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
+
+class EventShapeDQM: public DQMEDAnalyzer{
+public:
+	EventShapeDQM(const edm::ParameterSet& ps);
+	virtual ~EventShapeDQM();
+
+protected:
+	void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+	void analyze(edm::Event const& e, edm::EventSetup const& eSetup);
+
+private:
+	edm::EDGetTokenT<edm::TriggerResults> triggerResults_;
+	edm::EDGetTokenT<reco::EvtPlaneCollection> theEPCollection_;
+
+	std::string triggerPath_;
+	int order_;
+	int EPidx_;
+	int EPlvl_;
+
+	// histo
+	MonitorElement* h_Q;
+};
+
+#endif

DQMOffline/Trigger/interface/HeavyIonUCCDQM.h

@@ -0,0 +1,54 @@
+#ifndef HeavyIonUCCDQM_H
+#define HeavyIonUCCDQM_H
+//event
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+
+//DQM
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
+
+//CaloMET
+#include "DataFormats/METReco/interface/CaloMET.h"
+#include "DataFormats/METReco/interface/CaloMETCollection.h"
+//SiPixelClusters
+#include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h"
+
+// Trigger
+#include "DataFormats/Common/interface/TriggerResults.h"
+#include "DataFormats/HLTReco/interface/TriggerObject.h"
+#include "DataFormats/HLTReco/interface/TriggerEvent.h"
+#include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
+#include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
+#include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
+
+class HeavyIonUCCDQM: public DQMEDAnalyzer{
+public:
+	HeavyIonUCCDQM(const edm::ParameterSet& ps);
+	virtual ~HeavyIonUCCDQM();
+
+protected:
+	void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+	void analyze(edm::Event const& e, edm::EventSetup const& eSetup);
+
+private:
+	edm::EDGetTokenT<edm::TriggerResults> triggerResults_;
+	edm::EDGetTokenT<reco::CaloMETCollection> theCaloMet;
+	edm::EDGetTokenT<edmNew::DetSetVector<SiPixelCluster> > theSiPixelCluster;
+
+	std::string triggerPath_;
+
+	int nClusters;
+	int minClusters;
+	int maxClusters;
+	int nEt;
+	double minEt;
+	double maxEt;
+
+	// histo
+	MonitorElement* h_SumEt;
+	MonitorElement* h_SiPixelClusters;
+};
+
+#endif

DQMOffline/Trigger/python/DQMOffline_Trigger_cff.py

@@ -36,6 +36,12 @@
 #hotline 
 from DQMOffline.Trigger.hotlineDQM_cfi import *
 
+#eventshape
+from DQMOffline.Trigger.eventshapeDQM_cfi import *
+
+#UCC
+from DQMOffline.Trigger.heavyionUCCDQM_cfi import *
+
 import DQMServices.Components.DQMEnvironment_cfi
 dqmEnvHLT= DQMServices.Components.DQMEnvironment_cfi.dqmEnv.clone()
 dqmEnvHLT.subSystemFolder = 'HLT'
@@ -55,6 +61,8 @@
     higPhotonJetHLTOfflineSource*
     dqmEnvHLT *
     topHLTriggerOfflineDQM *
+    eventshapeDQMSequence *
+    HeavyIonUCCDQMSequence *
     hotlineDQMSequence
     )
 

DQMOffline/Trigger/python/eventshapeDQM_cfi.py

@@ -0,0 +1,59 @@
+import FWCore.ParameterSet.Config as cms
+
+eventshapeDQM_Q2_top05_cent1030 = cms.EDAnalyzer('EventShapeDQM',
+        triggerResults = cms.InputTag('TriggerResults','','HLT'),
+        EPlabel = cms.InputTag("hltEvtPlaneProducer"),
+        triggerPath = cms.string('HLT_HIQ2Top005_Centrality1030_v'),
+        order = cms.int32(2),
+        EPidx = cms.int32(8), #HF2
+        EPlvl = cms.int32(0)
+)
+
+eventshapeDQM_Q2_bottom05_cent1030 = cms.EDAnalyzer('EventShapeDQM',
+        triggerResults = cms.InputTag('TriggerResults','','HLT'),
+        EPlabel = cms.InputTag("hltEvtPlaneProducer"),
+        triggerPath = cms.string('HLT_HIQ2Bottom005_Centrality1030_v'),
+        order = cms.int32(2),
+        EPidx = cms.int32(8), #HF2
+        EPlvl = cms.int32(0)
+)
+
+eventshapeDQM_Q2_top05_cent3050 = cms.EDAnalyzer('EventShapeDQM',
+        triggerResults = cms.InputTag('TriggerResults','','HLT'),
+        EPlabel = cms.InputTag("hltEvtPlaneProducer"),
+        triggerPath = cms.string('HLT_HIQ2Top005_Centrality3050_v'),
+        order = cms.int32(2),
+        EPidx = cms.int32(8), #HF2
+        EPlvl = cms.int32(0)
+)
+
+eventshapeDQM_Q2_bottom05_cent3050 = cms.EDAnalyzer('EventShapeDQM',
+        triggerResults = cms.InputTag('TriggerResults','','HLT'),
+        EPlabel = cms.InputTag("hltEvtPlaneProducer"),
+        triggerPath = cms.string('HLT_HIQ2Bottom005_Centrality3050_v'),
+        order = cms.int32(2),
+        EPidx = cms.int32(8), #HF2
+        EPlvl = cms.int32(0)
+)
+
+eventshapeDQM_Q2_top05_cent5070 = cms.EDAnalyzer('EventShapeDQM',
+        triggerResults = cms.InputTag('TriggerResults','','HLT'),
+        EPlabel = cms.InputTag("hltEvtPlaneProducer"),
+        triggerPath = cms.string('HLT_HIQ2Top005_Centrality5070_v'),
+        order = cms.int32(2),
+        EPidx = cms.int32(8), #HF2
+        EPlvl = cms.int32(0)
+)
+
+eventshapeDQM_Q2_bottom05_cent5070 = cms.EDAnalyzer('EventShapeDQM',
+        triggerResults = cms.InputTag('TriggerResults','','HLT'),
+        EPlabel = cms.InputTag("hltEvtPlaneProducer"),
+        triggerPath = cms.string('HLT_HIQ2Bottom005_Centrality5070_v'),
+        order = cms.int32(2),
+        EPidx = cms.int32(8), #HF2
+        EPlvl = cms.int32(0)
+)
+
+
+
+eventshapeDQMSequence = cms.Sequence(eventshapeDQM_Q2_top05_cent1030 * eventshapeDQM_Q2_bottom05_cent1030 * eventshapeDQM_Q2_top05_cent3050 * eventshapeDQM_Q2_bottom05_cent3050 * eventshapeDQM_Q2_top05_cent5070 * eventshapeDQM_Q2_bottom05_cent5070 )

DQMOffline/Trigger/python/heavyionUCCDQM_cfi.py

@@ -0,0 +1,31 @@
+import FWCore.ParameterSet.Config as cms
+
+heavyionUCCDQM_HIUCC100 = cms.EDAnalyzer('HeavyIonUCCDQM',
+        triggerResults = cms.InputTag('TriggerResults','','HLT'),
+        caloMet = cms.InputTag('hltMetForHf'),
+        pixelCluster = cms.InputTag('hltHISiPixelClusters'),
+        triggerPath = cms.string('HLT_HIUCC100_v'),
+        nClusters = cms.int32(100),
+        minClusters = cms.int32(50000),
+        maxClusters = cms.int32(100000),
+        nEt = cms.int32(100),
+        minEt = cms.double(4000),
+        maxEt = cms.double(8000)
+)
+
+heavyionUCCDQM_HIUCC020 = cms.EDAnalyzer('HeavyIonUCCDQM',
+        triggerResults = cms.InputTag('TriggerResults','','HLT'),
+        caloMet = cms.InputTag('hltMetForHf'),
+        pixelCluster = cms.InputTag('hltHISiPixelClusters'),
+        triggerPath = cms.string('HLT_HIUCC020_v'),
+        nClusters = cms.int32(100),
+        minClusters = cms.int32(50000),
+        maxClusters = cms.int32(100000),
+        nEt = cms.int32(100),
+        minEt = cms.double(4000),
+        maxEt = cms.double(8000)
+)
+
+
+
+HeavyIonUCCDQMSequence = cms.Sequence(heavyionUCCDQM_HIUCC100 * heavyionUCCDQM_HIUCC020)