[HGCAL] EDAnalyzer for TICL tracksters validation

RecoHGCal/TICL/plugins/HGCDoublet.cc

@@ -110,9 +110,10 @@ int HGCDoublet::areAligned(double xi,
   auto minCosPointing_sq = minCosPointing * minCosPointing;
   bool isWithinLimitsPointing = (dot_pointing_sq > minCosPointing_sq * mag_pointing_sq * mag2sq);
   if (debug) {
-    LogDebug("HGCDoublet") << "-- Are Aligned -- dot_pointing_sq: " << dot_pointing * dot_pointing
+    LogDebug("HGCDoublet") << "Pointing direction: " << pointingDir << std::endl;
+    LogDebug("HGCDoublet") << "-- Are Aligned -- dot_pointing_sq: " << dot_pointing_sq
                            << " mag_pointing_sq: " << mag_pointing_sq << " mag2sq: " << mag2sq
-                           << " isWithinLimits: " << isWithinLimitsPointing << std::endl;
+                           << " isWithinLimitsPointing: " << isWithinLimitsPointing << std::endl;
   }
   // by squaring cosTheta and multiplying by the squares of the magnitudes
   // an equivalent comparison is made without the division and square root which are costly FP ops.

Validation/Configuration/python/hgcalSimValid_cff.py

@@ -17,6 +17,9 @@
 from Validation.HGCalValidation.ticlPFValidation_cfi import ticlPFValidation
 hgcalTiclPFValidation = cms.Sequence(ticlPFValidation)
 
+from Validation.HGCalValidation.ticlTrackstersEdgesValidation_cfi import ticlTrackstersEdgesValidation
+hgcalTiclTrackstersEdgesValidationSequence = cms.Sequence(ticlTrackstersEdgesValidation)
+
 hgcalValidatorSequence = cms.Sequence(hgcalValidator)
 hgcalPFJetValidation = _hgcalPFJetValidation.clone(BenchmarkLabel = 'PFJetValidation/HGCAlCompWithGenJet',
     VariablePtBins=[10., 30., 80., 120., 250., 600.],
@@ -38,6 +41,8 @@
                                + hgcalHitValidationSequence
                                + hgcalValidatorSequence
                                + hgcalTiclPFValidation
+                               #Currently commented out until trackster edges are saved
+#                               + hgcalTiclTrackstersEdgesValidationSequence
                                + hgcalPFJetValidation)
 
 _hfnose_hgcalAssociatorsTask = hgcalAssociators.copy()

Validation/HGCalValidation/interface/HGCalValidator.h

@@ -60,16 +60,17 @@ class HGCalValidator : public DQMGlobalEDAnalyzer<HGCalValidatorHistograms> {
                                 std::unordered_map<DetId, const HGCRecHit*> const&) const;
 
 protected:
+  edm::ESGetToken<CaloGeometry, CaloGeometryRecord> caloGeomToken_;
   edm::InputTag label_lcl;
   std::vector<edm::InputTag> label_mcl;
   edm::InputTag associator_;
   edm::InputTag associatorSim_;
   const bool SaveGeneralInfo_;
   const bool doCaloParticlePlots_;
   const bool doCaloParticleSelection_;
-  const bool dosimclustersPlots_;
-  const bool dolayerclustersPlots_;
-  const bool domulticlustersPlots_;
+  const bool doSimClustersPlots_;
+  const bool doLayerClustersPlots_;
+  const bool doMultiClustersPlots_;
   std::vector<edm::InputTag> label_clustersmask;
   const edm::FileInPath cummatbudinxo_;
 

Validation/HGCalValidation/interface/HGVHistoProducerAlgo.h

@@ -149,6 +149,7 @@ struct HGVHistoProducerAlgoHistograms {
   std::vector<dqm::reco::MonitorElement*> h_numMerge_multicl_phi;
   std::vector<dqm::reco::MonitorElement*> h_sharedenergy_multicl2caloparticle;
   std::vector<dqm::reco::MonitorElement*> h_sharedenergy_caloparticle2multicl;
+  std::vector<dqm::reco::MonitorElement*> h_sharedenergy_caloparticle2multicl_assoc;
   std::vector<dqm::reco::MonitorElement*> h_sharedenergy_multicl2caloparticle_vs_eta;
   std::vector<dqm::reco::MonitorElement*> h_sharedenergy_multicl2caloparticle_vs_phi;
   std::vector<dqm::reco::MonitorElement*> h_sharedenergy_caloparticle2multicl_vs_eta;

Validation/HGCalValidation/plugins/HGCalValidator.cc

@@ -9,16 +9,17 @@ using namespace std;
 using namespace edm;
 
 HGCalValidator::HGCalValidator(const edm::ParameterSet& pset)
-    : label_lcl(pset.getParameter<edm::InputTag>("label_lcl")),
+    : caloGeomToken_(esConsumes<CaloGeometry, CaloGeometryRecord>()),
+      label_lcl(pset.getParameter<edm::InputTag>("label_lcl")),
       label_mcl(pset.getParameter<std::vector<edm::InputTag>>("label_mcl")),
       associator_(pset.getUntrackedParameter<edm::InputTag>("associator")),
       associatorSim_(pset.getUntrackedParameter<edm::InputTag>("associatorSim")),
       SaveGeneralInfo_(pset.getUntrackedParameter<bool>("SaveGeneralInfo")),
       doCaloParticlePlots_(pset.getUntrackedParameter<bool>("doCaloParticlePlots")),
       doCaloParticleSelection_(pset.getUntrackedParameter<bool>("doCaloParticleSelection")),
-      dosimclustersPlots_(pset.getUntrackedParameter<bool>("dosimclustersPlots")),
-      dolayerclustersPlots_(pset.getUntrackedParameter<bool>("dolayerclustersPlots")),
-      domulticlustersPlots_(pset.getUntrackedParameter<bool>("domulticlustersPlots")),
+      doSimClustersPlots_(pset.getUntrackedParameter<bool>("doSimClustersPlots")),
+      doLayerClustersPlots_(pset.getUntrackedParameter<bool>("doLayerClustersPlots")),
+      doMultiClustersPlots_(pset.getUntrackedParameter<bool>("doMultiClustersPlots")),
       label_clustersmask(pset.getParameter<std::vector<edm::InputTag>>("LayerClustersInputMask")),
       cummatbudinxo_(pset.getParameter<edm::FileInPath>("cummatbudinxo")) {
   //In this way we can easily generalize to associations between other objects also.
@@ -115,7 +116,7 @@ void HGCalValidator::bookHistograms(DQMStore::IBooker& ibook,
   }
 
   //Booking histograms concerning with simclusters
-  if (dosimclustersPlots_) {
+  if (doSimClustersPlots_) {
     ibook.cd();
     ibook.setCurrentFolder(dirName_ + "simClusters/ClusterLevel");
     histoProducerAlgo_->bookSimClusterHistos(
@@ -149,7 +150,7 @@ void HGCalValidator::bookHistograms(DQMStore::IBooker& ibook,
   }    //if for simcluster plots
 
   //Booking histograms concerning with hgcal layer clusters
-  if (dolayerclustersPlots_) {
+  if (doLayerClustersPlots_) {
     ibook.cd();
     ibook.setCurrentFolder(dirName_ + "hgcalLayerClusters/ClusterLevel");
     histoProducerAlgo_->bookClusterHistos_ClusterLevel(ibook,
@@ -192,7 +193,7 @@ void HGCalValidator::bookHistograms(DQMStore::IBooker& ibook,
     ibook.setCurrentFolder(dirName);
 
     //Booking histograms concerning for hgcal multi clusters
-    if (domulticlustersPlots_) {
+    if (doMultiClustersPlots_) {
       histoProducerAlgo_->bookMultiClusterHistos(ibook, histograms.histoProducerAlgo, totallayers_to_monitor_);
     }
   }  //end of booking multiclusters loop
@@ -241,8 +242,7 @@ void HGCalValidator::dqmAnalyze(const edm::Event& event,
   event.getByToken(label_cp_effic, caloParticleHandle);
   std::vector<CaloParticle> const& caloParticles = *caloParticleHandle;
 
-  edm::ESHandle<CaloGeometry> geom;
-  setup.get<CaloGeometryRecord>().get(geom);
+  edm::ESHandle<CaloGeometry> geom = setup.getHandle(caloGeomToken_);
   tools_->setGeometry(*geom);
   histoProducerAlgo_->setRecHitTools(tools_);
 
@@ -310,7 +310,7 @@ void HGCalValidator::dqmAnalyze(const edm::Event& event,
   // ##############################################
   // fill simcluster histograms
   // ##############################################
-  if (dosimclustersPlots_) {
+  if (doSimClustersPlots_) {
     histoProducerAlgo_->fill_simcluster_histos(
         histograms.histoProducerAlgo, simclusters, totallayers_to_monitor_, thicknesses_to_monitor_);
 
@@ -347,7 +347,7 @@ void HGCalValidator::dqmAnalyze(const edm::Event& event,
   // fill layercluster histograms
   // ##############################################
   int w = 0;  //counter counting the number of sets of histograms
-  if (dolayerclustersPlots_) {
+  if (doLayerClustersPlots_) {
     histoProducerAlgo_->fill_generic_cluster_histos(histograms.histoProducerAlgo,
                                                     w,
                                                     clusterHandle,
@@ -377,7 +377,7 @@ void HGCalValidator::dqmAnalyze(const edm::Event& event,
   // fill multicluster histograms
   // ##############################################
   for (unsigned int wml = 0; wml < label_mclTokens.size(); wml++) {
-    if (domulticlustersPlots_) {
+    if (doMultiClustersPlots_) {
       edm::Handle<std::vector<reco::HGCalMultiCluster>> multiClusterHandle;
       event.getByToken(label_mclTokens[wml], multiClusterHandle);
       const std::vector<reco::HGCalMultiCluster>& multiClusters = *multiClusterHandle;