Merge pull request #34094 from cecilecaillol/l1t-fixDuplicateDictiona…

…ries_try2 L1T: fix duplicate dictionary problems in #33978
cms-sw · Jun 16, 2021 · 35a483c · 35a483c
2 parents 6cea3bb + 4487cc2
commit 35a483c
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 75 deletions.
diff --git a/DataFormats/DetId/src/classes_def.xml b/DataFormats/DetId/src/classes_def.xml
@@ -4,6 +4,7 @@
   </class>
   <class name="std::vector<DetId>"/>
   <class name="edm::EDCollection<DetId>"/>
+  <class name="std::map<DetId,DetId>"/>
   <class name="edm::Wrapper<edm::EDCollection<DetId> >"/>
   <class name="std::vector<std::pair<DetId,float> >"/>  
   <class name="std::pair<DetId,float>"/>               

diff --git a/L1Trigger/VertexFinder/src/classes.h b/L1Trigger/VertexFinder/src/classes.h
@@ -12,45 +12,4 @@
 #include <map>
 #include <vector>
 
-namespace {
-  struct vfdictionary {
-    l1tVertexFinder::InputData id;
-    l1tVertexFinder::Vertex vtx;
-    l1tVertexFinder::TP tp;
-    l1tVertexFinder::Stub s;
-    std::map<DetId, DetId> mdid;
-
-    edm::Ptr<l1tVertexFinder::Stub> ptrstub;
-    edm::Ptr<l1tVertexFinder::TP> ptrtp;
-
-    edm::RefToBase<TrackingParticle> rtbtp;
-
-    std::map<edm::Ptr<TrackingParticle>, edm::RefToBase<TrackingParticle>> mptrtprtbtp;
-
-    edm::ValueMap<edm::Ptr<l1tVertexFinder::Stub>> vmptrstub;
-    edm::ValueMap<edm::Ptr<l1tVertexFinder::TP>> vmptrtp;
-    edm::ValueMap<l1tVertexFinder::Stub> vmstub;
-    edm::ValueMap<l1tVertexFinder::TP> vmpt;
-
-    std::vector<l1tVertexFinder::Stub> vs;
-    std::vector<l1tVertexFinder::TP> vtp;
-    std::vector<l1tVertexFinder::Vertex> vvtx;
-    std::vector<edm::Ptr<l1tVertexFinder::Stub>> vptrstub;
-    std::vector<edm::Ptr<l1tVertexFinder::TP>> vptrtp;
-
-    edm::Wrapper<l1tVertexFinder::Vertex> wvtx;
-    edm::Wrapper<l1tVertexFinder::TP> wtp;
-    edm::Wrapper<l1tVertexFinder::Stub> ws;
-    edm::Wrapper<edm::ValueMap<edm::Ptr<l1tVertexFinder::Stub>>> wvmptrstub;
-    edm::Wrapper<edm::ValueMap<edm::Ptr<l1tVertexFinder::TP>>> wvmprttp;
-    edm::Wrapper<edm::ValueMap<l1tVertexFinder::Stub>> wvmstub;
-    edm::Wrapper<edm::ValueMap<l1tVertexFinder::TP>> wvmtp;
-    edm::Wrapper<std::map<DetId, DetId>> wmdid;
-    edm::Wrapper<std::vector<l1tVertexFinder::Stub>> wvs;
-    edm::Wrapper<std::vector<l1tVertexFinder::TP>> wvtp;
-    edm::Wrapper<std::vector<l1tVertexFinder::Vertex>> wvvtx;
-    edm::Wrapper<l1tVertexFinder::InputData> wid;
-  };
-}  // namespace
-
-#endif
+#endif
diff --git a/L1Trigger/VertexFinder/src/classes_def.xml b/L1Trigger/VertexFinder/src/classes_def.xml
@@ -1,33 +1,28 @@
 <lcgdict>
