Skip to content

Commit

Permalink
Merge CMSSW_10_5_X into CMSSW_10_5_DEVEL_X.
Browse files Browse the repository at this point in the history
  • Loading branch information
@cmsbuild
cmsbuild committed Feb 9, 2019
2 parents a16a431 + 90b06fd commit 8214af0
Show file tree
Hide file tree
Showing 115 changed files with 161 additions and 5,809 deletions.
27 changes: 0 additions & 27 deletions DataFormats/Alignment/src/classes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,3 @@
#include "DataFormats/Alignment/interface/TkFittedLasBeam.h"


namespace DataFormats_Alignment {
struct dictionary {
//////////////////////////////////////////////
// for LAS interface to track-based alignment
//////////////////////////////////////////////
// TkLasBeam beam1; // not needed since not templated
// edm::Wrapper<TkLasBeam> beam2; // not needed since not an EDProduct?
TkLasBeamCollection beamCollection1;
edm::Wrapper<TkLasBeamCollection> beamCollection2;

// TkFittedLasBeam fitBeam1; // not needed since not templated?
TkFittedLasBeamCollection fitBeamCollection1;
edm::Wrapper<TkFittedLasBeamCollection> fitBeamCollection2;


//////////////////////////////////////////////
// for AlCaSkim
//////////////////////////////////////////////
// not needed (not instance of template):
// AlignmentClusterFlag ahf;
// edm::Wrapper<AlignmentClusterFlag> wahf; // not needed since not an EDProduct?
AliClusterValueMap ahvm1;
edm::Wrapper<AliClusterValueMap> wahvm1;
/* AliTrackTakenClusterValueMap atthvm1; // needed? */
/* edm::Wrapper<AliTrackTakenClusterValueMap> watthvm1; // needed? */
};
}
372 changes: 0 additions & 372 deletions DataFormats/BTauReco/src/classes.h
100755 → 100644
View file

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions DataFormats/BeamSpot/src/classes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,3 @@
#include "Math/CylindricalEta3D.h"
#include "DataFormats/Math/interface/Vector.h"

namespace DataFormats_BeamSpot {
struct dictionary {
reco::BeamSpot b;
edm::Wrapper<reco::BeamSpot> b_w;
};
}
5 changes: 0 additions & 5 deletions DataFormats/CLHEP/src/classes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,3 @@
#include "CLHEP/Vector/LorentzVector.h"
#include "CLHEP/Vector/ThreeVector.h"

namespace DataFormats_CLHEP {
struct dictionary {
std::vector<CLHEP::HepLorentzVector> dummy0;
};
}
94 changes: 0 additions & 94 deletions DataFormats/CSCDigi/src/classes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,97 +38,3 @@ struct GEMCSCLCTDigiCollection {};
#include <vector>
#include <map>

