Skip to content

Commit

Permalink
Merge CMSSW_7_6_X into CMSSW_8_0_X.
Browse files Browse the repository at this point in the history
  • Loading branch information
@cmsbuild
cmsbuild committed Oct 19, 2015
2 parents 6b15662 + 3bbe62a commit ddc6756
Show file tree
Hide file tree
Showing 14 changed files with 311 additions and 362 deletions.
1 change: 1 addition & 0 deletions DQMServices/ClientConfig/plugins/DQMGenericClient.cc
View file
Expand Up @@ -582,6 +582,7 @@ void DQMGenericClient::computeEfficiency (DQMStore::IBooker& ibooker, DQMStore::
<< "Cannot book globalEffic-ME from the DQM\n";
return;
}
globalEfficME->setEfficiencyFlag();
TH1F* hGlobalEffic = globalEfficME->getTH1F();
if ( !hGlobalEffic ) {
LogInfo("DQMGenericClient") << "computeEfficiency() : "
Expand Down
8 changes: 0 additions & 8 deletions DataFormats/EcalRecHit/src/classes.h
View file
Expand Up @@ -42,7 +42,6 @@ namespace DataFormats_EcalRecHit {
}

//raw to rechit specific formats
#include "DataFormats/Common/interface/RefGetter.h"
#include "DataFormats/Common/interface/Ref.h"
#include "DataFormats/Common/interface/DetSet.h"
#include "DataFormats/Common/interface/DetSetVector.h"
Expand All @@ -57,12 +56,5 @@ namespace DataFormats_EcalRecHit {
edm::Wrapper< std::vector<edm::DetSet<EcalRecHit> > > dummy31;
edm::Wrapper< edm::DetSetVector<EcalRecHit> > dummy41;
edm::Wrapper< std::vector< std::vector < edm::DetSet<EcalRecHit> > > > dummy51;
edm::Wrapper< edm::RegionIndex<EcalRecHit> > dummy71;
edm::Wrapper< std::vector< edm::RegionIndex<EcalRecHit> > > dummy72;
edm::Wrapper< edm::LazyGetter<EcalRecHit> > dummy73;
edm::Wrapper< edm::Ref<edm::LazyGetter<EcalRecHit>,edm::RegionIndex<EcalRecHit>,edm::FindRegion<EcalRecHit> > > dummy74;
edm::Wrapper< std::vector<edm::Ref<edm::LazyGetter<EcalRecHit>,edm::RegionIndex<EcalRecHit>,edm::FindRegion<EcalRecHit> > > > dummy75;
edm::Wrapper< edm::RefGetter<EcalRecHit> > dummy76;
edm::Wrapper< edm::Ref< edm::LazyGetter<EcalRecHit>, EcalRecHit, edm::FindValue<EcalRecHit> > > dummy77;
};
}
11 changes: 0 additions & 11 deletions DataFormats/EcalRecHit/src/classes_def.xml
View file
Expand Up @@ -39,15 +39,4 @@
<class name="edm::Wrapper<edm::DetSetVector<EcalRecHit> >"/>
<class name="edm::Wrapper<std::vector<std::vector<edm::DetSet<EcalRecHit> > > >"/>

<class name="edm::RegionIndex<EcalRecHit>"><field name="getter_" transient="true"/> </class>
<class name="std::vector< edm::RegionIndex<EcalRecHit> >"/>
<class name="edm::LazyGetter<EcalRecHit>"><field name="unpacker_" transient="true"/> </class>
<class name="edm::Ref<edm::LazyGetter<EcalRecHit>,edm::RegionIndex<EcalRecHit>,edm::FindRegion<EcalRecHit> >"/>
<class name="std::vector<edm::Ref<edm::LazyGetter<EcalRecHit>,edm::RegionIndex<EcalRecHit>,edm::FindRegion<EcalRecHit> > >"/>
<class name="edm::RefGetter<EcalRecHit>"/>

<class name="edm::Wrapper<edm::LazyGetter<EcalRecHit> >"/>
<class name="edm::Wrapper<edm::RefGetter<EcalRecHit> >"/>

<class name="edm::Ref< edm::LazyGetter<EcalRecHit>, EcalRecHit, edm::FindValue<EcalRecHit> >"/>
</lcgdict>
8 changes: 0 additions & 8 deletions DataFormats/HGCRecHit/src/classes.h
View file
Expand Up @@ -43,7 +43,6 @@ namespace DataFormats_HGCalRecHit {
}

