Merge pull request #79 from steggema/CMSSW_10_1_X_TauRecoMiniAODReview

Two additional review updates:
slava77 · May 11, 2018 · 2117526 · 2117526
2 parents 3715377 + 5623774
commit 2117526
Show file tree

Hide file tree

Showing 2 changed files with 96 additions and 1 deletion.
diff --git a/DataFormats/TauReco/src/classes_def_2.xml b/DataFormats/TauReco/src/classes_def_2.xml
@@ -241,9 +241,104 @@ for(auto const& ref : onfile.selectedIsolationPFGammaCands_) {
 </ioread>
 
 
+<ioread sourceClass = "reco::PFTau" version="[21-]"
+ targetClass="reco::PFTau"
+source = ""
+target="leadPFChargedHadrCand_">
+<![CDATA[
+leadPFChargedHadrCand_.reset();
+]]>
+</ioread>
+
+<ioread sourceClass = "reco::PFTau" version="[21-]"
+ targetClass="reco::PFTau"
+source = ""
+target="leadPFNeutralCand_">
+<![CDATA[
+leadPFNeutralCand_.reset();
+]]>
+</ioread>
+
+<ioread sourceClass = "reco::PFTau" version="[21-]"
+ targetClass="reco::PFTau"
+source = ""
+target="leadPFCand_">
+<![CDATA[
+leadPFCand_.reset();
+]]>
+</ioread>
 
+<ioread sourceClass = "reco::PFTau" version="[21-]"
+ targetClass="reco::PFTau"
+source = ""
+target="selectedTransientSignalPFCands_">
+<![CDATA[
+selectedTransientSignalPFCands_.reset();
+]]>
+</ioread>
 
+<ioread sourceClass = "reco::PFTau" version="[21-]"
+ targetClass="reco::PFTau"
+source = ""
+target="selectedTransientSignalPFChargedHadrCands_">
+<![CDATA[
+selectedTransientSignalPFChargedHadrCands_.reset();
+]]>
+</ioread>
 
+<ioread sourceClass = "reco::PFTau" version="[21-]"
+ targetClass="reco::PFTau"
+source = ""
+target="selectedTransientSignalPFNeutrHadrCands_">
+<![CDATA[
+selectedTransientSignalPFNeutrHadrCands_.reset();
+]]>
+</ioread>
+
+<ioread sourceClass = "reco::PFTau" version="[21-]"
+ targetClass="reco::PFTau"
+source = ""
+target="selectedTransientSignalPFGammaCands_">
+<![CDATA[
+selectedTransientSignalPFGammaCands_.reset();
+]]>
+</ioread>
+
+<ioread sourceClass = "reco::PFTau" version="[21-]"
+ targetClass="reco::PFTau"
+source = ""
+target="selectedTransientIsolationPFCands_">
+<![CDATA[
+selectedTransientIsolationPFCands_.reset();
+]]>
+</ioread>
+
+<ioread sourceClass = "reco::PFTau" version="[21-]"
+ targetClass="reco::PFTau"
+source = ""
+target="selectedTransientIsolationPFChargedHadrCands_">
+<![CDATA[
+selectedTransientIsolationPFChargedHadrCands_.reset();
+]]>
+</ioread>
+
+<ioread sourceClass = "reco::PFTau" version="[21-]"
+ targetClass="reco::PFTau"
+source = ""
+target="selectedTransientIsolationPFNeutrHadrCands_">
+<![CDATA[
+selectedTransientIsolationPFNeutrHadrCands_.reset();
+]]>
+</ioread>
+
+<ioread sourceClass = "reco::PFTau" version="[21-]"
+ targetClass="reco::PFTau"
+source = ""
+target="selectedTransientIsolationPFGammaCands_">
+<![CDATA[
+selectedTransientIsolationPFGammaCands_.reset();
+]]>
+</ioread>
 
 
 <ioread sourceClass = "reco::PFTau" version="[1-]" 

diff --git a/RecoTauTag/TauTagTools/src/PFTauElementsOperators.cc b/RecoTauTag/TauTagTools/src/PFTauElementsOperators.cc
@@ -148,7 +148,7 @@ std::vector<reco::CandidatePtr> PFTauElementsOperators::PFChargedHadrCandsInAnnu
     const reco::Track* PFChargedHadrCand_track = (*iPFCand)->bestTrack();
     if (PFChargedHadrCand_track != nullptr) {
       if (fabs((*PFChargedHadrCand_track).dz(myPV.position())-refpoint_Z)<=PFChargedHadrCand_tracktorefpoint_maxDZ) filteredPFChargedHadrCands.push_back(*iPFCand);
-    } else throw cms::Exception("Type Mismatch") << "The PFTau was not made from PFCandidates, and this outdated algorithm was not updated to cope with PFTaus made from other Candidates.\n";
+    } else throw cms::Exception("Missing information") << "No associated track information is saved in charged hadron candidate.\n";
   }
   std::vector<reco::CandidatePtr> theFilteredPFCandsInAnnulus=PFCandsInAnnulus(filteredPFChargedHadrCands,myVector,innercone_metric,innercone_size,outercone_metric,outercone_size,minPt);
   return theFilteredPFCandsInAnnulus;