namespace DataFormats_CSCDigi {
struct dictionary {

CSCWireDigi cWD_;
CSCRPCDigi cRD_;
CSCStripDigi cSD_;
CSCComparatorDigi cCD_;
CSCCLCTDigi cCLCTD_;
CSCALCTDigi cALCTD_;
CSCCorrelatedLCTDigi cCorLCTD_;
GEMCSCLCTDigi gcLCTD_;
CSCCFEBStatusDigi cCSD_;
CSCTMBStatusDigi cTMBSD_;
CSCDCCFormatStatusDigi cDFSD_;
CSCDMBStatusDigi cDMBSD_;
CSCDDUStatusDigi cDDUSD_;
CSCDCCStatusDigi cDCCSD_;
CSCALCTStatusDigi cALCTSD_;
CSCCLCTPreTriggerDigi cCLCTPreD_;


std::vector<CSCWireDigi> vWD_;
std::vector<CSCRPCDigi> vRD_;
std::vector<CSCStripDigi> vSD_;
std::vector<CSCComparatorDigi> vCD_;
std::vector<CSCCLCTDigi> vCLCTD_;
std::vector<CSCALCTDigi> vALCTD_;
std::vector<CSCCorrelatedLCTDigi> vCorLCTD_;
std::vector<GEMCSCLCTDigi> vgcLCTD_;
std::vector<CSCCFEBStatusDigi> vCSD_;
std::vector<CSCTMBStatusDigi> vTMBSD_;
std::vector<CSCDCCFormatStatusDigi> vDFSD_;
std::vector<CSCDMBStatusDigi> vDMBSD_;
std::vector<CSCDDUStatusDigi> vDDUSD_;
std::vector<CSCDCCStatusDigi> vDCCSD_;
std::vector<CSCALCTStatusDigi> vALCTSD_;
std::vector<CSCCLCTPreTrigger> vPreTriggerBX_;
std::vector<CSCCLCTPreTriggerDigi> vCLCTPreD_;

std::vector<std::vector<CSCWireDigi> > vvWD_;
std::vector<std::vector<CSCRPCDigi> > vvRD_;
std::vector<std::vector<CSCStripDigi> > vvSD_;
std::vector<std::vector<CSCComparatorDigi> > vvCD_;
std::vector<std::vector<CSCCLCTDigi> > vvCLCTD_;
std::vector<std::vector<CSCALCTDigi> > vvALCTD_;
std::vector<std::vector<CSCCorrelatedLCTDigi> > vvCorLCTD_;
std::vector<std::vector<GEMCSCLCTDigi> > vvgcLCTD_;
std::vector<std::vector<CSCCFEBStatusDigi> > vvCSD_;
std::vector<std::vector<CSCTMBStatusDigi> > vvTMBSD_;
std::vector<std::vector<CSCDMBStatusDigi> > vvDMBSD_;
std::vector<std::vector<CSCDCCFormatStatusDigi> > vvDFSD_;
std::vector<std::vector<CSCDDUStatusDigi> > vvDDUSD_;
std::vector<std::vector<CSCDCCStatusDigi> > vvDCCSD_;
std::vector<std::vector<CSCALCTStatusDigi> > vvALCTSD_;
std::vector<std::vector<CSCCLCTPreTrigger> > vvPreTrigger_;
std::vector<std::vector<CSCCLCTPreTriggerDigi> > vvCLCTPreD_;

CSCWireDigiCollection clWD_;
CSCRPCDigiCollection clRD_;
CSCStripDigiCollection clSD_;
CSCComparatorDigiCollection clCD_;
CSCCLCTDigiCollection clCLCTD_;
CSCALCTDigiCollection clALCTD_;
CSCCorrelatedLCTDigiCollection clCorLCTD_;
GEMCSCLCTDigiCollection clgcLCTD_;
CSCCFEBStatusDigiCollection clCSD_;
CSCTMBStatusDigiCollection clTMBSD_;
CSCDCCFormatStatusDigiCollection clDFSD_;
CSCDMBStatusDigiCollection clDMBSD_;
CSCDMBStatusDigiCollection clDDUSD_;
CSCDMBStatusDigiCollection clDCCSD_;
CSCDMBStatusDigiCollection clALCTSD_;
CSCCLCTPreTriggerCollection clPreTrigger_;
CSCCLCTPreTriggerDigiCollection clCLCTPreD_;

edm::Wrapper<CSCWireDigiCollection> wWD_;
edm::Wrapper<CSCRPCDigiCollection> wRD_;
edm::Wrapper<CSCStripDigiCollection> wSD_;
edm::Wrapper<CSCComparatorDigiCollection> wCD_;
edm::Wrapper<CSCCLCTDigiCollection> wCLCTD_;
edm::Wrapper<CSCALCTDigiCollection> wALCTD_;
edm::Wrapper<CSCCorrelatedLCTDigiCollection> wCorLCTD_;
edm::Wrapper<GEMCSCLCTDigiCollection> wgcLCTD_;
edm::Wrapper<CSCCFEBStatusDigiCollection> wCSD_;
edm::Wrapper<CSCTMBStatusDigiCollection> wTMBSD_;
edm::Wrapper<CSCDCCFormatStatusDigiCollection> wDFSD_;
edm::Wrapper<CSCDMBStatusDigiCollection> wDMBSD_;
edm::Wrapper<CSCDDUStatusDigiCollection> wDDUSD_;
edm::Wrapper<CSCDCCStatusDigiCollection> wDCCSD_;
edm::Wrapper<CSCALCTStatusDigiCollection> wALCTSD_;
edm::Wrapper<CSCCLCTPreTriggerCollection> wPreTrigger_;
edm::Wrapper<CSCCLCTPreTriggerDigiCollection> wCLCTPreD_;
};
}
11 changes: 0 additions & 11 deletions DataFormats/CSCRecHit/src/classes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,3 @@
#include <DataFormats/Common/interface/Wrapper.h>
#include <vector>