//raw to rechit specific formats
#include "DataFormats/Common/interface/RefGetter.h"
#include "DataFormats/Common/interface/Ref.h"
#include "DataFormats/Common/interface/DetSet.h"
#include "DataFormats/Common/interface/DetSetVector.h"
Expand All @@ -58,12 +57,5 @@ namespace DataFormats_HGCalRecHit {
edm::Wrapper< std::vector<edm::DetSet<HGCRecHit> > > dummy31;
edm::Wrapper< edm::DetSetVector<HGCRecHit> > dummy41;
edm::Wrapper< std::vector< std::vector < edm::DetSet<HGCRecHit> > > > dummy51;
edm::Wrapper< edm::RegionIndex<HGCRecHit> > dummy71;
edm::Wrapper< std::vector< edm::RegionIndex<HGCRecHit> > > dummy72;
edm::Wrapper< edm::LazyGetter<HGCRecHit> > dummy73;
edm::Wrapper< edm::Ref<edm::LazyGetter<HGCRecHit>,edm::RegionIndex<HGCRecHit>,edm::FindRegion<HGCRecHit> > > dummy74;
edm::Wrapper< std::vector<edm::Ref<edm::LazyGetter<HGCRecHit>,edm::RegionIndex<HGCRecHit>,edm::FindRegion<HGCRecHit> > > > dummy75;
edm::Wrapper< edm::RefGetter<HGCRecHit> > dummy76;
edm::Wrapper< edm::Ref< edm::LazyGetter<HGCRecHit>, HGCRecHit, edm::FindValue<HGCRecHit> > > dummy77;
};
}
12 changes: 0 additions & 12 deletions DataFormats/HGCRecHit/src/classes_def.xml
View file
Expand Up @@ -31,18 +31,6 @@
<class name="edm::Wrapper<edm::DetSetVector<HGCRecHit> >"/>
<class name="edm::Wrapper<std::vector<std::vector<edm::DetSet<HGCRecHit> > > >"/>

<class name="edm::RegionIndex<HGCRecHit>"><field name="getter_" transient="true"/> </class>
<class name="std::vector< edm::RegionIndex<HGCRecHit> >"/>
<class name="edm::LazyGetter<HGCRecHit>"><field name="unpacker_" transient="true"/> </class>
<class name="edm::Ref<edm::LazyGetter<HGCRecHit>,edm::RegionIndex<HGCRecHit>,edm::FindRegion<HGCRecHit> >"/>
<class name="std::vector<edm::Ref<edm::LazyGetter<HGCRecHit>,edm::RegionIndex<HGCRecHit>,edm::FindRegion<HGCRecHit> > >"/>
<class name="edm::RefGetter<HGCRecHit>"/>

<class name="edm::Wrapper<edm::LazyGetter<HGCRecHit> >"/>
<class name="edm::Wrapper<edm::RefGetter<HGCRecHit> >"/>

<class name="edm::Ref< edm::LazyGetter<HGCRecHit>, HGCRecHit, edm::FindValue<HGCRecHit> >"/>

<class name="edm::reftobase::Holder<CaloRecHit, edm::Ref<edm::SortedCollection<HGCRecHit, edm::StrictWeakOrdering<HGCRecHit> >, HGCRecHit, edm::refhelper::FindUsingAdvance<edm::SortedCollection<HGCRecHit, edm::StrictWeakOrdering<HGCRecHit> >, HGCRecHit> > >" />
<enum name="HGCSeverityLevel::SeverityLevel"/>
</lcgdict>
41 changes: 0 additions & 41 deletions EventFilter/EcalRawToDigi/interface/EcalRegionCabling.h
View file
Expand Up @@ -4,8 +4,6 @@
#include "Geometry/EcalMapping/interface/EcalElectronicsMapping.h"
#include "Geometry/EcalMapping/interface/ESElectronicsMapper.h"

