Remove module duplicates. Use more general regex for ESRget

gartung · Jul 8, 2021 · 6df3623 · 6df3623
1 parent 6b960a7
commit 6df3623
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/Utilities/StaticAnalyzers/scripts/callgraph.py b/Utilities/StaticAnalyzers/scripts/callgraph.py
@@ -11,7 +11,8 @@
 farg = re.compile(r"\(.*?\)")
 tmpl = re.compile(r'<.*?>')
 toplevelfuncs = set()
-epfuncre = re.compile(r"edm::eventsetup::EventSetupRecord::get<class edm::ESHandle<class .*>>(.*) const")
+#epfuncre = re.compile(r"edm::eventsetup::EventSetupRecord::get<.*>\(.*\)")
+epfuncre = re.compile(r"edm::eventsetup::EventSetupRecord::get<class edm::ESHandle<(class|struct) .*>>\(.*\) const")
 skipfunc = re.compile(r"TGraph::IsA\(.*\)")
 epfuncs = set()
 
@@ -55,21 +56,22 @@
             cs = str("")
             previous = str("")
             for p in path:
-                if epfuncre.match(p):
-                    break
-                stripped = re.sub(farg, "()", p)
+                stripped = p
+                #re.sub(farg, "()", p)
                 if previous != stripped:
                     cs += ' ' + stripped + ";"
                     previous = stripped
+            if cs not in callstacks:
                 callstacks.add(cs)
-                break
 
 report = dict()
 for key in sorted(module2package.keys()):
     for value in sorted(module2package[key]):
-        for cs in sorted(callstacks):
+        if value in modules:
             vre = re.compile(' %s::.*();' % value)
-            if vre.search(cs) and value in modules:
-                report.setdefault(key, {}).setdefault(value, []).append(cs)
+            for callstack in sorted(callstacks):
+                if vre.search(callstack) :
+                    report.setdefault(key, {}).setdefault(value, []).append(callstack)
+
 r = open('eventsetuprecord-get.yaml', 'w')
 yaml.dump(report, r)
diff --git a/Utilities/StaticAnalyzers/scripts/module_to_package.yaml b/Utilities/StaticAnalyzers/scripts/module_to_package.yaml
@@ -3382,7 +3382,6 @@ RecoEgamma/EgammaPhotonProducers:
 - ConversionTrackCandidateProducer
 - GEDPhotonProducer
 - PhotonProducer
-- TrackProducer
 - TrackProducerWithSCAssociation
 - ConversionProducer
 - ConversionTrackCandidateProducer
@@ -3394,7 +3393,6 @@ RecoEgamma/EgammaPhotonProducers:
 - PhotonCoreProducer
 - PhotonProducer
 - ReducedEGProducer
-- TrackProducerWithSCAssociation
 RecoEgamma/EgammaTools:
 - CalibratedElectronProducer
 - CalibratedPatElectronProducer
@@ -3980,7 +3978,6 @@ RecoParticleFlow/PFTracking:
 - PFV0Producer
 - SimVertexSelector
 RecoPixelVertexing/PixelLowPtUtilities:
-- PixelTrackProducer
 - PixelVertexProducerClusters
 - SiPixelClusterShapeCacheProducer
 - ClusterShapeTrackFilterProducer