namespace DataFormats_CSCRecHit {
struct dictionary {
std::map<CSCDetId,std::pair<unsigned int,unsigned int> > dummycscdetid1;
std::map<CSCDetId,std::pair<unsigned long,unsigned long> > dummycscdetid2;
CSCRecHit2DCollection dc;
edm::Wrapper<CSCRecHit2DCollection> dwc;
CSCSegmentCollection seg;
edm::Wrapper<CSCSegmentCollection> dwc1;
CSCSegmentRef ref;
};
}
9 changes: 0 additions & 9 deletions DataFormats/CTPPSDetId/src/classes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,3 @@
#include "DataFormats/CTPPSDetId/interface/CTPPSDiamondDetId.h"
#include "DataFormats/CTPPSDetId/interface/CTPPSPixelDetId.h"
#include "DataFormats/CTPPSDetId/interface/TotemTimingDetId.h"
namespace DataFormats_TotemRPDetId {
struct dictionary {
CTPPSDetId dummy0;
TotemRPDetId dummy1;
CTPPSDiamondDetId dummy2;
CTPPSPixelDetId dummy3;
TotemTimingDetId dummy4;
};
}
74 changes: 0 additions & 74 deletions DataFormats/CTPPSDigi/src/classes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,77 +23,3 @@

#include <vector>

