Merge remote-tracking branch 'pepr/pepr_CMSSW_12_1_1' into pepr_CMSSW…

…_12_6_0_pre2
kdlong · Sep 28, 2022 · 9914851 · 9914851
2 parents 48a915d + 98357b8
commit 9914851
Show file tree

Hide file tree

Showing 25 changed files with 2,680 additions and 199 deletions.
diff --git a/DPGAnalysis/HGCalNanoAOD/python/hgcRecHits_cff.py b/DPGAnalysis/HGCalNanoAOD/python/hgcRecHits_cff.py
@@ -60,7 +60,8 @@
     objName = hgcRecHitsTable.name,
     branchName = cms.string("LayerCluster"),
     objMap = cms.InputTag("hgcRecHitsToLayerClusters:hgcRecHitsToLayerCluster"),
-    docString = cms.string("LayerCluster assigned largest RecHit fraction")
+    docString = cms.string("LayerCluster assigned largest RecHit fraction"),
+    bestMatchTable = cms.untracked.bool(True)
 )
 
 hgcRecHitsPositionTable = cms.EDProducer("HGCRecHitPositionTableProducer",
@@ -70,8 +71,8 @@
     doc  = hgcRecHitsTable.doc,
 )
 
-hgcRecHitsSequence = cms.Sequence(hgcRecHits
-				+hgcRecHitsTable
+hgcRecHitsSequence = cms.Sequence(
+				hgcRecHitsTable
                 +hgcRecHitsToPFCands
                 +hgcRecHitsToPFCandTable
                 +hgcRecHitsToPFTICLCands

diff --git a/DPGAnalysis/HGCalNanoAOD/python/layerClusters_cff.py b/DPGAnalysis/HGCalNanoAOD/python/layerClusters_cff.py
@@ -26,7 +26,8 @@
     objName = layerClusterTable.name,
     branchName = cms.string("SimCluster"),
     objMap = cms.InputTag("layerClusterCaloParticleAssociationProducer"),
-    docString = cms.string("Index of SimCluster matched to LayerCluster")
+    docString = cms.string("Index of SimCluster matched to LayerCluster"),
+    bestMatchTable = cms.untracked.bool(True)
 )
 
 layerClusterTables = cms.Sequence(layerClusterTable+layerClusterToSimClusterTable)

diff --git a/DPGAnalysis/HGCalNanoAOD/python/nanoHGCML_cff.py b/DPGAnalysis/HGCalNanoAOD/python/nanoHGCML_cff.py
@@ -27,9 +27,12 @@
     charge = CandVars.charge)
 
 nanoHGCMLSequence = cms.Sequence(nanoMetadata+
+                                 hgcRecHits+ #so that modules can use them
     genVertexTable+genVertexT0Table+genParticleTable+
     layerClusterTables+
-    simTrackTables+hgcSimHitsSequence+trackerSimHitTables+
+    simTrackTables+
+    hgcSimHitsSequence+
+    trackerSimHitTables+
     simClusterTables+
     trackingParticleTables+
     caloParticleTables

diff --git a/DPGAnalysis/HGCalNanoAOD/python/simClusters_cff.py b/DPGAnalysis/HGCalNanoAOD/python/simClusters_cff.py
@@ -40,6 +40,7 @@
     )
 )
 
+
 simClusterToCaloPart = cms.EDProducer("SimClusterToCaloParticleAssociationProducer",
     caloParticles = cms.InputTag("mix:MergedCaloTruth"),
     simClusters = cms.InputTag("mix:MergedCaloTruth"),
@@ -54,14 +55,29 @@
     docString = cms.string("Index of CaloPart containing SimCluster")
 )
 
-hgcSimTruth = cms.EDProducer("simmerger",
-    useNLayers = cms.int32(1),
+
+hgcSimTruth = cms.EDProducer("SimClusterMerger",#"simmerger","SimClusterMerger"
+
+    useNLayers = cms.int32(2),
     searchRadiusScale = cms.double(2.),
-    clusterRadiusScale = cms.double(1.5),
-    mergeRadiusScale = cms.double(1.5),
-    energyContainment = cms.double(0.5),
-    relOverlapDistance = cms.double(0.9)
-                           )
+    clusterRadiusScale = cms.double(1.),
+
+    mergeRadiusScale = cms.double(7.),#13 is about 10 layers in CE
+    energyContainment = cms.double(1.1),
+
+    smear = cms.double(-0.0),
+    highEfracThreshold = cms.double(0.85), 
+    connectThreshold = cms.double(.3),
+
+    relOverlapDistance = cms.double(.9),# dist/(merged radius + sensor radius)
+
+    simClusters= cms.InputTag("mix:MergedCaloTruth"),
+    simVertices= cms.InputTag("g4SimHits"),
+    simTracks= cms.InputTag("g4SimHits"),
+    caloRecHits = cms.InputTag("hgcRecHits")
+
+    #caloSimHits = cms.InputTag("g4SimHits")
+)
 
 hgcSimTruthDR = cms.EDProducer("HGCTruthProducer")
 

