Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace patterns with explicit class names in TrackingTools/PatternTools/src/classes_def.xml, and move the dictionaries of GlobalErrorBase to a proper package #45623

Merged
merged 4 commits into from
Aug 5, 2024
Merged

Replace patterns with explicit class names in TrackingTools/PatternTools/src/classes_def.xml, and move the dictionaries of GlobalErrorBase to a proper package #45623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
90e80ec
Replace patterns with class names in classes_def.xml
makortel Aug 1, 2024
71a5974
Clean up classes.h
makortel Aug 1, 2024
5d8c078
Set persistent="false" on proper types
makortel Aug 1, 2024
6544cff
Move GlobalErrorBase (and Point3DBase) related dictionaires to DataFo…
makortel Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions DataFormats/GeometryCommonDetAlgo/src/classes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
8 changes: 8 additions & 0 deletions DataFormats/GeometryCommonDetAlgo/src/classes_def.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
55 changes: 0 additions & 55 deletions TrackingTools/PatternTools/src/classes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
31 changes: 16 additions & 15 deletions TrackingTools/PatternTools/src/classes_def.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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> > >"/>
Expand All @@ -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>