namespace DataFormats_CTPPSDigi {
struct dictionary {
TotemRPDigi rp_str_dig;
edm::DetSet<TotemRPDigi> ds_rp_str_dig;
std::vector<TotemRPDigi> vec_rp_str_dig;
edm::DetSetVector<TotemRPDigi> dsv_rp_str_dig;
std::vector<edm::DetSet<TotemRPDigi> > vec_ds_rp_str_dig;
edm::Wrapper<edm::DetSet<TotemRPDigi> > wds_rp_str_dig;
edm::Wrapper<edm::DetSetVector<TotemRPDigi> > wdsv_rp_str_dig;

TotemTriggerCounters dummy10;
edm::Wrapper<TotemTriggerCounters> dummy11;

std::map<unsigned int, uint64_t> dummy27;

TotemVFATStatus dummy30;
edm::Wrapper< TotemVFATStatus > dummy31;
edm::DetSetVector<TotemVFATStatus> dummy32;
edm::Wrapper< edm::DetSetVector<TotemVFATStatus> > dummy33;

std::bitset<8> dummy50;
edm::Wrapper< std::bitset<8> > dummy51;

TotemFEDInfo fi;
std::vector<TotemFEDInfo> v_fi;
edm::Wrapper<std::vector<TotemFEDInfo>> w_v_fi;

CTPPSDiamondDigi rm_diamo_dig;
edm::DetSet<CTPPSDiamondDigi> ds_rp_diamo_dig;
std::vector<CTPPSDiamondDigi> vec_rp_diamo_dig;
edm::DetSetVector<CTPPSDiamondDigi> dsv_rp_diamo_dig;
std::vector<edm::DetSet<CTPPSDiamondDigi> > vec_ds_rp_diamo_dig;
edm::Wrapper<edm::DetSet<CTPPSDiamondDigi> > wds_rp_diamo_dig;
edm::Wrapper<edm::DetSetVector<CTPPSDiamondDigi> > wdsv_rp_diamo_dig;

TotemTimingDigi rm_totTiming_dig;
edm::DetSet<TotemTimingDigi> ds_rp_totTiming_dig;
std::vector<TotemTimingDigi> vec_rp_totTiming_dig;
edm::DetSetVector<TotemTimingDigi> dsv_rp_totTiming_dig;
std::vector<edm::DetSet<TotemTimingDigi> > vec_ds_rp_totTiming_dig;
edm::Wrapper<edm::DetSet<TotemTimingDigi> > wds_rp_totTiming_dig;
edm::Wrapper<edm::DetSetVector<TotemTimingDigi> > wdsv_rp_totTiming_dig;

HPTDCErrorFlags rm_hptdcerr;
CTPPSPixelDigi ff0;
CTPPSPixelDigiCollection ffc0;
std::vector<CTPPSPixelDigi> ff1;
edm::DetSet<CTPPSPixelDigi> ff2;
std::vector<edm::DetSet<CTPPSPixelDigi> > ff3;
edm::DetSetVector<CTPPSPixelDigi> ff4;


edm::Wrapper<CTPPSPixelDigi> wff0;
edm::Wrapper<CTPPSPixelDigiCollection> wffc0;
edm::Wrapper< std::vector<CTPPSPixelDigi> > wff1;
edm::Wrapper< edm::DetSet<CTPPSPixelDigi> > wff2;
edm::Wrapper< std::vector<edm::DetSet<CTPPSPixelDigi> > > wff3;
edm::Wrapper< edm::DetSetVector<CTPPSPixelDigi> > wff4;


std::vector<CTPPSPixelDataError> err0;
std::map<int, std::vector<CTPPSPixelDataError> > err1;
edm::DetSet<CTPPSPixelDataError> err2;
std::vector<edm::DetSet<CTPPSPixelDataError> > err3;
edm::DetSetVector<CTPPSPixelDataError> err4;
edm::Wrapper< std::vector<CTPPSPixelDataError> > err5;
edm::Wrapper< std::map<int, std::vector<CTPPSPixelDataError> > > err6;
edm::Wrapper< edm::DetSet<CTPPSPixelDataError> > err7;
edm::Wrapper< std::vector<edm::DetSet<CTPPSPixelDataError> > > err8;
edm::Wrapper< edm::DetSetVector<CTPPSPixelDataError> > err9;


};
}
129 changes: 0 additions & 129 deletions DataFormats/CTPPSReco/src/classes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,132 +22,3 @@

#include <vector>

