diff --git a/RecoTauTag/RecoTau/plugins/TauDiscriminationAgainstElectronDeadECAL.cc b/RecoTauTag/RecoTau/plugins/TauDiscriminationAgainstElectronDeadECAL.cc index 4a94dc614ca58..2905fb0401124 100644 --- a/RecoTauTag/RecoTau/plugins/TauDiscriminationAgainstElectronDeadECAL.cc +++ b/RecoTauTag/RecoTau/plugins/TauDiscriminationAgainstElectronDeadECAL.cc @@ -37,8 +37,10 @@ class TauDiscriminationAgainstElectronDeadECAL : public TauDiscriminationProduce double discriminate(const TauRef& tau) const override { if (verbosity_) { edm::LogPrint(TauDiscriminationProducerBase<TauType, TauDiscriminator>::getTauTypeString() + "AgainstEleDeadECAL") - << "<" + TauDiscriminationProducerBase<TauType, TauDiscriminator>::getTauTypeString() + "AgainstElectronDeadECAL::discriminate>:"; - edm::LogPrint(TauDiscriminationProducerBase<TauType, TauDiscriminator>::getTauTypeString() + "AgainstEleDeadECAL") << " moduleLabel = " << moduleLabel_; + << "<" + TauDiscriminationProducerBase<TauType, TauDiscriminator>::getTauTypeString() + + "AgainstElectronDeadECAL::discriminate>:"; + edm::LogPrint(TauDiscriminationProducerBase<TauType, TauDiscriminator>::getTauTypeString() + "AgainstEleDeadECAL") + << " moduleLabel = " << moduleLabel_; edm::LogPrint(TauDiscriminationProducerBase<TauType, TauDiscriminator>::getTauTypeString() + "AgainstEleDeadECAL") << " tau: Pt = " << tau->pt() << ", eta = " << tau->eta() << ", phi = " << tau->phi(); } diff --git a/RecoTauTag/RecoTau/src/TauDiscriminationProducerBase.cc b/RecoTauTag/RecoTau/src/TauDiscriminationProducerBase.cc index a21fe26fc838c..50d25e568e6cd 100644 --- a/RecoTauTag/RecoTau/src/TauDiscriminationProducerBase.cc +++ b/RecoTauTag/RecoTau/src/TauDiscriminationProducerBase.cc @@ -40,7 +40,7 @@ TauDiscriminationProducerBase<TauType, TauDiscriminator, TauDiscriminatorDataTyp TauDiscriminationProducerBase(const edm::ParameterSet& iConfig) : moduleLabel_(iConfig.getParameter<std::string>("@module_label")) { // tau collection to discriminate - TauProducer_ = iConfig.getParameter<edm::InputTag>(getTauTypeString()+"Producer"); + TauProducer_ = iConfig.getParameter<edm::InputTag>(getTauTypeString() + "Producer"); Tau_token = consumes<TauCollection>(TauProducer_); // prediscriminant operator @@ -172,7 +172,7 @@ template <class TauType, class TauDiscriminator, class TauDiscriminatorDataType, void TauDiscriminationProducerBase<TauType, TauDiscriminator, TauDiscriminatorDataType, ConsumeType>:: fillProducerDescriptions(edm::ParameterSetDescription& desc) { // helper function, it fills the description of the Producers parameter - desc.add<edm::InputTag>(getTauTypeString()+"Producer", edm::InputTag("fixme")); + desc.add<edm::InputTag>(getTauTypeString() + "Producer", edm::InputTag("fixme")); { edm::ParameterSetDescription pset_prediscriminants; pset_prediscriminants.add<std::string>("BooleanOperator", "AND"); @@ -192,12 +192,14 @@ void TauDiscriminationProducerBase<TauType, TauDiscriminator, TauDiscriminatorDa } template <class TauType, class TauDiscriminator, class TauDiscriminatorDataType, class ConsumeType> -std::string TauDiscriminationProducerBase<TauType, TauDiscriminator, TauDiscriminatorDataType, ConsumeType>:: - getTauTypeString() { - if(std::is_same<TauType, reco::PFTau>::value) return "PFTau"; - if(std::is_same<TauType, pat::Tau>::value) return "PATTau"; +std::string +TauDiscriminationProducerBase<TauType, TauDiscriminator, TauDiscriminatorDataType, ConsumeType>::getTauTypeString() { + if (std::is_same<TauType, reco::PFTau>::value) + return "PFTau"; + if (std::is_same<TauType, pat::Tau>::value) + return "PATTau"; throw cms::Exception("TauDiscriminationProducerBase") - << "Unsupported TauType used. You must use either PFTau or PATTau."; + << "Unsupported TauType used. You must use either PFTau or PATTau."; } // compile our desired types and make available to linker