tuning up clustering based on initial geometry fixes

Conflicts: RecoParticleFlow/PFClusterProducer/test/run_display.sh
cms-sw · Sep 30, 2014 · f03a5d1 · f03a5d1
1 parent 941fb6d
commit f03a5d1
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 28 deletions.
diff --git a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHGCEE_cfi.py b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHGCEE_cfi.py
@@ -26,8 +26,8 @@
 _manqiArborClusterizer_HGCEE = cms.PSet(
     algoName = cms.string("SimpleArborClusterizer"), 
     # use basic pad sizes in HGCEE
-    cellSize = cms.double(10.0),
-    layerThickness = cms.double(16.0),
+    cellSize = cms.double(16.0),
+    layerThickness = cms.double(18.0),
     distSeedForMerge = cms.double(20.0),
     killNoiseClusters = cms.bool(True),
     maxNoiseClusterSize = cms.uint32(3),

diff --git a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHGCHEB_cfi.py b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHGCHEB_cfi.py
@@ -23,8 +23,8 @@
 _manqiArborClusterizer_HGCHEB = cms.PSet(
     algoName = cms.string("SimpleArborClusterizer"), 
     # use basic pad sizes in HGCEE
-    cellSize = cms.double(30.0),
-    layerThickness = cms.double(55.0),
+    cellSize = cms.double(35.0),
+    layerThickness = cms.double(65.0),
     distSeedForMerge = cms.double(20.0),
     killNoiseClusters = cms.bool(True),
     maxNoiseClusterSize = cms.uint32(3),

diff --git a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHGCHEF_cfi.py b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHGCHEF_cfi.py
@@ -23,9 +23,9 @@
 _manqiArborClusterizer_HGCHEF = cms.PSet(
     algoName = cms.string("SimpleArborClusterizer"), 
     # use basic pad sizes in HGCEE
-    cellSize = cms.double(10.0),
-    layerThickness = cms.double(45.0),
-    distSeedForMerge = cms.double(20.0),
+    cellSize = cms.double(15.0),
+    layerThickness = cms.double(55.0),
+    distSeedForMerge = cms.double(30.0),
     killNoiseClusters = cms.bool(True),
     maxNoiseClusterSize = cms.uint32(3),
     thresholdsByDetector = cms.VPSet( )

diff --git a/RecoParticleFlow/PFClusterProducer/test/hgcal_rechits.fwc b/RecoParticleFlow/PFClusterProducer/test/hgcal_rechits.fwc
@@ -894,10 +894,10 @@
  <config name="GUI" version="1">
   <config name="main window" version="3">
    <config name="x" version="0">
-     <string>54</string>
+     <string>106</string>
    </config>
    <config name="y" version="0">
-     <string>44</string>
+     <string>23</string>
    </config>
    <config name="width" version="0">
      <string>1263</string>
@@ -1011,22 +1011,22 @@
       <string>1</string>
     </config>
     <config name="cameraMatrix0Plain3D" version="0">
-      <string>-0.401173</string>
+      <string>0.769709</string>
     </config>
     <config name="cameraMatrix1Plain3D" version="0">
-      <string>-0.563483</string>
+      <string>0.13655</string>
     </config>
     <config name="cameraMatrix2Plain3D" version="0">
-      <string>0.722185</string>
+      <string>0.623623</string>
     </config>
     <config name="cameraMatrix3Plain3D" version="0">
       <string>0</string>
     </config>
     <config name="cameraMatrix4Plain3D" version="0">
-      <string>0.814632</string>
+      <string>-0.174677</string>
     </config>
     <config name="cameraMatrix5Plain3D" version="0">
-      <string>-0.579978</string>
+      <string>0.984626</string>
     </config>
     <config name="cameraMatrix6Plain3D" version="0">
       <string>0</string>
@@ -1035,25 +1035,25 @@
       <string>0</string>
     </config>
     <config name="cameraMatrix8Plain3D" version="0">
-      <string>0.41885</string>
+      <string>-0.614034</string>
     </config>
     <config name="cameraMatrix9Plain3D" version="0">
-      <string>0.588315</string>
+      <string>-0.108934</string>
     </config>
     <config name="cameraMatrix10Plain3D" version="0">
-      <string>0.691701</string>
+      <string>0.781726</string>
     </config>
     <config name="cameraMatrix11Plain3D" version="0">
       <string>0</string>
     </config>
     <config name="cameraMatrix12Plain3D" version="0">
-      <string>-1458.17</string>
+      <string>2877.96</string>
     </config>
     <config name="cameraMatrix13Plain3D" version="0">
-      <string>-2016.83</string>
+      <string>498.315</string>
     </config>
     <config name="cameraMatrix14Plain3D" version="0">
-      <string>2612.92</string>
+      <string>2219.76</string>
     </config>
     <config name="cameraMatrix15Plain3D" version="0">
       <string>1</string>
@@ -1095,19 +1095,19 @@
       <string>0</string>
     </config>
     <config name="cameraMatrixBase12Plain3D" version="0">
-      <string>-52.4547</string>
+      <string>0.281389</string>
     </config>
     <config name="cameraMatrixBase13Plain3D" version="0">
-      <string>-37.8377</string>
+      <string>0.577909</string>
     </config>
     <config name="cameraMatrixBase14Plain3D" version="0">
-      <string>317.74</string>
+      <string>6.85455</string>
     </config>
     <config name="cameraMatrixBase15Plain3D" version="0">
       <string>1</string>
     </config>
     <config name="Plain3D FOV" version="0">
-      <string>3.09973</string>
+      <string>5.46292</string>
     </config>
    </config>
    <config name="Rho Phi" version="7">

diff --git a/RecoParticleFlow/PFClusterProducer/test/run_display.sh b/RecoParticleFlow/PFClusterProducer/test/run_display.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-cmsShow -c ${CMSSW_BASE}/src/RecoParticleFlow/PFClusterProducer/test/hgcal_rechits.fwc -g /home/lgray/xHGCAL/cmsRecoGeom1-HGCAL.root --sim-geom-file /home/lgray/xHGCAL/cmsSimGeom-14-HGCAL.root /home/lgray/CMSSW_6_2_0_SLHC16/src/matrix_tests/simple_jet_gun/step3.root
+cmsShow -c ${CMSSW_BASE}/src/RecoParticleFlow/PFClusterProducer/test/hgcal_rechits.fwc -g ~/work/public/xHGCAL/cmsRecoGeom1-HGCAL.root --sim-geom-file ~/work/public/xHGCAL/cmsSimGeom-14-HGCAL.root ${CMSSW_BASE}/src/matrix_tests/14801_FourMuPt1_200+FourMuPt_1_200_Extended2023HGCalV4_GenSimFull+DigiFull_Extended2023HGCalV4+RecoFull_Extended2023HGCalV4+HARVESTFull_Extended2023HGCalV4/step3.root
+
 
 #12202_SinglePionPt35+SinglePionPt35_Extended2023HGCalMuon_GenSimFull+DigiFull_Extended2023HGCalMuon+RecoFull_Extended2023HGCalMuon+HARVESTFull_Extended2023HGCalMuon
 

diff --git a/RecoParticleFlow/PFProducer/plugins/kdtrees/KDTreeLinkerTrackHGC.h b/RecoParticleFlow/PFProducer/plugins/kdtrees/KDTreeLinkerTrackHGC.h
@@ -99,6 +99,7 @@ KDTreeLinkerTrackHGC<the_layer,RHscaling>::insertFieldClusterElt(reco::PFBlockEl
 
   // We create a list of hgcCluster
   fieldClusterSet_.insert(hgcCluster);
+  /*
   DetId seedId( clusterref->seed() );
   unsigned seedLayer = 1000;  
   if( seedId.det() == DetId::Forward ) {
@@ -111,10 +112,12 @@ KDTreeLinkerTrackHGC<the_layer,RHscaling>::insertFieldClusterElt(reco::PFBlockEl
     throw cms::Exception("BadSeedRecHit") 
       << "HGC KDTree Linker only accepts HGC DetIds! got: " << seedId.det();
   }
+  */
 
   for(size_t rhit = 0; rhit < fraction.size(); ++rhit) {
     const reco::PFRecHitRef& rh = fraction[rhit].recHitRef();
     double fract = fraction[rhit].fraction();
+    /*
     DetId rhId( rh->detId() );
     unsigned rhLayer = 1000;
 
@@ -128,8 +131,8 @@ KDTreeLinkerTrackHGC<the_layer,RHscaling>::insertFieldClusterElt(reco::PFBlockEl
       throw cms::Exception("BadRecHit") 
 	<< "HGC KDTree Linker only accepts HGC DetIds! got: " << rhId.det();
     }
-
-    if ( (rh.isNull()) || (fract < 1E-4) ||  rhLayer != seedLayer )
+    */
+    if ( (rh.isNull()) || (fract < 1E-4) ) // ||  rhLayer != seedLayer )
       continue;
 
     const reco::PFRecHit& rechit = *rh;
@@ -233,7 +236,7 @@ void
 
     // Estimate the maximal envelope in phi/eta that will be used to find rechit candidates.
     // Same envelope for cap et barrel rechits.
-    double range = getCristalPhiEtaMaxSize() * (2.0 + 1.0 / std::min(1., trackPt / 2.)); 
+    double range = getCristalPhiEtaMaxSize() * (2.0 + 1.0 / std::min(1., 0.5*trackPt )); 
 
     // We search for all candidate recHits, ie all recHits contained in the maximal size envelope.
     std::vector<KDTreeNodeInfo> recHits;