namespace DataFormats_CTPPSReco {
struct dictionary {

//--- strips objects

TotemRPRecHit rp_reco_hit;
edm::DetSet<TotemRPRecHit> ds_rp_reco_hit;
edm::DetSetVector<TotemRPRecHit> dsv_rp_reco_hit;
std::vector<edm::DetSet<TotemRPRecHit> > sv_dsw_rp_reco_hit;
edm::Wrapper<edm::DetSetVector<TotemRPRecHit> > w_dsv_rp_reco_hit;
std::vector<TotemRPRecHit> sv_rp_reco_hit;
std::vector<const TotemRPRecHit*> sv_cp_rp_reco_hit;

TotemRPCluster dc;
edm::DetSet<TotemRPCluster> dsdc;
std::vector<TotemRPCluster> svdc;
std::vector<edm::DetSet<TotemRPCluster> > svdsdc;
edm::DetSetVector<TotemRPCluster> dsvdc;
edm::Wrapper<edm::DetSetVector<TotemRPCluster> > wdsvdc;

TotemRPUVPattern pat;
edm::DetSetVector<TotemRPUVPattern> dsv_pat;
edm::Wrapper<edm::DetSetVector<TotemRPUVPattern>> w_dsv_pat;

TotemRPLocalTrack ft;
edm::DetSetVector<TotemRPLocalTrack> dsv_ft;
edm::Wrapper<edm::DetSetVector<TotemRPLocalTrack>> w_dsv_ft;
edm::DetSetVector<TotemRPLocalTrack::FittedRecHit> dsv_ft_frh;
edm::Wrapper<edm::DetSetVector<TotemRPLocalTrack::FittedRecHit>> w_dsv_ft_frh;
std::vector<edm::DetSet<TotemRPLocalTrack::FittedRecHit> > v_ds_ft_frh;
std::vector<TotemRPLocalTrack::FittedRecHit> v_ft_frh;

//--- timing objects
CTPPSTimingRecHit ctdm_rh;
edm::Ptr<CTPPSTimingRecHit> ptr_ctdm_rh;
edm::Wrapper<CTPPSTimingRecHit> wrp_ctdm_rh;
std::vector<CTPPSTimingRecHit> vec_ctdm_rh;
std::vector<edm::DetSet<CTPPSTimingRecHit> > vec_ds_ctdm_rh;
edm::DetSet<CTPPSTimingRecHit> ds_ctdm_rh;
edm::DetSetVector<CTPPSTimingRecHit> dsv_ctdm_rh;
edm::Wrapper<edm::DetSetVector<CTPPSTimingRecHit> > wrp_dsv_ctdm_rh;
edm::Wrapper<std::vector<CTPPSTimingRecHit> > wrp_vec_ctdm_rh;

CTPPSDiamondRecHit ctd_rh;
edm::Ptr<CTPPSDiamondRecHit> ptr_ctd_rh;
edm::Wrapper<CTPPSDiamondRecHit> wrp_ctd_rh;
std::vector<CTPPSDiamondRecHit> vec_ctd_rh;
std::vector<edm::DetSet<CTPPSDiamondRecHit> > vec_ds_ctd_rh;
edm::DetSet<CTPPSDiamondRecHit> ds_ctd_rh;
edm::DetSetVector<CTPPSDiamondRecHit> dsv_ctd_rh;
edm::Wrapper<edm::DetSetVector<CTPPSDiamondRecHit> > wrp_dsv_ctd_rh;
edm::Wrapper<std::vector<CTPPSDiamondRecHit> > wrp_vec_ctd_rh;

TotemTimingRecHit ttd_rh;
edm::Ptr<TotemTimingRecHit> ptr_ttd_rh;
edm::Wrapper<TotemTimingRecHit> wrp_ttd_rh;
std::vector<TotemTimingRecHit> vec_ttd_rh;
std::vector<edm::DetSet<TotemTimingRecHit> > vec_ds_ttd_rh;
edm::DetSet<TotemTimingRecHit> ds_ttd_rh;
edm::DetSetVector<TotemTimingRecHit> dsv_ttd_rh;
edm::Wrapper<edm::DetSetVector<TotemTimingRecHit> > wrp_dsv_ttd_rh;
edm::Wrapper<std::vector<TotemTimingRecHit> > wrp_vec_ttd_rh;

CTPPSTimingLocalTrack ctdm_lt;
edm::Ptr<CTPPSTimingLocalTrack> ptr_ctdm_lt;
edm::Wrapper<CTPPSTimingLocalTrack> wrp_ctdm_lt;
std::vector<CTPPSTimingLocalTrack> vec_ctdm_lt;
edm::DetSet<CTPPSTimingLocalTrack> ds_ctdm_lt;
std::vector<edm::DetSet<CTPPSTimingLocalTrack> > vec_ds_ctdm_lt;
edm::Wrapper<std::vector<CTPPSTimingLocalTrack> > wrp_vec_ctdm_lt;
edm::DetSetVector<CTPPSTimingLocalTrack> dsv_ctdm_lt;
edm::Wrapper<edm::DetSetVector<CTPPSTimingLocalTrack> > wrp_dsv_ctdm_lt;

CTPPSDiamondLocalTrack ctd_lt;
edm::Ptr<CTPPSDiamondLocalTrack> ptr_ctd_lt;
edm::Wrapper<CTPPSDiamondLocalTrack> wrp_ctd_lt;
std::vector<CTPPSDiamondLocalTrack> vec_ctd_lt;
edm::DetSet<CTPPSDiamondLocalTrack> ds_ctd_lt;
std::vector<edm::DetSet<CTPPSDiamondLocalTrack> > vec_ds_ctd_lt;
edm::Wrapper<std::vector<CTPPSDiamondLocalTrack> > wrp_vec_ctd_lt;
edm::DetSetVector<CTPPSDiamondLocalTrack> dsv_ctd_lt;
edm::Wrapper<edm::DetSetVector<CTPPSDiamondLocalTrack> > wrp_dsv_ctd_lt;

TotemTimingLocalTrack ttd_lt;
edm::Ptr<TotemTimingLocalTrack> ptr_ttd_lt;
edm::Wrapper<TotemTimingLocalTrack> wrp_ttd_lt;
std::vector<TotemTimingLocalTrack> vec_ttd_lt;
edm::DetSet<TotemTimingLocalTrack> ds_ttd_lt;
std::vector<edm::DetSet<TotemTimingLocalTrack> > vec_ds_ttd_lt;
edm::Wrapper<std::vector<TotemTimingLocalTrack> > wrp_vec_ttd_lt;
edm::DetSetVector<TotemTimingLocalTrack> dsv_ttd_lt;
edm::Wrapper<edm::DetSetVector<TotemTimingLocalTrack> > wrp_dsv_ttd_lt;

//--- pixel objects

CTPPSPixelCluster rpcl;
edm::DetSet<CTPPSPixelCluster> dsrpcl;
std::vector<CTPPSPixelCluster> svrpcl;
std::vector<edm::DetSet<CTPPSPixelCluster> > svdsrpcl;
edm::DetSetVector<CTPPSPixelCluster> dsvrpcl;
edm::Wrapper<edm::DetSetVector<CTPPSPixelCluster> > wdsvrpcl;

CTPPSPixelRecHit rprh;
edm::DetSet<CTPPSPixelRecHit> dsrprh;
std::vector<CTPPSPixelRecHit> svrprh;
std::vector<edm::DetSet<CTPPSPixelRecHit> > svdsrprh;
edm::DetSetVector<CTPPSPixelRecHit> dsvrprh;
edm::Wrapper<edm::DetSetVector<CTPPSPixelRecHit> > wdsvrprh;

CTPPSPixelLocalTrack rplt;
edm::DetSet<CTPPSPixelLocalTrack> dsrplt;
std::vector<CTPPSPixelLocalTrack> svrplt;
std::vector<edm::DetSet<CTPPSPixelLocalTrack> > svdsrplt;
edm::DetSetVector<CTPPSPixelLocalTrack> dsvrplt;
edm::Wrapper<edm::DetSetVector<CTPPSPixelLocalTrack> > wdsvrplt;
edm::DetSetVector<CTPPSPixelFittedRecHit> dsvrplcfrh;
edm::Wrapper<edm::DetSetVector<CTPPSPixelFittedRecHit>> wdsvrplcfrh;
std::vector<edm::DetSet<CTPPSPixelFittedRecHit> > vdsrpltfrh;
std::vector<CTPPSPixelFittedRecHit> vrpltfrh;
CTPPSPixelFittedRecHit pfrh;
edm::Wrapper<CTPPSPixelFittedRecHit> wpfrh;
//--- common objects

CTPPSLocalTrackLite cltl;
std::vector<CTPPSLocalTrackLite> v_cltl;
edm::Wrapper<CTPPSLocalTrackLite> w_cltl;
edm::Wrapper<std::vector<CTPPSLocalTrackLite>> w_v_cltl;
};
}
Loading

0 comments on commit 8214af0

Please sign in to comment.