Merge pull request #33271 from ebrondol/hgcal_smallfixes

Small fixes on HGCAL Validation code
cms-sw · Mar 29, 2021 · 172badc · 172badc
2 parents 393780c + 12bf8d6
commit 172badc
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 21 deletions.
diff --git a/Validation/HGCalValidation/plugins/HGCalValidator.cc b/Validation/HGCalValidation/plugins/HGCalValidator.cc
@@ -56,10 +56,10 @@ HGCalValidator::HGCalValidator(const edm::ParameterSet& pset)
                                     pset.getParameter<double>("ptMaxCP"),
                                     pset.getParameter<double>("minRapidityCP"),
                                     pset.getParameter<double>("maxRapidityCP"),
+                                    pset.getParameter<double>("lipCP"),
+                                    pset.getParameter<double>("tipCP"),
                                     pset.getParameter<int>("minHitCP"),
                                     pset.getParameter<int>("maxSimClustersCP"),
-                                    pset.getParameter<double>("tipCP"),
-                                    pset.getParameter<double>("lipCP"),
                                     pset.getParameter<bool>("signalOnlyCP"),
                                     pset.getParameter<bool>("intimeOnlyCP"),
                                     pset.getParameter<bool>("chargedOnlyCP"),

diff --git a/Validation/HGCalValidation/python/CaloParticleSelectionForEfficiency_cfi.py b/Validation/HGCalValidation/python/CaloParticleSelectionForEfficiency_cfi.py
@@ -11,7 +11,8 @@
     tipCP = cms.double(60),
     chargedOnlyCP = cms.bool(False),
     stableOnlyCP = cms.bool(False),
-    pdgIdCP = cms.vint32(11, -11, 13, -13, 22, 111, 211, -211, 321, -321, 311),
+    #311: K0, 130: K0_short, 310: K0_long
+    pdgIdCP = cms.vint32(11, -11, 13, -13, 22, 111, 211, -211, 321, -321, 311, 130, 310),
     #--signal only means no PU particles
     signalOnlyCP = cms.bool(True),
     #--intime only means no OOT PU particles

diff --git a/Validation/HGCalValidation/python/HGCalValidator_cfi.py b/Validation/HGCalValidation/python/HGCalValidator_cfi.py
@@ -19,6 +19,7 @@
     label_lcl = layerClusterCaloParticleAssociation.label_lc,
     label_mcl = cms.VInputTag(
       cms.InputTag("ticlMultiClustersFromTrackstersTrk"),
+      cms.InputTag("ticlMultiClustersFromTrackstersTrkEM"),
       cms.InputTag("ticlMultiClustersFromTrackstersEM"),
       cms.InputTag("ticlMultiClustersFromTrackstersHAD"),
       cms.InputTag("ticlMultiClustersFromTrackstersMerge")),

diff --git a/Validation/HGCalValidation/python/PostProcessorHGCAL_cfi.py b/Validation/HGCalValidation/python/PostProcessorHGCAL_cfi.py
@@ -57,18 +57,16 @@
 eff_multiclusters.extend(["merge_eta 'MultiCluster Merge Rate vs #eta' NumMerge_MultiCluster_Eta Denom_MultiCluster_Eta"])
 eff_multiclusters.extend(["merge_phi 'MultiCluster Merge Rate vs #phi' NumMerge_MultiCluster_Phi Denom_MultiCluster_Phi"])
 
