add cluster counting split in BPix and FPix

HLTrigger/special/plugins/HLTPixelActivityFilter.cc

@@ -25,6 +25,10 @@ class HLTPixelActivityFilter : public HLTFilter {
   edm::InputTag inputTag_;          // input tag identifying product containing pixel clusters
   unsigned int  min_clusters_;      // minimum number of clusters
   unsigned int  max_clusters_;      // maximum number of clusters
+  unsigned int  min_clustersBPix_;      // minimum number of clusters
+  unsigned int  max_clustersBPix_;      // maximum number of clusters
+  unsigned int  min_clustersFPix_;      // minimum number of clusters
+  unsigned int  max_clustersFPix_;      // maximum number of clusters
   unsigned int  min_layersBPix_;      // minimum number of clusters
   unsigned int  max_layersBPix_;      // maximum number of clusters
   unsigned int  min_layersFPix_;      // minimum number of clusters
@@ -47,6 +51,10 @@ HLTPixelActivityFilter::HLTPixelActivityFilter(const edm::ParameterSet& config)
   inputTag_     (config.getParameter<edm::InputTag>("inputTag")),
   min_clusters_ (config.getParameter<unsigned int>("minClusters")),
   max_clusters_ (config.getParameter<unsigned int>("maxClusters")),
+  min_clustersBPix_ (config.getParameter<unsigned int>("minClustersBPix")),
+  max_clustersBPix_ (config.getParameter<unsigned int>("maxClustersBPix")),
+  min_clustersFPix_ (config.getParameter<unsigned int>("minClustersFPix")),
+  max_clustersFPix_ (config.getParameter<unsigned int>("maxClustersFPix")),
   min_layersBPix_ (config.getParameter<unsigned int>("minLayersBPix")),
   max_layersBPix_ (config.getParameter<unsigned int>("maxLayersBPix")),
   min_layersFPix_ (config.getParameter<unsigned int>("minLayersFPix")),
@@ -78,6 +86,10 @@ HLTPixelActivityFilter::fillDescriptions(edm::ConfigurationDescriptions& descrip
   desc.add<edm::InputTag>("inputTag",edm::InputTag("hltSiPixelClusters"));
   desc.add<unsigned int>("minClusters",3);
   desc.add<unsigned int>("maxClusters",0);
+  desc.add<unsigned int>("minClustersBPix",0);
+  desc.add<unsigned int>("maxClustersBPix",0);
+  desc.add<unsigned int>("minClustersFPix",0);
+  desc.add<unsigned int>("maxClustersFPix",0);
   desc.add<unsigned int>("minLayersBPix",0);
   desc.add<unsigned int>("maxLayersBPix",0);
   desc.add<unsigned int>("minLayersFPix",0);
@@ -108,14 +120,15 @@ bool HLTPixelActivityFilter::hltFilter(edm::Event& event, const edm::EventSetup&
   bool accept = (clusterSize >= min_clusters_);
   if(max_clusters_ > 0)
     accept &= (clusterSize <= max_clusters_);
-
-  if (min_layersBPix_ > 0 || max_layersBPix_ > 0 || min_layersFPix_ > 0 || max_layersFPix_ > 0){
+  if (min_layersBPix_ > 0 || max_layersBPix_ > 0 || min_layersFPix_ > 0 || max_layersFPix_ > 0 || min_clustersBPix_ > 0 || max_clustersBPix_ > 0 || min_clustersFPix_ > 0 || max_clustersFPix_ > 0){
 
 	  edm::ESHandle<TrackerTopology> tTopoHandle;
 	  iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
 	  const TrackerTopology& tTopo = *tTopoHandle;
 	  unsigned int layerCountBPix = 0;
 	  unsigned int layerCountFPix = 0;
+	  unsigned int clusterCountBPix = 0;
+	  unsigned int clusterCountFPix = 0;
 	  const edmNew::DetSetVector<SiPixelCluster>& clusters = *clusterColl;
 
 	  edmNew::DetSetVector<SiPixelCluster>::const_iterator DSViter=clusters.begin();
@@ -131,8 +144,10 @@ bool HLTPixelActivityFilter::hltFilter(edm::Event& event, const edm::EventSetup&
 		const auto subdet = detIdObject.subdetId();
 		if (subdet == PixelSubdetector::PixelBarrel){
 			if(!(std::find(foundLayersB.begin(), foundLayersB.end(), tTopo.layer(detIdObject)) != foundLayersB.end()) && nCluster > 0) foundLayersB.push_back(tTopo.layer(detIdObject));
+			clusterCountBPix += nCluster;
 		}
 		else if (subdet ==PixelSubdetector::PixelEndcap){
+			clusterCountFPix += nCluster;
 			if (tTopo.side(detIdObject) == 2){
 				if(!(std::find(foundLayersEp.begin(), foundLayersEp.end(), tTopo.layer(detIdObject)) != foundLayersEp.end()) && nCluster > 0) foundLayersEp.push_back(tTopo.layer(detIdObject));
 			}
@@ -148,7 +163,10 @@ bool HLTPixelActivityFilter::hltFilter(edm::Event& event, const edm::EventSetup&
 	  if (min_layersBPix_ > 0) accept &= (layerCountBPix >= min_layersBPix_);
 	  if (max_layersFPix_ > 0) accept &= (layerCountFPix <= max_layersFPix_);
 	  if (min_layersFPix_ > 0) accept &= (layerCountFPix >= min_layersFPix_);
-
+	  if (min_clustersBPix_ > 0) accept &= (clusterCountBPix >= min_clustersBPix_);
+	  if (max_clustersBPix_ > 0) accept &= (clusterCountBPix <= max_clustersBPix_);
+	  if (min_clustersFPix_ > 0) accept &= (clusterCountFPix >= min_clustersFPix_);
+	  if (max_clustersFPix_ > 0) accept &= (clusterCountFPix <= max_clustersFPix_);
 
   }
   // return with final filter decision