diff --git a/DPGAnalysis/PFNanoAOD/python/pfTruth_cff.py b/DPGAnalysis/PFNanoAOD/python/pfTruth_cff.py
@@ -1,19 +1,20 @@
 import FWCore.ParameterSet.Config as cms
 from PhysicsTools.NanoAOD.common_cff import CandVars,Var
-from DPGAnalysis.HGCalNanoAOD.simClusters_cff import mergedSimClusterTable
+from DPGAnalysis.HGCalNanoAOD.simClusters_cff import simClusterTable
 from DPGAnalysis.HGCalNanoAOD.hgcRecHits_cff import hgcRecHitsTable
 from DPGAnalysis.TrackNanoAOD.trackingParticles_cff import trackingParticleTable
 from DPGAnalysis.TrackNanoAOD.tracks_cff import generalTrackTable
 
+#nothing pre-merged here!
 pfTruthParticles = cms.EDProducer("PFTruthParticleProducer",
     trackingParticles= cms.InputTag("mix:MergedTrackTruth"),
-    caloParticles= cms.InputTag("mergedSCCaloParts"),
-    simClusters = cms.InputTag("hgcSimTruth"),
+    caloParticles= cms.InputTag("mix:MergedCaloTruth"),
+    simClusters = simClusterTable.src,
     simVertices= cms.InputTag("g4SimHits"),
     simTracks= cms.InputTag("g4SimHits"),
     caloRecHits = cms.InputTag("hgcRecHits"),
     tracks = generalTrackTable.src,
-    rechitToSimClusAssoc = cms.InputTag("hgcRecHitsToMergedSimClusters:hgcRecHitsToBestSimClus"), 
+    rechitToSimClusAssoc = cms.InputTag("hgcRecHitsToSimClusters:hgcRecHitsToBestSimClus"), 
     trackingPartToTrackAssoc = cms.InputTag("trackingParticleRecoTrackAsssociation"), 
 )
 
@@ -32,8 +33,8 @@
 
 simClusterToPFTruthTable = cms.EDProducer("SimClusterToPFTruthParticleIndexTableProducer",
     cut = cms.string(""),
-    src = mergedSimClusterTable.src,
-    objName = mergedSimClusterTable.name,
+    src = simClusterTable.src,
+    objName = simClusterTable.name,
     branchName = pfTruthTable.name,
     objMap = cms.InputTag("pfTruthParticles:simClusToPFTruth"),
     docString = cms.string("PFTruth particle to which the SimCluster is associated")

diff --git a/DPGAnalysis/TrackNanoAOD/python/tracks_cff.py b/DPGAnalysis/TrackNanoAOD/python/tracks_cff.py
@@ -9,10 +9,11 @@
     singleton = cms.bool(False), # the number of entries is variable
     extension = cms.bool(False), # this is the main table for the muons
     variables = cms.PSet(P3Vars,
+        p = Var("p", float, precision=14, doc="momentum"),
         charge = Var("charge", int, doc="electric charge"),
         normChiSq = Var("normalizedChi2", float, precision=14, doc="Chi^2/ndof"),
-        numberOfValidHits = Var('numberOfValidHits()', 'int', precision=-1, doc='Number of valid hits in track'),
-        numberOfLostHits = Var('numberOfLostHits()', 'int', precision=-1, doc='Number of lost hits in track'),
+        #numberOfValidHits = Var('numberOfValidHits()', 'int', precision=-1, doc='Number of valid hits in track'),
+        #numberOfLostHits = Var('numberOfLostHits()', 'int', precision=-1, doc='Number of lost hits in track'),
         Vtx_x = Var('vx()', 'float', precision=14, doc='parent vertex x pos'),
         Vtx_y = Var('vy()', 'float', precision=14, doc='parent vertex y pos'),
         Vtx_z = Var('vz()', 'float', precision=14, doc='parent vertex z pos'),
@@ -31,25 +32,30 @@
     cut = generalTrackTable.cut,
 )
 
+# conversions
+
 trackConversionsTable = generalTrackTable.clone()
 trackConversionsTable.src = "conversionStepTracks"
 trackConversionsTable.name = "TrackConv"
 
-trackDisplacedTable = cms.EDProducer("SimpleTrackFlatTableProducer",
-    src = cms.InputTag("displacedTracks"),
-    cut = cms.string(""), 
-    name = cms.string("TrackDisp"),
-    doc  = cms.string("reco::Track"),
-    singleton = cms.bool(False), # the number of entries is variable
-    extension = cms.bool(False), # this is the main table for the muons
-    variables = cms.PSet(P3Vars,
-        charge = Var("charge", int, doc="electric charge"),
-        Vtx_x = Var('vx()', 'float', precision=14, doc='parent vertex x pos'),
-        Vtx_y = Var('vy()', 'float', precision=14, doc='parent vertex y pos'),
-        Vtx_z = Var('vz()', 'float', precision=14, doc='parent vertex z pos'),
-        Vtx_t = Var('t0', 'float', precision=14, doc='parent vertex time'),
-    )
-)
+trackConversionsHGCPositionTable = generalTrackHGCPositionTable.clone()
+trackConversionsHGCPositionTable.src = trackConversionsTable.src
+trackConversionsHGCPositionTable.name = trackConversionsTable.name
+trackConversionsHGCPositionTable.cut = trackConversionsTable.cut
+
+# displaced
+
+#trackDisplacedTable = generalTrackTable.clone()
+#trackDisplacedTable.src = "displacedTracks"
+#trackDisplacedTable.name = "TrackDisp"
+#
+#trackDisplacedHGCPositionTable = generalTrackHGCPositionTable.clone()
+#trackDisplacedHGCPositionTable.src = trackDisplacedTable.src
+#trackDisplacedHGCPositionTable.name = trackDisplacedTable.name
+#trackDisplacedHGCPositionTable.cut = trackDisplacedTable.cut
+
+
+
 
 trackSimClusterMatch = cms.EDProducer("RecoTrackToSimClusterAssociation",
     tracks = cms.InputTag("generalTracks"),
@@ -61,7 +67,8 @@
     cut = generalTrackTable.cut,
     src = generalTrackTable.src,
     objName = generalTrackTable.name,
-    branchName = cms.string("SimCluster"),
+    bestMatchTable = cms.untracked.bool(True),
+    branchName = cms.string("MergedSimCluster"),
     objMap = cms.InputTag("trackSimClusterMatch"),
     docString = cms.string("Index of the best matching SimClusters (by pMag cluster/pMag track) within a dR cone of 0.4. Quality defined as pratio < 1 ? pratio : 2 - pratio") 
 )
@@ -76,7 +83,9 @@
 )
 
 