-postProcessorHGCALmulticlusters = DQMEDHarvester('DQMGenericClient',
-subDirs = cms.untracked.vstring(
-  'HGCAL/HGCalValidator/hgcalMultiClusters/',
-  'HGCAL/HGCalValidator/ticlMultiClustersFromTrackstersTrk/',
-  'HGCAL/HGCalValidator/ticlMultiClustersFromTrackstersEM/',
-  'HGCAL/HGCalValidator/ticlMultiClustersFromTrackstersHAD/',
-  'HGCAL/HGCalValidator/ticlMultiClustersFromTrackstersMerge/',
-  ),
+subdirs = ['HGCAL/HGCalValidator/hgcalMultiClusters/']
+iterations = ['TrkEM','EM','Trk','HAD','Merge']
+subdirs.extend('HGCAL/HGCalValidator/ticlMultiClustersFromTracksters'+iteration+'/' for iteration in iterations)
 
-efficiency = cms.vstring(eff_multiclusters),
-resolution = cms.vstring(),
-cumulativeDists = cms.untracked.vstring(),
-noFlowDists = cms.untracked.vstring(),
-outputFileName = cms.untracked.string(""),
-verbose = cms.untracked.uint32(4))
+postProcessorHGCALmulticlusters = DQMEDHarvester('DQMGenericClient',
+  subDirs = cms.untracked.vstring(subdirs),
+  efficiency = cms.vstring(eff_multiclusters),
+  resolution = cms.vstring(),
+  cumulativeDists = cms.untracked.vstring(),
+  noFlowDists = cms.untracked.vstring(),
+  outputFileName = cms.untracked.string(""),
+  verbose = cms.untracked.uint32(4)
+)
diff --git a/Validation/HGCalValidation/scripts/makeHGCalValidationPlots.py b/Validation/HGCalValidation/scripts/makeHGCalValidationPlots.py
@@ -78,6 +78,7 @@ def main(opts):
         particletypes = {"pion-":"-211", "pion+":"211", "pion0": "111",
                          "muon-": "-13", "muon+":"13", 
                          "electron-": "-11", "electron+": "11", "photon": "22", 
+                         "kaon0L": "310", "kaon0S": "130",
                          "kaon-": "-321", "kaon+": "321"}
         hgcaloPart = [hgcalPlots.hgcalCaloParticlesPlotter]
         for i_part, i_partID in particletypes.iteritems() :
@@ -99,6 +100,7 @@ def main(opts):
         particletypes = {"pion-":"-211", "pion+":"211", "pion0": "111",
                          "muon-": "-13", "muon+":"13", 
                          "electron-": "-11", "electron+": "11", "photon": "22", 
+                         "kaon0L": "310", "kaon0S": "130",
                          "kaon-": "-321", "kaon+": "321"}
         hgcaloPart = [hgcalPlots.hgcalCaloParticlesPlotter]
         for i_part, i_partID in particletypes.iteritems() :

diff --git a/Validation/HGCalValidation/src/HGVHistoProducerAlgo.cc b/Validation/HGCalValidation/src/HGVHistoProducerAlgo.cc
@@ -17,7 +17,7 @@ const double ScoreCutCPtoLC_ = 0.1;
 const double ScoreCutLCtoSC_ = 0.1;
 const double ScoreCutSCtoLC_ = 0.1;
 const double ScoreCutMCLtoCPFakeMerge_ = 0.6;
-const double ScoreCutCPtoMCLDup_ = 0.2;
+const double ScoreCutCPtoMCLEffDup_ = 0.2;
 
 HGVHistoProducerAlgo::HGVHistoProducerAlgo(const edm::ParameterSet& pset)
     :  //parameters for eta
@@ -2803,7 +2803,7 @@ void HGVHistoProducerAlgo::multiClusters_to_CaloParticles(const Histograms& hist
                                                                      mclsharedenergyfrac[cpId][mclId]);
     }  //end of loop through multiclusters
 
-    auto is_assoc = [&](const auto& v) -> bool { return v < ScoreCutCPtoMCLDup_; };
+    auto is_assoc = [&](const auto& v) -> bool { return v < ScoreCutCPtoMCLEffDup_; };
 
     auto assocDup = std::count_if(std::begin(score3d[cpId]), std::end(score3d[cpId]), is_assoc);
 

diff --git a/Validation/RecoTrack/python/plotting/plotting.py b/Validation/RecoTrack/python/plotting/plotting.py
@@ -1182,8 +1182,8 @@ def create(self, tdirectory):
 
 
 # Plot styles
-_plotStylesColor = [4, 2, ROOT.kBlack, ROOT.kOrange+7, ROOT.kMagenta-3]
-_plotStylesMarker = [21, 20, 22, 34, 33]
+_plotStylesColor = [4, 2, ROOT.kBlack, ROOT.kOrange+7, ROOT.kMagenta-3, ROOT.kGreen+2]
+_plotStylesMarker = [21, 20, 22, 34, 33, 23]
 
 def _drawFrame(pad, bounds, zmax=None, xbinlabels=None, xbinlabelsize=None, xbinlabeloption=None, ybinlabels=None, suffix=""):
     """Function to draw a frame