Skip to content

Commit

Permalink
Modernized dictionaries in DataFormats/TrackReco
Browse files Browse the repository at this point in the history 
-removed unneeded struct dictionary
-removed use of pattern in classes_def.xml
  • Loading branch information
@Dr15Jones
Dr15Jones committed Feb 8, 2019
1 parent 093afd0 commit 481113a
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 114 deletions.
111 changes: 0 additions & 111 deletions DataFormats/TrackReco/src/classes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,114 +33,3 @@

#include <vector>

namespace DataFormats_TrackReco {
struct dictionary {
std::bitset<reco::TrackBase::algoSize> ba;
reco::TrackExtraCollection v3;
edm::Wrapper<reco::TrackExtraCollection> c3;
edm::Ref<reco::TrackExtraCollection> r3;
edm::RefProd<reco::TrackExtraCollection> rp3;
edm::RefVector<reco::TrackExtraCollection> rv3;

std::vector<edm::RefVector<std::vector<reco::Track> > > vrv3;
edm::Ptr<reco::Track> ptrt;
std::vector<edm::Ptr<reco::Track> > vptrt;

reco::TrackCollection v1;
edm::Wrapper<reco::TrackCollection> c1;
reco::TrackRef r1;
reco::TrackRefProd rp1;
reco::TrackRefVector rv1;
edm::Wrapper<reco::TrackRefVector> wv1;
std::vector<reco::TrackRef> vr1;

edm::helpers::Key<edm::RefProd<std::vector<reco::Track> > > rpt1;
edm::AssociationMap<edm::OneToValue<std::vector<reco::Track>, double, unsigned int> > am1;
edm::AssociationMap<edm::OneToValue<std::vector<reco::Track>, float, unsigned int> > am2;
edm::AssociationMap<edm::OneToValue<std::vector<reco::Track>, int, unsigned int> > am3;
edm::AssociationMap<edm::OneToValue<std::vector<reco::Track>, bool, unsigned int> > am4;
edm::Wrapper<edm::AssociationMap<edm::OneToValue<std::vector<reco::Track>, double, unsigned int> > > wam1;
edm::Wrapper<edm::AssociationMap<edm::OneToValue<std::vector<reco::Track>, float, unsigned int> > > wam2;
edm::Wrapper<edm::AssociationMap<edm::OneToValue<std::vector<reco::Track>, int, unsigned int> > > wam3;
edm::Wrapper<edm::AssociationMap<edm::OneToValue<std::vector<reco::Track>, bool, unsigned int> > > wam4;

edm::Wrapper<edm::AssociationVector<reco::TrackRefProd,std::vector<double> > > wav1;
edm::Wrapper<edm::AssociationVector<reco::TrackRefProd,std::vector<float> > > wav2;
edm::Wrapper<edm::AssociationVector<reco::TrackRefProd,std::vector<int> > > wav3;
edm::Wrapper<edm::AssociationVector<reco::TrackRefProd,std::vector<bool> > > wav4;

edm::helpers::KeyVal<reco::TrackRef,reco::TrackRef> kvtttmap1;
reco::TrackToTrackMap tttmap1;
edm::Wrapper<reco::TrackToTrackMap> wtttmap1;

// DEDX containers
reco::DeDxDataCollection dedxe1;
reco::DeDxData dedxe2;
reco::DeDxDataValueMap dedxe3;

edm::Wrapper<reco::TrackDeDxHitsCollection> dedxw1;
edm::Wrapper<reco::DeDxDataCollection> dedxw2;
edm::Wrapper<reco::DeDxDataValueMap> dedxw3;

// RefToBase Holders for Tracks
edm::RefToBase<reco::Track> rtb_tk;
edm::reftobase::IndirectHolder<reco::Track> ih_tk;
//edm::reftobase::BaseHolder<reco::Track> bh_tk;
edm::reftobase::RefHolder<reco::TrackRef> rf_tkr;
edm::reftobase::RefHolder<edm::Ptr<reco::Track> > rfh_ptr_tkr;
edm::reftobase::Holder<reco::Track, reco::TrackRef> h_tk_tkr;
std::vector< edm::RefToBase<reco::Track> > rtb_tk_vect;

reco::TrackBaseRefVector tbrv;
edm::Wrapper<reco::TrackBaseRefVector> wtbrv;

edm::RefToBaseProd<reco::Track> aaaaaa;
std::vector<std::pair<edm::RefToBase<reco::Track>,double> > aaaaaaaaaa;
std::pair<edm::RefToBase<reco::Track>,double> aaaaaaaaaaaa;

edm::ValueMap<reco::TrackRefVector> vm_trv;
edm::Wrapper<edm::ValueMap<reco::TrackRefVector> > w_vm_trv;

edm::helpers::KeyVal<edm::RefProd<std::vector<reco::Track> >,edm::RefProd<std::vector<TrajectorySeed> > > x1;
edm::AssociationMap<edm::OneToMany<std::vector<reco::Track>,std::vector<TrajectorySeed>,unsigned int> > x2;
edm::Wrapper<edm::AssociationMap<edm::OneToMany<std::vector<reco::Track>,std::vector<TrajectorySeed>,unsigned int> > > x3;
std::vector<std::pair<edm::Ref<std::vector<reco::Track>,reco::Track,edm::refhelper::FindUsingAdvance<std::vector<reco::Track>,reco::Track> >,float> > amf5;
std::pair<edm::Ref<std::vector<reco::Track>,reco::Track,edm::refhelper::FindUsingAdvance<std::vector<reco::Track>,reco::Track> >,float> amf6;


std::vector<std::pair<edm::Ref<std::vector<reco::Track>,reco::Track,edm::refhelper::FindUsingAdvance<std::vector<reco::Track>,reco::Track> >,int> > am5;
std::pair<edm::Ref<std::vector<reco::Track>,reco::Track,edm::refhelper::FindUsingAdvance<std::vector<reco::Track>,reco::Track> >,int> am6;

std::pair<reco::Track,reco::Track> trackPair;
std::pair<TrackCandidate, std::pair<reco::Track,reco::Track> > ctpair;
std::vector<std::pair<TrackCandidate, std::pair<reco::Track,reco::Track> > > candidateMap;
edm::Wrapper<std::pair<reco::Track,reco::Track> > w1;
edm::Wrapper<std::vector<std::pair<TrackCandidate, std::pair<reco::Track,reco::Track> > > > w2;
edm::Wrapper<std::pair<TrackCandidate, std::pair<reco::Track,reco::Track> > > w3;

std::pair<reco::TrackRef,reco::TrackRef> trackRefPair;
std::pair<TrackCandidate, std::pair<reco::TrackRef,reco::TrackRef> > ctrpair;
std::vector<std::pair<TrackCandidate, std::pair<reco::TrackRef,reco::TrackRef> > > candidateRefMap;
edm::Wrapper<std::pair<reco::TrackRef,reco::TrackRef> > ww1;
edm::Wrapper<std::vector<std::pair<TrackCandidate, std::pair<reco::TrackRef,reco::TrackRef> > > > ww2;
edm::Wrapper<std::pair<TrackCandidate, std::pair<reco::TrackRef,reco::TrackRef> > > ww3;


reco::DeDxHitInfo hitInfoDEDX;
reco::DeDxHitInfoCollection hitInfoDEDXc;
reco::DeDxHitInfoRef hitInfoDEDXr;
reco::DeDxHitInfoRefProd hitInfoDEDXp;
reco::DeDxHitInfoRefVector hitInfoDEDXv;
reco::DeDxHitInfoAss hitInfoDEDXam;
edm::Wrapper<reco::DeDxHitInfo> hitInfoDEDXW;
edm::Wrapper<reco::DeDxHitInfoCollection> hitInfoDEDXcW;
edm::Wrapper<reco::DeDxHitInfoAss> hitInfoDEDXamW;

reco::DeDxHitInfo::DeDxHitInfoContainer hitInfoContainerDEDX;
reco::DeDxHitInfo::DeDxHitInfoContainerCollection hitInfoContainerDEDXc;

SeedStopInfo ssi;
std::vector<SeedStopInfo> vssi;
edm::Wrapper<std::vector<SeedStopInfo> > wvssi;
};
}
26 changes: 23 additions & 3 deletions DataFormats/TrackReco/src/classes_def.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,13 @@
<class name="edm::Ptr<reco::Track>" />
<class name="std::vector<edm::Ptr<reco::Track> >" />

