Merge pull request #45623 from makortel/removePatternTrackingToolsPat…

…ternTools Replace patterns with explicit class names in `TrackingTools/PatternTools/src/classes_def.xml`, and move the dictionaries of `GlobalErrorBase` to a proper package
cms-sw · Aug 5, 2024 · 16e712c · 16e712c
2 parents 98c5815 + 6544cff
commit 16e712c
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 70 deletions.
diff --git a/DataFormats/GeometryCommonDetAlgo/src/classes.h b/DataFormats/GeometryCommonDetAlgo/src/classes.h
@@ -1,4 +1,11 @@
+#include "DataFormats/GeometryCommonDetAlgo/interface/ErrorMatrixTag.h"
+#include "DataFormats/GeometryCommonDetAlgo/interface/GlobalErrorBase.h"
 #include "DataFormats/GeometryCommonDetAlgo/interface/Measurement1D.h"
 #include "DataFormats/GeometryCommonDetAlgo/interface/Measurement1DFloat.h"
+#include "DataFormats/GeometryVector/interface/GlobalPoint.h"
+#include "DataFormats/Common/interface/RefProd.h"
 #include "DataFormats/Common/interface/ValueMap.h"
 #include "DataFormats/Common/interface/Wrapper.h"
+
+#include <utility>
+#include <vector>
diff --git a/DataFormats/GeometryCommonDetAlgo/src/classes_def.xml b/DataFormats/GeometryCommonDetAlgo/src/classes_def.xml
@@ -8,4 +8,12 @@
   <class name="std::vector<Measurement1DFloat>" />
   <class name="edm::ValueMap<Measurement1DFloat>" />
   <class name="edm::Wrapper<edm::ValueMap<Measurement1DFloat> >" />
+
+  <!-- used in TrackingTools/PatternTools as VertexConstraint -->
+  <class name="GlobalErrorBase<double,ErrorMatrixTag>"/>
+  <class name="std::pair<Point3DBase<float,GlobalTag>, GlobalErrorBase<double,ErrorMatrixTag> >"/>
+  <class name="std::vector<std::pair<Point3DBase<float,GlobalTag>, GlobalErrorBase<double,ErrorMatrixTag> > >"/>
+  <class name="edm::Wrapper<std::vector<std::pair<Point3DBase<float,GlobalTag>, GlobalErrorBase<double,ErrorMatrixTag> > > >" persistent="false"/>
+  <class name="edm::RefProd<std::vector<std::pair<Point3DBase<float,GlobalTag>, GlobalErrorBase<double,ErrorMatrixTag> > > >"/>
+
 </lcgdict>
diff --git a/TrackingTools/PatternTools/src/classes.h b/TrackingTools/PatternTools/src/classes.h
@@ -24,58 +24,3 @@
 #include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
 #include "TrackingTools/PatternTools/interface/TrackConstraintAssociation.h"
 #include <vector>
