Update of tau EDM in r21 (xAODJiveXML-00-01-57)

Former-commit-id: 58531bb22b52d090605846891b95f8356fbe4433

PhysicsAnalysis/AnalysisEventDisplay/xAODJiveXML/share/xAODJiveXML_DataTypes.py

@@ -26,7 +26,7 @@ ToolSvc += thexAODElectronRetriever
 from xAODJiveXML.xAODJiveXMLConf import JiveXML__xAODMissingETRetriever
 thexAODMissingETRetriever = JiveXML__xAODMissingETRetriever (name = "xAODMissingETRetriever")
 #thexAODMissingETRetriever.StoreGateKey = "MET_RefFinal"
-thexAODMissingETRetriever.FavouriteMETCollection="MET_Reference_AntiKt4LCTopo"
+thexAODMissingETRetriever.FavouriteMETCollection="MET_Reference_AntiKt4EMTopo"
 ## If this list is not set, all other collections will be retrieved
 thexAODMissingETRetriever.OtherMETCollections=["MET_Calo","MET_LocHadTopo","MET_Core_AntiKt4LCTopo"]
 #### to request all collections:

PhysicsAnalysis/AnalysisEventDisplay/xAODJiveXML/src/xAODCaloClusterRetriever.cxx

@@ -157,12 +157,14 @@ namespace JiveXML {
 // sanity cut: emfrac should be within [0,1]
       if ( emfrac > 1.0 ) emfrac = 1.;
       if ( emfrac < 0.0 ) emfrac = 0.;
-      emfracVec.push_back( emfrac );
-
-      label = "AllMeV_SumEMSampl=" + DataType( eInSample ).toString() +
-  	"_SumAllSampl=" + DataType( eInSampleFull ).toString() +
-  	"_calcEMFrac=" + DataType( rawemfrac ).toString()+
-  	"_outEMFrac=" + DataType( emfrac ).toString();
+      emfracVec.push_back(  DataType(emfrac).toString() );
+
+      if ( DataType( eInSample ).toString() != 0. ){
+       label = "AllMeV_SumEMSampl=" + DataType( eInSample ).toString() +
+  	 "_SumAllSampl=" + DataType( eInSampleFull ).toString() +
+  	 "_calcEMFrac=" + DataType( rawemfrac ).toString()+
+  	 "_outEMFrac=" + DataType( emfrac ).toString();
+      }else{ label = "n_a"; }
       eInSample = 0.;
       eInSampleFull = 0.;
 

PhysicsAnalysis/AnalysisEventDisplay/xAODJiveXML/src/xAODTauRetriever.cxx

@@ -7,6 +7,7 @@
 #include "CLHEP/Units/SystemOfUnits.h"
 
 #include "xAODTau/TauJetContainer.h" 
+#include "xAODTau/TauxAODHelpers.h"
 
 namespace JiveXML {
 
@@ -127,8 +128,12 @@ namespace JiveXML {
       // InnerDetector/InDetRecAlgs/InDetPriVxFinder/InDetVxLinksToTrackParticles
 
       int trkCnt = 0;
+#ifndef XAODTAU_VERSIONS_TAUTRACK_V1_H      
       const std::vector< ElementLink< xAOD::TrackParticleContainer > > tpLinks =  (*tauItr)->trackLinks();
-   
+#else
+      const std::vector< ElementLink< xAOD::TrackParticleContainer > > tpLinks =  xAOD::TauHelpers::trackParticleLinks(*tauItr);
+#endif
+      
       //iterating over the links
       unsigned int tp_size = tpLinks.size();
       numTracks.push_back(DataType( tp_size )); // same as:  (*tauItr)->nTracks()