-trackTables = cms.Sequence(generalTrackTable+generalTrackHGCPositionTable+trackConversionsTable+trackDisplacedTable
+trackTables = cms.Sequence(generalTrackTable+generalTrackHGCPositionTable
+                           +trackConversionsTable + trackConversionsHGCPositionTable
+                          # +trackDisplacedTable + trackDisplacedHGCPositionTable
         +trackToTrackingParticleTable)
 
 trackSCAssocTable = cms.Sequence(trackSimClusterMatch+trackSimClusterAssocTable)
diff --git a/HGCSimTruth/HGCSimTruth/BuildFile.xml b/HGCSimTruth/HGCSimTruth/BuildFile.xml
@@ -17,6 +17,7 @@
 <use name="MagneticField/Engine" />
 <use name="TrackingTools/Records" />
 <use name="RecoLocalCalo/HGCalRecAlgos" />
+    <use name="RecoParticleFlow/PFTruthProducer" />
 <use name="hepmc" />
 <use name="heppdt" />
 

diff --git a/HGCSimTruth/HGCSimTruth/interface/SimClusterTools.h b/HGCSimTruth/HGCSimTruth/interface/SimClusterTools.h
@@ -5,8 +5,8 @@
  *      Author: jkiesele
  */
 
-#ifndef PRODUCTION_HGCALSIM_CMSSW_JKIESELE_CMSSW_11_0_0_PRE9_SRC_RECOHGCAL_GRAPHRECO_INTERFACE_SIMCLUSTERTOOLS_H_
-#define PRODUCTION_HGCALSIM_CMSSW_JKIESELE_CMSSW_11_0_0_PRE9_SRC_RECOHGCAL_GRAPHRECO_INTERFACE_SIMCLUSTERTOOLS_H_
+#ifndef HGCSIMTRUTH_HGCSIMTRUTH_INTERFACE_SIMCLUSTERTOOLS_H_
+#define HGCSIMTRUTH_HGCSIMTRUTH_INTERFACE_SIMCLUSTERTOOLS_H_
 
 #include "SimDataFormats/CaloAnalysis/interface/SimCluster.h"
 #include "SimDataFormats/CaloAnalysis/interface/SimClusterFwd.h"

diff --git a/HGCSimTruth/HGCSimTruth/plugins/BuildFile.xml b/HGCSimTruth/HGCSimTruth/plugins/BuildFile.xml
@@ -19,6 +19,7 @@
 <use name="RecoLocalCalo/HGCalRecAlgos" />
 <use name="HGCSimTruth/HGCSimTruth" />
 <use name="RecoHGCal/GraphReco" />
+    <use name="RecoParticleFlow/PFTruthProducer" />
 <use name="hepmc" />
 <use name="heppdt" />