-
-namespace TrackingTools_PatternTools {
-  struct dictionary {
-    std::vector<Trajectory> kk;
-    edm::Wrapper<std::vector<Trajectory> > trajCollWrapper;
-
-    std::vector<TrajAnnealing> ta;
-    edm::Wrapper<std::vector<TrajAnnealing> > trajAnnCollaction;
-
-    TrajTrackAssociationCollection ttam;
-    edm::Wrapper<TrajTrackAssociationCollection> wttam;
-    TrajTrackAssociation vttam;
-    TrajTrackAssociationRef rttam;
-    TrajTrackAssociationRefProd rpttam;
-    TrajTrackAssociationRefVector rvttam;
-
-    std::vector<MomentumConstraint> j2;
-    edm::Wrapper<std::vector<MomentumConstraint> > j3;
-
-    TrackMomConstraintAssociationCollection i1;
-    edm::Wrapper<TrackMomConstraintAssociationCollection> i2;
-    TrackMomConstraintAssociation i3;
-    TrackMomConstraintAssociationRef i4;
-    TrackMomConstraintAssociationRefProd i5;
-    TrackMomConstraintAssociationRefVector i6;
-
-    std::vector<VertexConstraint> jj2;
-    edm::Wrapper<std::vector<VertexConstraint> > jj3;
-
-    TrackVtxConstraintAssociationCollection ii1;
-    edm::Wrapper<TrackVtxConstraintAssociationCollection> ii2;
-    TrackVtxConstraintAssociation ii3;
-    TrackVtxConstraintAssociationRef ii4;
-    TrackVtxConstraintAssociationRefProd ii5;
-    TrackVtxConstraintAssociationRefVector ii6;
-
-    edm::helpers::KeyVal<edm::RefProd<std::vector<Trajectory> >, edm::RefProd<std::vector<Trajectory> > > x1;
-    edm::AssociationMap<edm::OneToOne<std::vector<Trajectory>, std::vector<Trajectory>, unsigned int> > x2;
-    edm::Wrapper<edm::AssociationMap<edm::OneToOne<std::vector<Trajectory>, std::vector<Trajectory>, unsigned int> > >
-        x3;
-    edm::helpers::KeyVal<edm::RefProd<std::vector<reco::Track> >, edm::RefProd<std::vector<Trajectory> > > x4;
-    edm::AssociationMap<edm::OneToOne<std::vector<reco::Track>, std::vector<Trajectory>, unsigned int> > x5;
-    edm::Wrapper<edm::AssociationMap<edm::OneToOne<std::vector<reco::Track>, std::vector<Trajectory>, unsigned int> > >
-        x6;
-    edm::helpers::KeyVal<edm::RefProd<std::vector<Trajectory> >, edm::RefProd<std::vector<TrajectorySeed> > > x7;
-    edm::AssociationMap<edm::OneToMany<std::vector<Trajectory>, std::vector<TrajectorySeed>, unsigned int> > x8;
-    edm::Wrapper<
-        edm::AssociationMap<edm::OneToMany<std::vector<Trajectory>, std::vector<TrajectorySeed>, unsigned int> > >
-        x9;
-    edm::helpers::KeyVal<edm::RefProd<std::vector<TrackCandidate> >, edm::RefProd<std::vector<Trajectory> > > x10;
-    edm::AssociationMap<edm::OneToOne<std::vector<TrackCandidate>, std::vector<Trajectory>, unsigned int> > x11;
-    edm::Wrapper<edm::AssociationMap<edm::OneToOne<std::vector<TrackCandidate>, std::vector<Trajectory>, unsigned int> > >
-        x12;
-  };
-}  // namespace TrackingTools_PatternTools
diff --git a/TrackingTools/PatternTools/src/classes_def.xml b/TrackingTools/PatternTools/src/classes_def.xml
@@ -10,11 +10,6 @@
   <class name="edm::Wrapper<std::vector<MomentumConstraint> >" persistent="false"/>
   <class name="edm::RefProd<std::vector<MomentumConstraint> >"/>
 
-  <class name="VertexConstraint"/>
-  <class name="std::vector<VertexConstraint>"/>
-  <class name="edm::Wrapper<std::vector<VertexConstraint> >" persistent="false"/>
-  <class name="edm::RefProd<std::vector<VertexConstraint> >"/>
-
   <class name="edm::AssociationMap<edm::OneToOne<std::vector<Trajectory>,std::vector<reco::Track>,unsigned short > >" >
     <field name="transientMap_" transient="true"/>
   </class>
@@ -25,13 +20,22 @@
     <field name="transientMap_" transient="true"/>
   </class>
 