#include "DataFormats/Common/interface/LazyGetter.h"
#include "DataFormats/Common/interface/RefGetter.h"
#include "DataFormats/EcalRecHit/interface/EcalRecHit.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "DataFormats/FEDRawData/interface/FEDNumbering.h"
Expand All @@ -28,19 +26,6 @@ class EcalRegionCabling {
const EcalElectronicsMapping * mapping() const { return mapping_;}
const ESElectronicsMapper * es_mapping() const { return es_mapping_;}

template <class T> void updateEcalRefGetterWithElementIndex(edm::RefGetter<T> & refgetter,
const edm::Handle< edm::LazyGetter<T> >& lazygetter,
const uint32_t index)const;

template <class T> void updateEcalRefGetterWithFedIndex(edm::RefGetter<T> & refgetter,
const edm::Handle< edm::LazyGetter<T> >& lazygetter,
const int index)const;

template <class T> void updateEcalRefGetterWithEtaPhi(edm::RefGetter<T> & refgetter,
const edm::Handle< edm::LazyGetter<T> >& lazygetter,
const double eta,
const double phi)const;

static uint32_t maxElementIndex() {return (FEDNumbering::MAXECALFEDID - FEDNumbering::MINECALFEDID +1);}
static uint32_t maxESElementIndex() { return (FEDNumbering::MAXPreShowerFEDID - FEDNumbering::MINPreShowerFEDID +1);}

Expand Down Expand Up @@ -82,30 +67,4 @@ class EcalRegionCabling {
const ESElectronicsMapper * es_mapping_;
};


template <class T> void EcalRegionCabling::updateEcalRefGetterWithElementIndex(edm::RefGetter<T> & refgetter,
const edm::Handle< edm::LazyGetter<T> >& lazygetter,
const uint32_t index)const{
LogDebug("EcalRawToRecHit|Cabling")<<"updating a refgetter with element index: "<<index;
refgetter.push_back(lazygetter, index);
}


template <class T> void EcalRegionCabling::updateEcalRefGetterWithFedIndex(edm::RefGetter<T> & refgetter,
const edm::Handle< edm::LazyGetter<T> >& lazygetter,
const int fedindex)const{
LogDebug("EcalRawToRecHit|Cabling")<<"updating a refgetter with fed index: "<<fedindex;
updateEcalRefGetterWithElementIndex(refgetter, lazygetter, elementIndex(fedindex));
}


template <class T> void EcalRegionCabling::updateEcalRefGetterWithEtaPhi(edm::RefGetter<T> & refgetter,
const edm::Handle< edm::LazyGetter<T> >& lazygetter,
const double eta,
const double phi)const{
int index = mapping()->GetFED(eta,phi);
LogDebug("EcalRawToRecHit|Cabling")<<"updating a refgetter with eta: "<<eta<<" phi: "<<phi;
updateEcalRefGetterWithFedIndex(refgetter, lazygetter, index);
}

#endif
2 changes: 1 addition & 1 deletion Geometry/HGCalCommonData/data/v7/hgcalEE.xml
View file
Expand Up @@ -32,7 +32,7 @@
<rParent name="hgcalEE:HGCalEEM"/>
<Vector name="MaterialNames" type="string" nEntries="15">
materials:Carbon_fibre_str_Upgrade2, materials:Tungsten, materials:Tungsten,
materials:Tungsten, materials:WCu, materials:WCu, materials:Wcu,
materials:Tungsten, materials:WCu, materials:WCu, materials:WCu,
materials:Copper, materials:Copper, materials:Silicon, materials:M_NEMA FR4 plate,
materials:Air, materials:Foam, materials:Aluminium, materials:Air</Vector>
<Vector name="VolumeNames" type="string" nEntries="15">
Expand Down
2 changes: 0 additions & 2 deletions Geometry/MuonCommonData/data/PhaseII/muonNumbering.xml
View file
Expand Up @@ -482,7 +482,6 @@
<SpecParSection label="muonGEMnumbering" eval="true">
<SpecPar name="MuonGEMEndcap">
<PartSelector path="//GEMDisk11."/>
<PartSelector path="//GEMDisk21S."/>
<Parameter name="CopyNoTag" value="[mg_ring]"/>
<Parameter name="CopyNoOffset" value="1*[super]"/>
</SpecPar>
Expand All @@ -493,7 +492,6 @@
</SpecPar>
<SpecPar name="MuonGEMSector">
<PartSelector path="//GEMBox11."/>
<PartSelector path="//GEMBox21"/>
<PartSelector path="//GEMBox21L"/>
<Parameter name="CopyNoTag" value="[mg_sector]"/>
<Parameter name="CopyNoOffset" value="3*[super]"/>
Expand Down
12 changes: 12 additions & 0 deletions RecoJets/JetProducers/plugins/VirtualJetProducer.cc
View file
Expand Up @@ -345,12 +345,20 @@ void VirtualJetProducer::produce(edm::Event& iEvent,const edm::EventSetup& iSetu

bool isView = iEvent.getByToken(input_candidateview_token_, inputsHandle);
if ( isView ) {
if ( inputsHandle->size() == 0) {
output( iEvent, iSetup );
return;
}
for (size_t i = 0; i < inputsHandle->size(); ++i) {
inputs_.push_back(inputsHandle->ptrAt(i));
}
} else {
bool isPF = iEvent.getByToken(input_candidatefwdptr_token_, pfinputsHandleAsFwdPtr);
if ( isPF ) {
if ( pfinputsHandleAsFwdPtr->size() == 0) {
output( iEvent, iSetup );
return;
}
for (size_t i = 0; i < pfinputsHandleAsFwdPtr->size(); ++i) {
if ( (*pfinputsHandleAsFwdPtr)[i].ptr().isAvailable() ) {
inputs_.push_back( (*pfinputsHandleAsFwdPtr)[i].ptr() );
Expand All @@ -361,6 +369,10 @@ void VirtualJetProducer::produce(edm::Event& iEvent,const edm::EventSetup& iSetu
}
} else {
iEvent.getByToken(input_packedcandidatefwdptr_token_, packedinputsHandleAsFwdPtr);
if ( packedinputsHandleAsFwdPtr->size() == 0) {
output( iEvent, iSetup );
return;
}
for (size_t i = 0; i < packedinputsHandleAsFwdPtr->size(); ++i) {
if ( (*packedinputsHandleAsFwdPtr)[i].ptr().isAvailable() ) {
inputs_.push_back( (*packedinputsHandleAsFwdPtr)[i].ptr() );
Expand Down
10 changes: 6 additions & 4 deletions RecoMuon/MuonIdentification/plugins/MuonProducer.cc
View file
Expand Up @@ -364,10 +364,12 @@ void MuonProducer::produce(edm::Event& event, const edm::EventSetup& eventSetup)
// search for the corresponding pf candidate
MuToPFMap::iterator iter = muToPFMap.find(muRef);
if(iter != muToPFMap.end()){
outMuon.setPFP4(pfCandidates->at(iter->second).p4());
outMuon.setP4(pfCandidates->at(iter->second).p4());//PF is the default
outMuon.setCharge(pfCandidates->at(iter->second).charge());//PF is the default
outMuon.setBestTrack(pfCandidates->at(iter->second).bestMuonTrackType());
const auto& pfMu = pfCandidates->at(iter->second);
outMuon.setPFP4(pfMu.p4());
outMuon.setP4(pfMu.p4());//PF is the default
outMuon.setCharge(pfMu.charge());//PF is the default
outMuon.setPdgId(-13*pfMu.charge());
outMuon.setBestTrack(pfMu.bestMuonTrackType());
muToPFMap.erase(iter);
dout << "MuonRef: " << muRef.id() << " " << muRef.key()
<< " Is it PF? " << outMuon.isPFMuon()
Expand Down
18 changes: 9 additions & 9 deletions SimCalorimetry/EcalSimAlgos/interface/EBHitResponse.h
View file
Expand Up @@ -38,27 +38,27 @@ class EBHitResponse : public EcalHitResponse

virtual void add( const PCaloHit& hit, CLHEP::HepRandomEngine* ) override;

virtual void initializeHits() ;
virtual void initializeHits() override;

virtual void finalizeHits() ;
virtual void finalizeHits() override;

virtual void run( MixCollection<PCaloHit>& hits, CLHEP::HepRandomEngine* ) override;

virtual unsigned int samplesSize() const ;
virtual unsigned int samplesSize() const override;

virtual EcalSamples* operator[]( unsigned int i ) ;
virtual EcalSamples* operator[]( unsigned int i ) override;

virtual const EcalSamples* operator[]( unsigned int i ) const ;
virtual const EcalSamples* operator[]( unsigned int i ) const override;

protected:

virtual unsigned int samplesSizeAll() const ;
virtual unsigned int samplesSizeAll() const override;

virtual EcalSamples* vSamAll( unsigned int i ) ;
virtual EcalSamples* vSamAll( unsigned int i ) override;

virtual const EcalSamples* vSamAll( unsigned int i ) const ;
virtual const EcalSamples* vSamAll( unsigned int i ) const override;

virtual EcalSamples* vSam( unsigned int i ) ;
virtual EcalSamples* vSam( unsigned int i ) override ;

void putAPDSignal( const DetId& detId, double npe, double time ) ;

Expand Down
48 changes: 25 additions & 23 deletions SimCalorimetry/EcalSimProducers/interface/EcalDigiProducer.h
View file
Expand Up @@ -64,10 +64,10 @@ class EcalDigiProducer : public DigiAccumulatorMixMod {
EcalDigiProducer( const edm::ParameterSet& params , edm::ConsumesCollector& iC);
virtual ~EcalDigiProducer();

virtual void initializeEvent(edm::Event const& e, edm::EventSetup const& c);
virtual void accumulate(edm::Event const& e, edm::EventSetup const& c);
virtual void initializeEvent(edm::Event const& e, edm::EventSetup const& c) override;
virtual void accumulate(edm::Event const& e, edm::EventSetup const& c) override;
virtual void accumulate(PileUpEventPrincipal const& e, edm::EventSetup const& c, edm::StreamID const&) override;
virtual void finalizeEvent(edm::Event& e, edm::EventSetup const& c);
virtual void finalizeEvent(edm::Event& e, edm::EventSetup const& c) override;
virtual void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& setup) override;

void setEBNoiseSignalGenerator(EcalBaseSignalGenerator * noiseGenerator);
Expand Down Expand Up @@ -109,44 +109,46 @@ class EcalDigiProducer : public DigiAccumulatorMixMod {

const unsigned int m_readoutFrameSize ;
protected:
const EcalSimParameterMap* m_ParameterMap ;
std::unique_ptr<const EcalSimParameterMap> m_ParameterMap ;
private:
const std::string m_apdDigiTag ;
const APDSimParameters* m_apdParameters ;
std::unique_ptr<const APDSimParameters> m_apdParameters ;

EBHitResponse* m_APDResponse ;
std::unique_ptr<EBHitResponse> m_APDResponse ;
protected:
EBHitResponse* m_EBResponse ;
EEHitResponse* m_EEResponse ;
std::unique_ptr<EBHitResponse> m_EBResponse ;
std::unique_ptr<EEHitResponse> m_EEResponse ;
private:
ESHitResponse* m_ESResponse ;
CaloHitResponse* m_ESOldResponse ;
std::unique_ptr<ESHitResponse> m_ESResponse ;
std::unique_ptr<CaloHitResponse> m_ESOldResponse ;

const bool m_addESNoise ;
const bool m_PreMix1 ;
const bool m_PreMix2 ;

const bool m_doFastES ;

ESElectronicsSim* m_ESElectronicsSim ;
ESOldDigitizer* m_ESOldDigitizer ;
ESElectronicsSimFast* m_ESElectronicsSimFast ;
ESDigitizer* m_ESDigitizer ;
const bool m_doEB, m_doEE, m_doES;

EBDigitizer* m_APDDigitizer ;
EBDigitizer* m_BarrelDigitizer ;
EEDigitizer* m_EndcapDigitizer ;
std::unique_ptr<ESElectronicsSim> m_ESElectronicsSim ;
std::unique_ptr<ESOldDigitizer> m_ESOldDigitizer ;
std::unique_ptr<ESElectronicsSimFast> m_ESElectronicsSimFast ;
std::unique_ptr<ESDigitizer> m_ESDigitizer ;

EcalElectronicsSim* m_ElectronicsSim ;
EcalCoder* m_Coder ;
std::unique_ptr<EBDigitizer> m_APDDigitizer ;
std::unique_ptr<EBDigitizer> m_BarrelDigitizer ;
std::unique_ptr<EEDigitizer> m_EndcapDigitizer ;

EcalElectronicsSim* m_APDElectronicsSim ;
EcalCoder* m_APDCoder ;
std::unique_ptr<EcalElectronicsSim> m_ElectronicsSim ;
std::unique_ptr<EcalCoder> m_Coder ;

std::unique_ptr<EcalElectronicsSim> m_APDElectronicsSim ;
std::unique_ptr<EcalCoder> m_APDCoder ;

const CaloGeometry* m_Geometry ;

CorrelatedNoisifier<EcalCorrMatrix>* m_EBCorrNoise[3] ;
CorrelatedNoisifier<EcalCorrMatrix>* m_EECorrNoise[3] ;
std::array< std::unique_ptr<CorrelatedNoisifier<EcalCorrMatrix> >, 3 > m_EBCorrNoise ;
std::array< std::unique_ptr<CorrelatedNoisifier<EcalCorrMatrix> >, 3 > m_EECorrNoise ;

std::vector<CLHEP::HepRandomEngine*> randomEngines_;
};
Expand Down

0 comments on commit ddc6756

Please sign in to comment.