-  <class name="l1tVertexFinder::InputData"/>
-  <class name="l1tVertexFinder::Vertex"/>
-  <class name="l1tVertexFinder::TP"/>
-  <class name="l1tVertexFinder::Stub"/>
-  <class name="std::map<DetId,DetId>"/>
-  <class name="edm::Ptr<l1tVertexFinder::Stub>"/>
-  <class name="edm::Ptr<l1tVertexFinder::TP>"/>
-  <class name="edm::RefToBase<TrackingParticle>"/>
-  <class name="edm::reftobase::BaseHolder<TrackingParticle>"/>
-  <class name="std::map<edm::Ptr<TrackingParticle>,edm::RefToBase<TrackingParticle> >"/>
-  <class name="edm::ValueMap<edm::Ptr<l1tVertexFinder::Stub> >"/>
-  <class name="edm::ValueMap<edm::Ptr<l1tVertexFinder::TP> >"/>
-  <class name="edm::ValueMap<l1tVertexFinder::Stub>"/>
-  <class name="edm::ValueMap<l1tVertexFinder::TP>"/>
-  <class name="std::vector<l1tVertexFinder::Stub>"/>
-  <class name="std::vector<l1tVertexFinder::TP>"/>
-  <class name="std::vector<l1tVertexFinder::Vertex>"/>
-  <class name="std::vector<edm::Ptr<l1tVertexFinder::Stub> >"/>
-  <class name="std::vector<edm::Ptr<l1tVertexFinder::TP> >"/>
-  <class name="edm::Wrapper<l1tVertexFinder::Vertex>"/>
-  <class name="edm::Wrapper<l1tVertexFinder::TP>"/>
-  <class name="edm::Wrapper<l1tVertexFinder::Stub>"/>
-  <class name="edm::Wrapper<edm::ValueMap<edm::Ptr<l1tVertexFinder::Stub> > >"/>
-  <class name="edm::Wrapper<edm::ValueMap<edm::Ptr<l1tVertexFinder::TP> > >"/>
-  <class name="edm::Wrapper<edm::ValueMap<l1tVertexFinder::Stub> >"/>
-  <class name="edm::Wrapper<edm::ValueMap<l1tVertexFinder::TP> >"/>
-  <class name="edm::Wrapper<std::map<DetId,DetId>>"/>
-  <class name="edm::Wrapper<std::vector<l1tVertexFinder::Stub>>"/>
-  <class name="edm::Wrapper<std::vector<l1tVertexFinder::TP>>"/>
-  <class name="edm::Wrapper<std::vector<l1tVertexFinder::Vertex>>"/>
-  <class name="edm::Wrapper<l1tVertexFinder::InputData>"/>
-</lcgdict>
+  <class name="l1tVertexFinder::InputData" persistent="false"/>
+  <class name="l1tVertexFinder::Vertex" persistent="false"/>
+  <class name="l1tVertexFinder::TP" persistent="false"/>
+  <class name="l1tVertexFinder::Stub" persistent="false"/>
+  <class name="edm::Ptr<l1tVertexFinder::Stub>" persistent="false"/>
+  <class name="edm::Ptr<l1tVertexFinder::TP>" persistent="false"/>
+  <class name="edm::ValueMap<edm::Ptr<l1tVertexFinder::Stub> >" persistent="false"/>
+  <class name="edm::ValueMap<edm::Ptr<l1tVertexFinder::TP> >" persistent="false"/>
+  <class name="edm::ValueMap<l1tVertexFinder::Stub>" persistent="false"/>
+  <class name="edm::ValueMap<l1tVertexFinder::TP>" persistent="false"/>
+  <class name="std::vector<l1tVertexFinder::Stub>" persistent="false"/>
+  <class name="std::vector<l1tVertexFinder::TP>" persistent="false"/>
+  <class name="std::vector<l1tVertexFinder::Vertex>" persistent="false"/>
+  <class name="std::vector<edm::Ptr<l1tVertexFinder::Stub> >" persistent="false"/>
+  <class name="std::vector<edm::Ptr<l1tVertexFinder::TP> >" persistent="false"/>
+  <class name="edm::Wrapper<l1tVertexFinder::Vertex>" persistent="false"/>
+  <class name="edm::Wrapper<l1tVertexFinder::TP>" persistent="false"/>
+  <class name="edm::Wrapper<l1tVertexFinder::Stub>" persistent="false"/>
+  <class name="edm::Wrapper<edm::ValueMap<edm::Ptr<l1tVertexFinder::Stub> > >" persistent="false"/>
+  <class name="edm::Wrapper<edm::ValueMap<edm::Ptr<l1tVertexFinder::TP> > >" persistent="false"/>
+  <class name="edm::Wrapper<edm::ValueMap<l1tVertexFinder::Stub> >" persistent="false"/>
+  <class name="edm::Wrapper<edm::ValueMap<l1tVertexFinder::TP> >" persistent="false"/>
+  <class name="edm::Wrapper<std::vector<l1tVertexFinder::Stub>>" persistent="false"/>
+  <class name="edm::Wrapper<std::vector<l1tVertexFinder::TP>>" persistent="false"/>
+  <class name="edm::Wrapper<std::vector<l1tVertexFinder::Vertex>>" persistent="false"/>
+  <class name="edm::Wrapper<l1tVertexFinder::InputData>" persistent="false"/>
+</lcgdict>
diff --git a/SimDataFormats/TrackingAnalysis/src/classes_def.xml b/SimDataFormats/TrackingAnalysis/src/classes_def.xml
@@ -23,7 +23,7 @@
 
   <class name="TrackingParticleRefVector" />
   <class name="edm::Wrapper<TrackingParticleRefVector>"/>
- 
+
   <class name="edm::helpers::KeyVal<edm::RefProd<std::vector<TrackingParticle> >,edm::RefToBaseProd<reco::Track> >" />
   <class name="edm::helpers::KeyVal<edm::RefToBaseProd<reco::Track>,edm::RefProd<std::vector<TrackingParticle> > >" />
   <class name="std::map<unsigned int,edm::helpers::KeyVal<edm::Ref<std::vector<TrackingParticle>,TrackingParticle,edm::refhelper::FindUsingAdvance<std::vector<TrackingParticle>,TrackingParticle> >,std::vector<std::pair<edm::RefToBase<reco::Track>,double> > > >" />

diff --git a/Utilities/ReleaseScripts/scripts/duplicateReflexLibrarySearch.py b/Utilities/ReleaseScripts/scripts/duplicateReflexLibrarySearch.py
@@ -42,6 +42,7 @@
          {'L1TrackTrigger'        : ['(TTStub|TTCluster|TTTrack).*Phase2TrackerDigi']},
          {'L1TCalorimeterPhase2'  : ['l1tp2::CaloTower.*']},
          {'L1TCalorimeter'        : ['l1t::CaloTower.*']},
+         {'VertexFinder'          : ['l1tVertexFinder::Vertex']},
          {'GsfTracking'           : ['reco::GsfTrack(Collection|).*(MomentumConstraint|VertexConstraint)', 'Trajectory.*reco::GsfTrack']},
          {'ParallelAnalysis'      : ['examples::TrackAnalysisAlgorithm']},
          {'PatCandidates'         : ['pat::PATObject','pat::Lepton', 'reco::RecoCandidate','pat::[A-Za-z]+Ref(Vector|)', 'pat::UserHolder']},