-  <class name="edm::Wrapper<edm::AssociationMap<edm::OneToOne<std::vector<Trajectory>,std::vector<reco::Track>,unsigned short> > >" persistent="false" />
-  <class name="edm::Wrapper<edm::AssociationMap<edm::OneToOne<reco::TrackCollection,std::vector<MomentumConstraint>,unsigned int> > >" />
-  <class name="edm::Wrapper<edm::AssociationMap<edm::OneToOne<reco::TrackCollection,std::vector<VertexConstraint>,unsigned int> > >"/>
+  <class name="edm::Wrapper<edm::AssociationMap<edm::OneToOne<std::vector<Trajectory>,std::vector<reco::Track>,unsigned short> > >" persistent="false"/>
+  <class name="edm::Wrapper<edm::AssociationMap<edm::OneToOne<reco::TrackCollection,std::vector<MomentumConstraint>,unsigned int> > >" persistent="false"/>
+  <class name="edm::Wrapper<edm::AssociationMap<edm::OneToOne<reco::TrackCollection,std::vector<VertexConstraint>,unsigned int> > >" persistent="false"/>
+
+  <class name="edm::Ref<edm::AssociationMap<edm::OneToOne<std::vector<Trajectory>,std::vector<reco::Track>,unsigned short> > >"/>
+  <class name="edm::Ref<edm::AssociationMap<edm::OneToOne<reco::TrackCollection,std::vector<MomentumConstraint>,unsigned int> > >"/>
+  <class name="edm::Ref<edm::AssociationMap<edm::OneToOne<reco::TrackCollection,std::vector<VertexConstraint>,unsigned int> > >"/>
+
+  <class name="edm::RefProd<edm::AssociationMap<edm::OneToOne<std::vector<Trajectory>,std::vector<reco::Track>,unsigned short> > >"/>
+  <class name="edm::RefProd<edm::AssociationMap<edm::OneToOne<reco::TrackCollection,std::vector<MomentumConstraint>,unsigned int> > >"/>
+  <class name="edm::RefProd<edm::AssociationMap<edm::OneToOne<reco::TrackCollection,std::vector<VertexConstraint>,unsigned int> > >"/>
+
+  <class name="edm::RefVector<edm::AssociationMap<edm::OneToOne<std::vector<Trajectory>,std::vector<reco::Track>,unsigned short> > >"/>
+  <class name="edm::RefVector<edm::AssociationMap<edm::OneToOne<reco::TrackCollection,std::vector<MomentumConstraint>,unsigned int> > >"/>
+  <class name="edm::RefVector<edm::AssociationMap<edm::OneToOne<reco::TrackCollection,std::vector<VertexConstraint>,unsigned int> > >"/>
 
-  <class pattern="edm::Ref<edm::AssociationMap<*>"/>
-  <class pattern="edm::RefProd<edm::AssociationMap<*>"/>
-  <class pattern="edm::RefVector<edm::AssociationMap<*>"/>
   <class name="edm::helpers::KeyVal<edm::RefProd<std::vector<Trajectory> >,edm::RefProd<std::vector<reco::Track> > >"/>
   <class name="edm::helpers::KeyVal<edm::RefProd<std::vector<reco::Track> >,edm::RefProd<std::vector<MomentumConstraint> > >"/>
   <class name="edm::helpers::KeyVal<edm::RefProd<std::vector<reco::Track> >,edm::RefProd<std::vector<VertexConstraint> > >"/>
@@ -57,9 +61,6 @@
   <class name="edm::helpers::KeyVal<edm::Ref<vector<Trajectory>,Trajectory,edm::refhelper::FindUsingAdvance<vector<Trajectory>,Trajectory> >,edm::Ref<vector<reco::Track>,reco::Track,edm::refhelper::FindUsingAdvance<vector<reco::Track>,reco::Track> > >"/>
 
   <class name="TrajAnnealing"/>
-  <class name="std::vector<TrajAnnealing>" persistent="false"/>
+  <class name="std::vector<TrajAnnealing>"/>
   <class name="edm::Wrapper<std::vector<TrajAnnealing> >" persistent="false"/>
-
-  <!-- This next spec should not really be here, but it is a workaround for a ROOT6 problem (Danilo Piparo).-->
-  <class name="GlobalErrorBase<double,ErrorMatrixTag>" />
 </lcgdict>