Merge pull request #15862 from felicepantaleo/CATriplets_LayerCacheFix

Phase1 Pixel Triplets Seeding by CA - LayerCache cleared after use
cms-sw · Sep 23, 2016 · 2509600 · 2509600
2 parents 8b82e97 + 3bdcae9
commit 2509600
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 1 deletion.
diff --git a/RecoPixelVertexing/PixelTriplets/plugins/CAHitTripletGenerator.cc b/RecoPixelVertexing/PixelTriplets/plugins/CAHitTripletGenerator.cc
@@ -144,6 +144,9 @@ void CAHitTripletGenerator::hitTriplets(const TrackingRegion& region,
 
 	ca.findTriplets(hitDoublets, foundTriplets, region, caThetaCut, caPhiCut,
 			caHardPtCut);
+
+	theLayerCache.clear();
+
 	unsigned int numberOfFoundTriplets = foundTriplets.size();
 
 	const QuantityDependsPtEval maxChi2Eval = maxChi2.evaluator(es);

diff --git a/RecoPixelVertexing/PixelTriplets/python/CAHitTripletGenerator_cfi.py b/RecoPixelVertexing/PixelTriplets/python/CAHitTripletGenerator_cfi.py
@@ -10,7 +10,8 @@
     ),
     useBendingCorrection = cms.bool(False),
     CAThetaCut = cms.double(0.00125),
-    CAPhiCut = cms.double(1),
+    CAPhiCut = cms.double(0.1),
+    CAHardPtCut = cms.double(0),   
 )
 
 
diff --git a/RecoTracker/Configuration/python/customiseForTripletsByCellularAutomaton.py b/RecoTracker/Configuration/python/customiseForTripletsByCellularAutomaton.py
@@ -0,0 +1,38 @@
+import FWCore.ParameterSet.Config as cms
+
+def customiseForTripletsByCellularAutomaton(process):
+    for module in process._Process__producers.values():
+        if not hasattr(module, "OrderedHitsFactoryPSet"):
+            continue
+	pset = getattr(module, "OrderedHitsFactoryPSet")
+        if not hasattr(pset, "ComponentName"):
+	    continue
+	if not (pset.ComponentName == "StandardHitTripletGenerator"):
+	    continue
+        # Adjust seeding layers
+        seedingLayersName = module.OrderedHitsFactoryPSet.SeedingLayers.getModuleLabel()
+
+
+
+        # Configure seed generator / pixel track producer
+        Triplets = module.OrderedHitsFactoryPSet.clone()
+        from RecoPixelVertexing.PixelTriplets.CAHitTripletGenerator_cfi import CAHitTripletGenerator as _CAHitTripletGenerator
+
+        module.OrderedHitsFactoryPSet  = _CAHitTripletGenerator.clone(
+            ComponentName = cms.string("CAHitTripletGenerator"),
+            extraHitRPhitolerance = Triplets.GeneratorPSet.extraHitRPhitolerance,
+            maxChi2 = dict(
+                pt1    = 0.8, pt2    = 2,
+                value1 = 20, value2 = 10,
+                enabled = True,
+            ),
+            useBendingCorrection = True,
+            SeedingLayers = cms.InputTag(seedingLayersName),
+            CAThetaCut = cms.double(0.0015),
+            CAPhiCut = cms.double(0.01),
+            CAHardPtCut = cms.double(0),
+        )
+
+        if hasattr(Triplets.GeneratorPSet, "SeedComparitorPSet"):
+            pset.SeedComparitorPSet = Triplets.GeneratorPSet.SeedComparitorPSet
+    return process
diff --git a/RecoTracker/Configuration/python/customiseForTripletsHLTPixelTracksByCellularAutomaton.py b/RecoTracker/Configuration/python/customiseForTripletsHLTPixelTracksByCellularAutomaton.py
@@ -33,6 +33,7 @@ def customiseForTripletsHLTPixelTracksByCellularAutomaton(process):
             SeedingLayers = cms.InputTag(seedingLayersName),
             CAThetaCut = cms.double(0.0015),
             CAPhiCut = cms.double(0.01),
+            CAHardPtCut = cms.double(0),
         )
 
         if hasattr(triplets.GeneratorPSet, "SeedComparitorPSet"):