wip

Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/CaloMuonScoreTool.h

@@ -89,6 +89,7 @@ private:
   std::string m_modelFileName;
 
   ToolHandle <Trk::IParticleCaloExtensionTool> m_caloExtensionTool{this, "ParticleCaloExtensionTool", ""};
+
   ToolHandle <Rec::IParticleCaloCellAssociationTool> m_caloCellAssociationTool{this, "ParticleCaloCellAssociationTool", ""}; 
 
   std::unique_ptr< Ort::Session > m_session;

Reconstruction/MuonIdentification/CaloTrkMuIdTools/share/CaloTrkMuIdTools_jobOptions.py

@@ -62,6 +62,7 @@ ToolSvc += CaloMuonLikelihoodTool
 
 ### Configure CaloMuonScoreTool ###
 from CaloTrkMuIdTools.CaloTrkMuIdToolsConf import CaloMuonScoreTool as ConfiguredCaloMuonScoreTool
+print("Configuring this!!!")
 CaloMuonScoreTool = ConfiguredCaloMuonScoreTool(TrackEnergyInCaloTool = TrackEnergyInCaloTool)
 ToolSvc += CaloMuonScoreTool
 

Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCaloTagTool.cxx

@@ -62,8 +62,8 @@ namespace MuonCombined {
     if( m_doCaloLR ) ATH_CHECK( m_caloMuonLikelihood.retrieve() );
     else m_caloMuonLikelihood.disable();
 
-    if( m_doCaloMuonScore ) ATH_CHECK( m_caloMuonScore.retrieve() );
-    else m_caloMuonScore.disable();
+    if( m_doCaloMuonScore ) ATH_CHECK( m_caloMuonScoreTool.retrieve() );
+    else m_caloMuonScoreTool.disable();
 
     ATH_CHECK( m_caloMuonTagLoose.retrieve()   );
     ATH_CHECK( m_caloMuonTagTight.retrieve()   );
@@ -212,7 +212,7 @@ namespace MuonCombined {
 	likelihood = m_caloMuonLikelihood->getLHR(tp, caloClusterCont);
       }
       if(m_doCaloMuonScore || 1){
-	muon_score = m_caloMuonScore->getMuonScore(tp);
+	muon_score = m_caloMuonScoreTool->getMuonScore(tp);
       }
       ATH_MSG_DEBUG("Track found with tag " << tag << ", LHR " << likelihood << " and muon score " << muon_score);
       // --- If both the taggers do not think it's a muon, forget about it ---

Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCaloTagTool.h

@@ -100,7 +100,7 @@ namespace MuonCombined {
     
     // --- CaloTrkMuIdTools ---
     ToolHandle<ICaloMuonLikelihoodTool>  m_caloMuonLikelihood{this,"CaloMuonLikelihoodTool","CaloMuonLikelihoodTool/CaloMuonLikelihoodTool"};
-    ToolHandle<ICaloMuonScoreTool>  m_caloMuonScore{this, "CaloMuonScoreTool", "CaloMuonScoreTool/CaloMuonScoreTool"};
+    ToolHandle<ICaloMuonScoreTool>  m_caloMuonScoreTool{this, "CaloMuonScoreTool", "CaloMuonScoreTool/CaloMuonScoreTool"};
 
     ToolHandle<ICaloMuonTag>             m_caloMuonTagLoose{this,"CaloMuonTagLoose","CaloMuonTag/CaloMuonTagLoose","CaloTrkMuIdTools::CaloMuonTag for loose tagging"}; 
     ToolHandle<ICaloMuonTag>             m_caloMuonTagTight{this,"CaloMuonTagTight","CaloMuonTag/CaloMuonTag","CaloTrkMuIdTools::CaloMuonTag for tight tagging"}; 

Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCaloTagTool.py

@@ -48,7 +48,10 @@ def CaloMuonLikelihoodTool(name='CaloMuonLikelihoodTool', **kwargs ):
     return CfgMgr.CaloMuonLikelihoodTool(name,**kwargs)
 
 def CaloMuonScoreTool(name='CaloMuonScoreTool', **kwargs ):
+    from TrackToCalo.TrackToCaloConf import Rec__ParticleCaloCellAssociationTool
+    caloCellAssociationTool = Rec__ParticleCaloCellAssociationTool(ParticleCaloExtensionTool = getPublicTool("MuonParticleCaloExtensionTool"))
     kwargs.setdefault("ParticleCaloExtensionTool",       getPublicTool("MuonParticleCaloExtensionTool") )
+    kwargs.setdefault("ParticleCaloCellAssociationTool",       caloCellAssociationTool )
     return CfgMgr.CaloMuonScoreTool(name,**kwargs)
 
 def MuonCaloTagTool( name='MuonCaloTagTool', **kwargs ):  
@@ -59,6 +62,7 @@ def MuonCaloTagTool( name='MuonCaloTagTool', **kwargs ):
     kwargs.setdefault("CaloMuonTagLoose",       CaloMuonTagLoose )
     kwargs.setdefault("CaloMuonTagTight",       CaloMuonTagTight )
     kwargs.setdefault("CaloMuonLikelihoodTool", getPrivateTool("CaloMuonLikelihoodTool") )
+    kwargs.setdefault("CaloMuonScoreTool", getPrivateTool("CaloMuonScoreTool") )
     kwargs.setdefault("TrackDepositInCaloTool", getPublicTool("TrackDepositInCaloTool") )
     kwargs.setdefault("TrackSelectorTool",      getPublicTool("CaloTrkMuIdAlgTrackSelectorTool") )
     kwargs.setdefault("doCaloLR",               True )

Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecExampleConfigDb.py

@@ -82,6 +82,7 @@ addTool("MuonCombinedRecExample.MuonCaloTagTool.TrackDepositInCaloTool","TrackDe
 addTool("MuonCombinedRecExample.MuonCaloTagTool.CaloMuonTagLoose","CaloMuonTagLoose")
 addTool("MuonCombinedRecExample.MuonCaloTagTool.CaloMuonTag","CaloMuonTag")
 addTool("MuonCombinedRecExample.MuonCaloTagTool.CaloMuonLikelihoodTool","CaloMuonLikelihoodTool")
+addTool("MuonCombinedRecExample.MuonCaloTagTool.CaloMuonScoreTool","CaloMuonScoreTool")
 
 ####### muid tools
 addTool("MuonCombinedRecExample.MuonCombinedFitTools.MuonMatchQuality","MuonMatchQuality")

Reconstruction/MuonIdentification/muonEvent/muonEvent/CaloEnergy.h

@@ -53,7 +53,7 @@ public:
                 float   sigmaMinusDeltaE=0.0,
                 float   sigmaPlusDeltaE=0.0,
 		unsigned short energyLossType=0,
-		float          likelhoold=0,
+		float          likelihood=0,
 		float   muonScore=0,
 		unsigned short tag=0);