<class pattern="edm::Wrapper<edm::AssociationMap<*>" />
<!-- <class pattern="edm::Wrapper<edm::AssociationMap<*>" /> -->
<class name="edm::Wrapper<edm::AssociationMap<edm::OneToMany<vector<reco::Track>,vector<TrajectorySeed>,unsigned int> > >" />
<class name="edm::Wrapper<edm::AssociationMap<edm::OneToOne<vector<reco::Track>,vector<reco::Track>,unsigned int> > >" />
<class name="edm::Wrapper<edm::AssociationMap<edm::OneToValue<vector<reco::Track>,bool,unsigned int> > >" />
<class name="edm::Wrapper<edm::AssociationMap<edm::OneToValue<vector<reco::Track>,double,unsigned int> > >" />
<class name="edm::Wrapper<edm::AssociationMap<edm::OneToValue<vector<reco::Track>,float,unsigned int> > >" />
<class name="edm::Wrapper<edm::AssociationMap<edm::OneToValue<vector<reco::Track>,int,unsigned int> > >" />

<class name="edm::helpers::Key<edm::RefProd <std::vector <reco::Track> > >" />

Expand Down Expand Up @@ -457,10 +463,24 @@
</class>
<class name="reco::DeDxHitCollection" />

<class pattern="edm::AssociationVector<*>">
<!-- <class pattern="edm::AssociationVector<*>">
<field name="transientVector_" transient="true"/>
</class> -->
<class name="edm::AssociationVector<edm::RefProd<std::vector<reco::Track> >,std::vector<bool>,edm::Ref<std::vector<reco::Track>,reco::Track,edm::refhelper::FindUsingAdvance<std::vector<reco::Track>,reco::Track> >,unsigned int,edm::helper::AssociationIdenticalKeyReference>" >
<field name="transientVector_" transient="true"/>
</class>
<class name="edm::AssociationVector<edm::RefProd<std::vector<reco::Track> >,std::vector<double>,edm::Ref<std::vector<reco::Track>,reco::Track,edm::refhelper::FindUsingAdvance<std::vector<reco::Track>,reco::Track> >,unsigned int,edm::helper::AssociationIdenticalKeyReference>" >
<field name="transientVector_" transient="true"/>
</class>
<class name="edm::AssociationVector<edm::RefProd<std::vector<reco::Track> >,std::vector<float>,edm::Ref<std::vector<reco::Track>,reco::Track,edm::refhelper::FindUsingAdvance<std::vector<reco::Track>,reco::Track> >,unsigned int,edm::helper::AssociationIdenticalKeyReference>" >
<field name="transientVector_" transient="true"/>
</class>
<class name="edm::AssociationVector<edm::RefProd<std::vector<reco::Track> >,std::vector<int>,edm::Ref<std::vector<reco::Track>,reco::Track,edm::refhelper::FindUsingAdvance<std::vector<reco::Track>,reco::Track> >,unsigned int,edm::helper::AssociationIdenticalKeyReference>" >
<field name="transientVector_" transient="true"/>
</class>
<class name="edm::AssociationVector<edm::RefProd<std::vector<reco::Track> >,std::vector<std::vector<reco::DeDxHit> >,edm::Ref<std::vector<reco::Track>,reco::Track,edm::refhelper::FindUsingAdvance<std::vector<reco::Track>,reco::Track> >,unsigned int,edm::helper::AssociationIdenticalKeyReference>" >
<field name="transientVector_" transient="true"/>
</class>

<!-- <class name="reco::DeDxDataCollection"/> -->
<class name="reco::DeDxData" ClassVersion="10">
<version ClassVersion="10" checksum="204721063"/>
Expand Down

0 comments on commit 481113a

Please sign in to comment.