Merge branch 'removeConfigMacro_master' into 'master'

Fix ATLASRECTS-3960

Closes ATLASRECTS-3960

See merge request !1071

MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/CMakeLists.txt

@@ -37,5 +37,5 @@ atlas_add_component( MuonPhysValMonitoring
                      LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel AthenaMonitoringLib xAODBase xAODCore xAODEventInfo xAODMuon xAODTracking xAODTrigMuon xAODTrigger xAODTruth MuonHistUtils IsolationSelectionLib MuonSelectorToolsLib MuonCombinedToolInterfaces TrkToolInterfaces TrkValHistUtils TrigDecisionToolLib )
 
 # Install files from the package:
-atlas_install_scripts( macros/*.py macros/*.sh macros/*.C )
+atlas_install_scripts( macros/MuonValidation_*.py macros/MuonValidation_*.sh )
 

MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/cmt/requirements

@@ -44,7 +44,7 @@ private
 ## default is to make component library
 library MuonPhysValMonitoring *.cxx components/*.cxx
 
-apply_pattern declare_scripts files="-s=$(MuonPhysValMonitoring_root)/macros *.py *.sh *.C"
+apply_pattern declare_scripts files="-s=$(MuonPhysValMonitoring_root)/macros MuonValidation_*.py MuonValidation_*.sh"
 
 #macro_append cppflags ' -std=c++11 '
 #macro_append use_linkopts ' -std=c++11 ' 

MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/macros/AddGaussianFitToPulls.py → MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/macros/MuonValidation_AddGaussianFitToPulls.py

@@ -71,6 +71,5 @@ def main( args ):
 #---------------------------------------------------------------------------
 
 if __name__ == "__main__":
-    ROOT.gROOT.Macro("rootlogon.C")
     ROOT.gROOT.SetBatch()
     main( sys.argv )

MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/macros/CreatePullProfiles.py → MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/macros/MuonValidation_CreatePullProfiles.py

@@ -5,7 +5,7 @@ import os
 from array import array
 import itertools
 import ROOT
-from CreateResolutionProfiles import *
+from MuonValidation_CreateResolutionProfiles import *
 
 #---------------------------------------------------------------------------
 
@@ -76,6 +76,5 @@ def main( args ):
 #---------------------------------------------------------------------------
 
 if __name__ == "__main__":
-    ROOT.gROOT.Macro("rootlogon.C")
     ROOT.gROOT.SetBatch()
     main( sys.argv )

MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/macros/CreateResolutionProfiles.py → MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/macros/MuonValidation_CreateResolutionProfiles.py

@@ -223,6 +223,5 @@ def main( args ):
 #---------------------------------------------------------------------------
 
 if __name__ == "__main__":
-    ROOT.gROOT.Macro("rootlogon.C")
     ROOT.gROOT.SetBatch()
     main( sys.argv )

MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/macros/CreateMuonValidationSlides.py → MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/macros/MuonValidation_CreateSlides.py

@@ -8,7 +8,7 @@ import sys
 import os
 import argparse
 from commands import getstatusoutput
-from config import *
+from MuonValidation_CreateSlides_config import *
 
 #############################################################################
 
@@ -305,6 +305,6 @@ if __name__ == "__main__":
         print( 'INFO This program requires Python version 2.7 or greater' )
         exit(1)
 
-    ROOT.gROOT.Macro("rootlogon.C")
+    #ROOT.gROOT.Macro("rootlogon.C")
     ROOT.gROOT.SetBatch()
     main()

MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/macros/runPostProcessMacros.sh → MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/macros/MuonValidation_runPostProcessMacrosRtt.sh

@@ -14,13 +14,13 @@ tmpfile=$inputfile.temp.root
 #  showing overall efficiency, resolution, scale, etc.
 
 ## Creates efficiency and other ratio plots
-#CreateEffAndRecoFracPlots.py $tmpfile #doAverage
+#MuonValidation_CreateEffAndRecoFracPlots.py $tmpfile #doAverage
 
 ## Creates pt resolution and pt scale plots. doBinned option makes res plots for each bin in 2D hists
-CreateResolutionProfiles.py $tmpfile #doAverage doBinned
+MuonValidation_CreateResolutionProfiles.py $tmpfile #doAverage doBinned
 
 ## Creates profiles of pull plots over pt
-#CreatePullProfiles.py $tmpfile #doAverage
+#MuonValidation_CreatePullProfiles.py $tmpfile #doAverage
 
 ## Normalizes all plots to unity (for comparisons). MUST RUN AFTER EFFICIENCY MACROS!!! OTHERWISE EFFICIENCY WILL BE WRONG!!!!
 # normalizator.py $tmpfile

MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/macros/validator.py

@@ -14,6 +14,8 @@ import re
 import os
 import math
 
+LABELS = []
+
 def GoToDirectory(directory):
   cwd = os.getcwd()
   print os.getcwd()
@@ -52,20 +54,21 @@ class Validator(object):
       self.CompareFunc = compareFunc
       self.DoNormalization = normalization
   
-  def CompareFiles(self,reference, test, dirName):
-    refFile  = TFile.Open(reference)
-    testFile = TFile.Open(test)
-    self.CompareDirectories(refFile, testFile, dirName)
+  def CompareFiles(self, fileNames, dirName):
+    openedFiles = [ TFile.Open(f) for f in fileNames ]
+    self.CompareDirectories(openedFiles, dirName)
   
-  def CompareDirectories(self, refDir, testDir, dirName):
+  def CompareDirectories(self, dirs, dirName):
     if (self.structDirs): GoToDirectory(dirName)
+    refDir = dirs[0]
     newRefDir = refDir.GetDirectory(dirName)
-    if not testDir:
-      print 'ERROR --------- test dir not found: ', dirName
-      newTestDir=0
-      return
-    else:
-      newTestDir = testDir.GetDirectory(dirName)
+    for testDir in dirs:
+      if testDir == refDir: continue
+      if not testDir:
+        print 'ERROR --------- test dir not found: ', dirName, testDir
+        return
+
+    newTestDirs = [ testDir.GetDirectory(dirName) for testDir in dirs ]
     
     theDir = newRefDir
     # if not newRefDir:
@@ -73,7 +76,7 @@ class Validator(object):
     #   theDir = newTestDir
 
     for key in theDir.GetListOfKeys():
-     
+          
       obj = key.ReadObj()
 
       #2D histograms cannot be compared; skip
@@ -82,28 +85,29 @@ class Validator(object):
       
       if obj.IsA().InheritsFrom(ROOT.TH1.Class()):
         print key.GetName()
-        testHist = newTestDir.Get(key.GetName())
-        if testHist:
-          self.CompareHistograms(obj, testHist, newRefDir.GetPath())
+        #testHist = newTestDir.Get(key.GetName())
+        testHists = [ newTestDir.Get(key.GetName()) for newTestDir in newTestDirs ]
+        self.CompareHistograms( testHists, newRefDir.GetPath())
       elif obj.IsA().InheritsFrom(ROOT.TDirectory.Class()):
-        self.CompareDirectories(newRefDir, newTestDir, obj.GetName())
+        self.CompareDirectories( newTestDirs, obj.GetName())
     if (self.structDirs): os.chdir("..")
   
-  def CompareHistograms(self, refHist, testHist, path):
+  def CompareHistograms(self, hists, path):
     # print self.excludedStrings, refHist.GetName()
     # if any(exString in refHist.GetName() for exString in self.excludedStrings): 
     #   print "Skipped " + path + "/" + refHist.GetName()
     #   return
-
     #@@@if self.CompareFunc(refHist, testHist): print path + refHist.GetName() + " looks ok"
     #else:
-    self.MakeComparisonPlot(refHist, testHist, path)
+    #self.MakeComparisonPlot(refHist, testHist, path)
+    self.MakeComparisonPlot(hists, path)
   
-  def MakeComparisonPlot(self,refHist, testHist, path):
-    def SetBounds(refHist, testHist, ymin=0, ymax=0):
+  #def MakeComparisonPlot(self,refHist, testHist, path):
+  def MakeComparisonPlot(self, hists, path):
+    def SetBounds(hists, ymin=0, ymax=0):
       if (ymin==0 and ymax==0):
-        ymin = min(refHist.GetMinimum(), testHist.GetMinimum())
-        ymax = max(refHist.GetMaximum(), testHist.GetMaximum())
+        ymin = min( [ h.GetMinimum() for h in hists ] )
+        ymax = min( [ h.GetMaximum() for h in hists ] )
         if ymin>0 and ymax>0:
           ymin = 0
         else:          
@@ -112,11 +116,11 @@ class Validator(object):
         # if ymin<0 and ymax>0:
         #     if ymax>0 and abs(minimum)>ymax:
         #   ymax = -minimum
-      refHist.SetMinimum(ymin)
-      refHist.SetMaximum(ymax)
-      return refHist
+      hists[0].SetMinimum(ymin)
+      hists[0].SetMaximum(ymax)
+      return hists[0]
     ################################## end SetBounds
-            
+          
     # try:
     #   refHist.Scale(1.0/refHist.Integral())
     #   testHist.Scale(1.0/testHist.Integral())
@@ -133,29 +137,37 @@ class Validator(object):
     padRatio.Draw()
     ROOT.TLine()
     padMain.cd()
-
-    #leg = ROOT.TLegend(0.82,0.78,0.96,0.94)
-    leg = ROOT.TLegend(0.8,0.76,0.96,0.94)  
+    
+    leg = ROOT.TLegend(0.82,0.78,0.96,0.94)  
+    #leg = ROOT.TLegend(0.52,0.76,0.96,0.94)  
     #leg.SetFillColor(ROOT.kWhite)
     leg.SetFillStyle(0)
     leg.SetBorderSize(0)
     leg.SetTextFont(43)
-    leg.SetTextSizePixels(32)
-    leg.AddEntry(refHist, "ref", 'lp')
-    leg.AddEntry(testHist, "test",'lp')
-  
+    leg.SetTextSizePixels(32)    
+    
+    refHist = hists[0]
     refHist.SetLineColor(17)
     #refHist.SetFillColor(30)
 
-    if self.DoNormalization and not "_Eff_" in refHist.GetName() and not "_eff" in refHist.GetName():
-      i1 = 1.*refHist.Integral()
-      i2 = 1.*testHist.Integral()
-      if i1>i2:
-        refHist.Scale(i2/i1)
-      elif i2>0:
-        testHist.Scale(i1/i2)
-        
-    refHist = SetBounds(refHist, testHist)
+    ## @@@ Legend!!!
+    #leg.AddEntry(hists[0], 'ref', 'lp')
+    #leg.AddEntry(hists[1], 'test', 'lp')
+    #if len(hists)>2:
+    #   for i in range(2,len(hists)):
+    #       leg.AddEntry(hists[i], 'test{0}'.format(i), 'lp')
+    for i in range(0,len(hists)):      
+      leg.AddEntry(hists[i], LABELS[i], 'lp')
+              
+    if self.DoNormalization and not "_Eff_" in refHist.GetName() and not "_eff" in refHist.GetName() and not "_Eff" in refHist.GetName():
+      for h in hists:
+        n = h.Integral()
+        if n>0:
+          h.Scale(1./n)
+          for i in range (1,h.GetXaxis().GetNbins()+1):
+            h.SetBinError(i,h.GetBinError(i)/n);
+                
+    refHist = SetBounds(hists)
     
     ref_textsize = 32./(padMain.GetWh()*padMain.GetAbsHNDC())
     refHist.GetYaxis().SetLabelSize( ref_textsize )
@@ -173,52 +185,80 @@ class Validator(object):
 
     #testHist.Rebin(2)
     #refHist.Rebin(2);
-
-    if refHist.GetMaximum()>testHist.GetMaximum():
-      refHist.DrawCopy("e")
-      testHist.DrawCopy("ehistsame")
-      refHist.DrawCopy("ehistsame")
-    else:
-      testHist.DrawCopy("ehist")
-      refHist.DrawCopy("ehistsame")
+    histmax = refHist
+    histmax.DrawCopy('e')
+    # for h in hists:
+    #   if h.GetMaximum() > refHist.GetMaximum():
+    #     histmax = h
+    #   if histmax == refHist:
+    #     histmax.DrawCopy("e")
+    #   else:
+    #     histmax.DrawCopy("ehist")
+    nh=0
+    for h in hists:
+      if h is not histmax:
+        if h==refHist:
+          h.DrawCopy('histsame')
+        else:
+          nh=nh+1
+          if nh>1:
+            h.SetMarkerStyle(0)
+            h.SetMarkerColor(0)
+            h.SetLineColor(8) # green
+            h.SetLineStyle(ROOT.kDashed)
+          h.DrawCopy('ehistsame')
+    # if refHist.GetMaximum()>histmax.GetMaximum():
+    #   refHist.DrawCopy("e")
+    #   testHist.DrawCopy("ehistsame")
+    #   refHist.DrawCopy("ehistsame")
+    # else:
+    #   testHist.DrawCopy("ehist")
+    #   refHist.DrawCopy("ehistsame")
       
     leg.Draw()
     padRatio.cd()
-    ratioHist = testHist.Clone()
-    ratioHist.Divide(refHist)
-    #ratioHist = SetBounds(ratioHist, ratioHist, 0.84,1.16)
-    ratioHist = SetBounds(ratioHist, ratioHist, 0.941,1.059)
-    for i in range(ratioHist.GetNbinsX()):
-      nref = refHist.GetBinContent(i)
-      ntest = testHist.GetBinContent(i)
-      if nref == 0 or ntest == 0:
-        ratioHist.SetBinError(i, 0)
-      else:
-        #error = nref/ntest*math.sqrt((refHist.GetBinError(i)/nref)**2 + (testHist.GetBinError(i)/ntest)**2)
-        error = nref/ntest* max(refHist.GetBinError(i)/nref, testHist.GetBinError(i)/ntest) 
-        ratioHist.SetBinError(i, error)
 
-    ratioHist_textsize = 32./(padRatio.GetWh()*padRatio.GetAbsHNDC())
-    ratioHist.GetYaxis().SetLabelSize( ratioHist_textsize )
-    ratioHist.GetXaxis().SetLabelSize( ratioHist_textsize )
-    ratioHist.GetXaxis().SetTitleSize( 1.2*ratioHist_textsize )
-    ratioHist.GetXaxis().SetTitleOffset(0.75)
-    ratioHist.GetXaxis().SetTitleColor(kAzure)
-    ratioHist.GetYaxis().SetTitleSize( ratioHist_textsize )
-    ratioHist.GetYaxis().SetTitleOffset(0.6)
+    for h in hists:
+      if h is refHist: continue
+      ratioHist = h.Clone()
+      ratioHist.Divide(refHist)
+      ratioHist = SetBounds( [ratioHist, ratioHist], 0.84,1.16) # 0.941,1.059
+      for i in range(ratioHist.GetNbinsX()):
+        nref = refHist.GetBinContent(i)
+        ntest = h.GetBinContent(i)
+        if nref == 0 or ntest == 0:
+          ratioHist.SetBinError(i, 0)
+        else:
+          #error = nref/ntest*math.sqrt((refHist.GetBinError(i)/nref)**2 + (testHist.GetBinError(i)/ntest)**2)
+          error = nref/ntest* max(refHist.GetBinError(i)/nref, h.GetBinError(i)/ntest) 
+          ratioHist.SetBinError(i, error)
+          
+      ratioHist_textsize = 32./(padRatio.GetWh()*padRatio.GetAbsHNDC())
+      ratioHist.GetYaxis().SetLabelSize( ratioHist_textsize )
+      ratioHist.GetXaxis().SetLabelSize( ratioHist_textsize )
+      ratioHist.GetXaxis().SetTitleSize( 1.2*ratioHist_textsize )
+      ratioHist.GetXaxis().SetTitleOffset(0.75)
+      ratioHist.GetXaxis().SetTitleColor(kAzure)
+      ratioHist.GetYaxis().SetTitleSize( ratioHist_textsize )
+      ratioHist.GetYaxis().SetTitleOffset(0.6)
 
     
-    ratioHist.SetLineColor(ROOT.kBlack)
-    ratioHist.SetMarkerStyle(24)
-    ratioHist.SetYTitle("test / ref")
-    ratioHist.Draw("p")
-    
-    lineRatio = ROOT.TLine( ratioHist.GetXaxis().GetXmin(), 1, 
-                            ratioHist.GetXaxis().GetXmax(), 1 ) 
-    lineRatio.SetLineColor( ROOT.kRed )
-    lineRatio.SetLineWidth( 2 )
-    lineRatio.Draw("same")
-
+      ratioHist.SetLineColor(ROOT.kBlack)
+      ratioHist.SetMarkerStyle(24)
+      ratioHist.SetYTitle("test / ref")
+      if h == hists[1]:
+        ratioHist.DrawCopy("p")
+        lineRatio = ROOT.TLine( ratioHist.GetXaxis().GetXmin(), 1, 
+                              ratioHist.GetXaxis().GetXmax(), 1 ) 
+        lineRatio.SetLineColor( ROOT.kRed )
+        lineRatio.SetLineWidth( 2 )
+        lineRatio.Draw("same")
+      else:
+        ratioHist.SetMarkerStyle(25)
+        ratioHist.SetMarkerColor(8)
+        ratioHist.SetLineColor(8)
+        ratioHist.DrawCopy("psame")
+      
     npath = ""
     if not self.structDirs:
       npath = path[path.find(":/")+2:] + "/"
@@ -242,23 +282,43 @@ def main( argv ):
 
   parser = argparse.ArgumentParser( description = 'Distribution Plotter' )
   parser.add_argument( '-s', '--structDirs', default = True, action = "store_true", help = ' if true, it creates directories following the same structure as in the root file to store the pdf plots')
-  parser.add_argument( '-r', '--reference', help = 'bla' )
-  parser.add_argument( '-t', '--test', help = 'Print cutflow' )
+  parser.add_argument( '-r', '--reference', help = 'The reference' )
+  parser.add_argument( '-t', '--test', help = 'The test' )
+  parser.add_argument( '-t2', '--test2', default ='', help = 'The additional test' )
   parser.add_argument( '-d', '--directory', default = "/", help = 'Print cutflow fror systematic variations' )
   parser.add_argument( '-e', '--exclude', default = "_bin_", help = 'histograms whose names contain the provided strings are not examined')
   parser.add_argument( '-n', '--normalize', default = False, action = "store_true", help = 'normalize histograms with larger stats for better comparison')
+  parser.add_argument( '-l', '--labels', default ='', help = 'Add text to legend for ref/test/test2, split with commas' )
+
   args = parser.parse_args()
 
+
   #ROOT.gROOT.Macro("rootlogon.C")
   ROOT.gROOT.SetBatch()
   #ROOT.gROOT.LoadMacro("./AtlasUtils.C") 
   ROOT.gROOT.LoadMacro("./AtlasStyle.C")
-
-  SetAtlasStyle()
+  ROOT.TH1.SetDefaultSumw2(ROOT.kTRUE)
   
+  SetAtlasStyle()
+
+  LABELS = []
+  if args.labels is '':
+    LABELS = [ 'Ref','Test' ]
+    if args.test2 is not '':
+      LABELS.append( 'Test2' )
+  else:
+    LABELS = args.labels.split(",")
+    #print LABELS
+    
+  # if you want to pass labels to legend directly from the file name...:
+  #LABELS.append( args.test.split('.')[2]+' '+args.test.split('.')[3] )
+  #
+    
   validator = Validator( args.structDirs, args.exclude, SameHist, args.normalize )
-  validator.CompareFiles(os.path.abspath(args.reference), os.path.abspath(args.test), args.directory)
-  #validator.CompareFiles(os.path.abspath(args.test), os.path.abspath(args.reference), args.directory)
+  if args.test2 == '':
+    allFiles = [ os.path.abspath(args.reference), os.path.abspath(args.test) ]
+  else:
+    allFiles = [ os.path.abspath(args.reference), os.path.abspath(args.test), os.path.abspath(args.test2) ]
  #======================================================================
 
 if __name__ == "__main__":

MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/src/MuonPhysValMonitoringTool.h

@@ -25,6 +25,8 @@
 #include "xAODTrigMuon/L2CombinedMuonContainer.h"
 #include "xAODTrigMuon/L2CombinedMuon.h"
 
+#include "xAODMuon/SlowMuon.h"
+
 // Tools
 #include "MuonSelectorTools/IMuonSelectionTool.h"
 #include "TrigDecisionTool/TrigDecisionTool.h"
@@ -41,11 +43,12 @@
 #include "TriggerMuonValidationPlots.h"
 #include "MuonTrackValidationPlots.h"
 #include "MuonSegmentValidationPlots.h"
+#include "SlowMuonValidationPlots.h"
 
 // Forward declaration
 namespace Rec {
-   class IMuonPrintingTool;
- }
+  class IMuonPrintingTool;
+}
 namespace MuonPhysValMonitoring {
 
 class MuonPhysValMonitoringTool
@@ -90,7 +93,8 @@ class MuonPhysValMonitoringTool
   /// Default constructor: 
   MuonPhysValMonitoringTool();
 
-  void handleMuon(const xAOD::Muon* mu);
+  void handleMuon(const xAOD::Muon* mu,const xAOD::SlowMuon *smu=0);
+  void handleSlowMuon(const xAOD::SlowMuon *smu);
   void handleTruthMuon(const xAOD::TruthParticle* truthMu);
   void handleMuonTrack(const xAOD::TrackParticle* tp, xAOD::Muon::TrackParticleType type);
   void handleMuonSegment(const xAOD::MuonSegment* muSeg);
@@ -109,6 +113,7 @@ class MuonPhysValMonitoringTool
   
   StatusCode bookValidationPlots(PlotBase& valPlots);
   const xAOD::Muon* findRecoMuon(const xAOD::TruthParticle* truthMu);
+  const xAOD::SlowMuon* findRecoSlowMuon(const xAOD::TruthParticle* truthMu);
   const xAOD::MuonSegment* findRecoMuonSegment(const xAOD::MuonSegment* truthMuSeg);
   xAOD::Muon* getCorrectedMuon(const xAOD::Muon &mu);
     
@@ -126,6 +131,7 @@ class MuonPhysValMonitoringTool
   std::string m_tracksName;
   std::string m_fwdtracksName;
   std::string m_muonsName;
+  std::string m_slowMuonsName;
   std::string m_muonsTruthName;
   std::string m_muonTracksName;
   std::string m_muonExtrapolatedTracksName;
@@ -170,6 +176,7 @@ class MuonPhysValMonitoringTool
   std::vector<std::string> m_selectMuonCategoriesStr;
   MuonPhysValMonitoringTool::MUCATEGORY getMuonSegmentTruthCategory(const xAOD::MuonSegment* truthMuSeg, const xAOD::TruthParticleContainer* muonTruthContainer);
   MuonPhysValMonitoringTool::MUCATEGORY getMuonTruthCategory(const xAOD::IParticle* prt);
+  MuonPhysValMonitoringTool::MUCATEGORY getMuonTruthCategory(const xAOD::Muon* prt);
   bool passesAcceptanceCuts(const xAOD::IParticle* prt);
   float deltaR(const xAOD::IParticle* prt1, const xAOD::IParticle* prt2);
   void SplitString(TString x, TString delim, std::vector<TString> &v);
@@ -189,6 +196,8 @@ class MuonPhysValMonitoringTool
   Muon::RecoMuonTrackPlotOrganizer*  m_oUnmatchedRecoMuonTrackPlots;
   Muon::MuonSegmentPlots* m_oUnmatchedRecoMuonSegmentPlots;
 
+  std::vector<SlowMuonValidationPlots*> m_slowMuonValidationPlots;
+  
   //overview hists
   std::vector<TH1F*> h_overview_nObjects;
   TH1F* h_overview_reco_category;
@@ -200,10 +209,10 @@ class MuonPhysValMonitoringTool
 
   std::vector<const xAOD::TruthParticle*> m_vMatchedTruthMuons;
   std::vector<const xAOD::Muon*> m_vMatchedMuons;
+  std::vector<const xAOD::SlowMuon*> m_vMatchedSlowMuons;
   std::vector<const xAOD::TrackParticle*> m_vMatchedMuonTracks;
   std::vector<const xAOD::MuonSegment*> m_vMatchedMuonSegments;
   std::vector<const xAOD::TrackParticle*> m_vZmumuIDTracks;
-  std::vector<const xAOD::TrackParticle*> m_vZmumuMSTracks;
   std::vector<const xAOD::TrackParticle*> m_vZmumuMETracks;
   std::vector<const xAOD::Muon*> m_vZmumuMuons;
   std::vector<const xAOD::Muon*> m_vEFMuons;

MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/src/MuonValidationPlots.cxx

@@ -8,9 +8,8 @@
 typedef ElementLink< xAOD::TrackParticleContainer > TrackLink;
 typedef ElementLink< xAOD::MuonContainer > MuonLink;
 
-MuonValidationPlots::MuonValidationPlots(PlotBase* pParent, std::string sDir,std::vector<int> wps,std::vector<unsigned int> authors, bool isData, bool doBinnedResolutionPlots, bool /*doMuonTree*/):
-  PlotBase(pParent, sDir),  m_selectedWPs(wps), m_selectedAuthors(authors), m_truthSelections(2,""), m_oTruthRelatedMuonPlots(NULL), m_isData(isData)
-
+MuonValidationPlots::MuonValidationPlots(PlotBase* pParent, std::string sDir,std::vector<int> wps,std::vector<unsigned int> authors, bool isData, bool doBinnedResolutionPlots, bool doSeparateSAFMuons, bool /*doMuonTree*/):
+  PlotBase(pParent, sDir),  m_selectedWPs(wps), m_selectedAuthors(authors), m_truthSelections(2,""), m_oTruthRelatedMuonPlots(NULL), m_isData(isData), m_doSeparateSAFMuons(doSeparateSAFMuons)
 {
   if (!m_isData) {
     m_truthSelections[0] = "all"; //no selection on truth muons (minimum selection is |eta|<2.5, pt>5 GeV, defined in MuonPhysValMonitoringTool::handleTruthMuon() 
@@ -48,13 +47,24 @@ MuonValidationPlots::MuonValidationPlots(PlotBase* pParent, std::string sDir,std
   //define a histogram class for each of the selected muon authors (+one inclusive for all authors)
   for (unsigned int i=0; i<m_selectedAuthors.size(); i++) {
     std::string sAuthor = Muon::EnumDefs::toString( (xAOD::Muon::Author) m_selectedAuthors[i] );
+    if (sAuthor=="CaloTag") sAuthor="CaloTagTight"; 
     m_oRecoMuonPlots_perAuthor.push_back(new Muon::RecoMuonPlotOrganizer(this, "reco/"+sAuthor, (sAuthor=="MuidCo")? &allPlotCategories: &selectedPlotCategories));
     if (!m_isData) m_oTruthRelatedMuonPlots_perAuthor.push_back(new Muon::TruthRelatedMuonPlotOrganizer(this, "matched/"+sAuthor, doBinnedResolutionPlots));
   }
 
-  //define histogram class for SiliconAssociatedForwardMuons 
-  m_oRecoMuonPlots_SiAssocFwrdMu.push_back(new Muon::RecoMuonPlotOrganizer(this, "reco/SiAssocForward", &selectedPlotCategories));  
-  if (!m_isData) m_oTruthRelatedMuonPlots_SiAssocFwrdMu.push_back(new Muon::TruthRelatedMuonPlotOrganizer(this, "matched/SiAssocForward", doBinnedResolutionPlots)); 
+   //define histogram class for loose CaloTag and append to author plots, not very nice workaround though
+   for (unsigned int i=0; i<m_selectedAuthors.size(); i++) { 
+     if ((xAOD::Muon::Author) m_selectedAuthors[i]==xAOD::Muon::CaloTag){ //found CaloTag in list, also do CaloTagLoose
+       m_oRecoMuonPlots_perAuthor.push_back(new Muon::RecoMuonPlotOrganizer(this, "reco/CaloTagLoose",  &selectedPlotCategories));
+       if (!m_isData) m_oTruthRelatedMuonPlots_perAuthor.push_back(new Muon::TruthRelatedMuonPlotOrganizer(this, "matched/CaloTagLoose", doBinnedResolutionPlots));
+      }
+   }
+
+  //define histogram class for SiliconAssociatedForwardMuons
+  if (m_doSeparateSAFMuons) {
+    m_oRecoMuonPlots_SiAssocFwrdMu.push_back(new Muon::RecoMuonPlotOrganizer(this, "reco/SiAssocForward", &selectedPlotCategories));  
+    if (!m_isData) m_oTruthRelatedMuonPlots_SiAssocFwrdMu.push_back(new Muon::TruthRelatedMuonPlotOrganizer(this, "matched/SiAssocForward", doBinnedResolutionPlots));
+  }
 
 }
 
@@ -122,14 +132,19 @@ void MuonValidationPlots::fillRecoMuonPlots(const xAOD::Muon& mu)
 	if (ipar<11) continue;
       }
 
-      //filter SiliconAssociatedForwardMuons 
-      if (mu.muonType()!=(xAOD::Muon::MuonType) xAOD::Muon::SiliconAssociatedForwardMuon) m_oRecoMuonPlots_perAuthor[i]->fill(mu);	     
+      //filter SiliconAssociatedForwardMuons
+      if (mu.muonType()!=(xAOD::Muon::MuonType)xAOD::Muon::SiliconAssociatedForwardMuon || !m_doSeparateSAFMuons) m_oRecoMuonPlots_perAuthor[i]->fill(mu);	     
     }
   }
   //fill SiliconAssociatedForwardMuons
   for (unsigned int i=0; i<m_oTruthRelatedMuonPlots_SiAssocFwrdMu.size();i++){
     if (mu.muonType()==(xAOD::Muon::MuonType) xAOD::Muon::SiliconAssociatedForwardMuon) m_oRecoMuonPlots_SiAssocFwrdMu[i]->fill(mu);
   }
+  //fill CaloTagLoose (one additional plot in plot list)
+  unsigned int counter= m_selectedAuthors.size();
+  if ( counter+1==m_oRecoMuonPlots_perAuthor.size()){
+    if (mu.isAuthor(xAOD::Muon::CaloTag)) m_oRecoMuonPlots_perAuthor[counter]->fill(mu);
+  }
 }
 
 void MuonValidationPlots::fillTruthMuonPlots(const xAOD::TruthParticle &truthMu)
@@ -160,7 +175,7 @@ void MuonValidationPlots::fill(const xAOD::TruthParticle* truthMu, const xAOD::M
     m_oTruthRelatedMuonPlots->fill(*truthMu, *mu, MSTracks);
     //fill SiliconAssociatedForwardMuons
     for (unsigned int i=0; i<m_oTruthRelatedMuonPlots_SiAssocFwrdMu.size();i++){
-      if (mu->muonType()==xAOD::Muon::SiliconAssociatedForwardMuon) m_oTruthRelatedMuonPlots_SiAssocFwrdMu[i]->fill(*truthMu, *mu, MSTracks);	     
+      if (mu->muonType()==xAOD::Muon::SiliconAssociatedForwardMuon || !m_doSeparateSAFMuons) m_oTruthRelatedMuonPlots_SiAssocFwrdMu[i]->fill(*truthMu, *mu, MSTracks);	     
     }
     
     //plots per quality
@@ -179,9 +194,14 @@ void MuonValidationPlots::fill(const xAOD::TruthParticle* truthMu, const xAOD::M
 	  if (ipar<11) continue;
 	}
 	//filter SilicionAssociatedForwardMuons 
-	if (mu->muonType()!=xAOD::Muon::SiliconAssociatedForwardMuon) m_oTruthRelatedMuonPlots_perAuthor[i]->fill(*truthMu, *mu, MSTracks);	     
+	if (mu->muonType()!=xAOD::Muon::SiliconAssociatedForwardMuon || !m_doSeparateSAFMuons) m_oTruthRelatedMuonPlots_perAuthor[i]->fill(*truthMu, *mu, MSTracks);	     
       }
-    }    
+    }
+    //fill CaloTagLoose (one additional plot in plot list)
+    unsigned int counter= m_selectedAuthors.size();
+    if ( counter+1==m_oRecoMuonPlots_perAuthor.size()){
+      if (mu->isAuthor(xAOD::Muon::CaloTag)) m_oTruthRelatedMuonPlots_perAuthor[counter]->fill(*truthMu, *mu, MSTracks);
+    }   
   }
 
 }

MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/src/MuonValidationPlots.h

@@ -15,7 +15,7 @@
 
 class MuonValidationPlots:public PlotBase {
   public:
-  MuonValidationPlots(PlotBase* pParent, std::string sDir, std::vector<int> wps, std::vector<unsigned int> authors, bool isData, bool doBinnedResolutionPlots, bool doMuonTree=false );
+  MuonValidationPlots(PlotBase* pParent, std::string sDir, std::vector<int> wps, std::vector<unsigned int> authors, bool isData, bool doBinnedResolutionPlots, bool doSplitSAFMuons, bool doMuonTree=false );
 
     virtual ~MuonValidationPlots();
     void fill(const xAOD::Muon& mu);
@@ -43,7 +43,7 @@ class MuonValidationPlots:public PlotBase {
     void fillTruthMuonPlots(const xAOD::TruthParticle &truthMu);
 
     bool m_isData;
-
+    bool m_doSeparateSAFMuons;
 };
 
 #endif

MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/src/SlowMuonValidationPlots.cxx

+/*
+  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "SlowMuonValidationPlots.h"
+#include "MuonHistUtils/MuonEnumDefs.h"
+
+#include <iostream>
+
+typedef ElementLink< xAOD::MuonContainer > MuonLink;
+
+SlowMuonValidationPlots::SlowMuonValidationPlots(PlotBase* pParent, std::string sDir, bool isData):
+  PlotBase(pParent, sDir),  m_isData(isData)
+{    
+  //histogram classes for all muons
+  m_oSlowMuonRecoPlots = new Muon::SlowMuonParamPlots(this, "reco/AllMuons/parameters/");
+  if (!m_isData) m_oSlowMuonMatchedPlots = new Muon::SlowMuonParamPlots(this, "matched/AllMuons/parameters/");
+}
+
+SlowMuonValidationPlots::~SlowMuonValidationPlots()
+{  
+  delete m_oSlowMuonRecoPlots;
+  m_oSlowMuonRecoPlots = 0;
+
+  if (!m_isData) {
+    delete m_oSlowMuonMatchedPlots;
+    m_oSlowMuonMatchedPlots = 0;
+  }  
+}
+
+void SlowMuonValidationPlots::fill(const xAOD::SlowMuon& smu, const xAOD::Muon& mu)
+{
+  fillRecoMuonPlots(smu,mu);
+}
+void SlowMuonValidationPlots::fill( const xAOD::TruthParticle* truthMu, const xAOD::SlowMuon* smu, const xAOD::Muon* mu )
+{
+  if (smu) fillRecoMuonPlots(*smu,*mu);
+  if ( (smu) && (truthMu) ) {
+    m_oSlowMuonMatchedPlots->fill(*smu);
+  }
+}
+
+void SlowMuonValidationPlots::fillRecoMuonPlots(const xAOD::SlowMuon& smu, const xAOD::Muon& /*mu*/)
+{
+  //fill hists for all muons
+  m_oSlowMuonRecoPlots->fill(smu);
+}
+

MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/src/SlowMuonValidationPlots.h

+/*
+  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef MUONPHYSVALMONITORING_SLOWMUONVALIDATIONPLOTS_H
+#define MUONPHYSVALMONITORING_SLOWMUONVALIDATIONPLOTS_H
+
+#include "xAODTruth/TruthParticle.h"
+#include "xAODMuon/SlowMuon.h"
+#include "MuonHistUtils/SlowMuonParamPlots.h"
+
+class SlowMuonValidationPlots:public PlotBase
+{
+ public:
+  SlowMuonValidationPlots(PlotBase* pParent, std::string sDir, bool isData);
+
+  virtual ~SlowMuonValidationPlots();
+  void fill(const xAOD::SlowMuon& smu, const xAOD::Muon& mu);
+  void fill(const xAOD::TruthParticle *truthMu, const xAOD::SlowMuon *smu, const xAOD::Muon* mu);
+
+  Muon::SlowMuonParamPlots* m_oSlowMuonRecoPlots;
+  Muon::SlowMuonParamPlots* m_oSlowMuonMatchedPlots;
+
+ private:
+  void fillRecoMuonPlots(const xAOD::SlowMuon& smu, const xAOD::Muon& mu);
+  void fillMatchedMuonPlots(const xAOD::SlowMuon& smu, const xAOD::Muon& mu);
+
+  bool m_isData;
+
+};
+
+#endif

MuonSpectrometer/MuonValidation/MuonHistogramming/MuonHistUtils/MuonHistUtils/MuonParamElossPlots.h

+/*
+  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef MUONHISTUTILS_MUONPARAMELOSSPLOTS_H
+#define MUONHISTUTILS_MUONPARAMELOSSPLOTS_H
+
+#include "TrkValHistUtils/PlotBase.h"
+#include "xAODMuon/Muon.h"
+#include "xAODTruth/TruthParticle.h"
+#include <string>
+
+namespace Muon{
+
+class MuonParamElossPlots: public PlotBase
+{
+ public:
+  MuonParamElossPlots(PlotBase *pParent, std::string sDir);
+  void fill(const xAOD::TruthParticle& truthMu, const xAOD::Muon& mu);
+  
+  TH1* msInnerMatchChi2;
+  TH1* msOuterMatchChi2;
+
+  TH1* ELoss;
+  TH1* ELossDiffTruth;
+  TH1* ELossDiffTruthEta0_1p35;
+  TH1* ELossDiffTruthEta1p35_1p55;
+  TH1* ELossDiffTruthEta1p55_end;
+  TH1* ELossSigma;
+  TH1* paramELoss;
+  TH1* paramELossDiff;
+  TH1* paramELossDiffTruth;
+  TH1* paramELossDiffTruthEta0_1p35;
+  TH1* paramELossDiffTruthEta1p35_1p55;
+  TH1* paramELossDiffTruthEta1p55_end;
+  TH1* measELoss; 
+  TH1* measELossDiff; 
+  TH1* measELossDiffTruth; 
+  TH1* measELossDiffTruthEta0_1p35;
+  TH1* measELossDiffTruthEta1p35_1p55;
+  TH1* measELossDiffTruthEta1p55_end;
+  TH1* ELossType;
+  TH1* ELossTypeParametrPt;
+  TH1* ELossTypeNotIsoPt;
+  TH1* ELossTypeTailPt;
+  TH1* ELossTypeAllPt;
+  
+ private:
+  void initializePlots();
+  void FillPlot(TH1* hist, const xAOD::Muon& mu,const xAOD::Muon::ParamDef paramDef,float scale=1);
+  void FillPlot(TH1* hist, TH1* hist_DiffTruth, TH1* hist_DiffTruthEta0_1p35, TH1* hist_DiffTruthEta1p35_1p55, TH1* hist_DiffTruthEta1p55_endd, const xAOD::TruthParticle& truthMu, const xAOD::Muon& mu, const xAOD::Muon::ParamDef paramDef,float scale=1);
+  void FillPlotELossType(TH1* hist, const xAOD::Muon& mu,float scale=1);
+  void FillPlotELossType(TH1* hist, const xAOD::Muon& mu, xAOD::Muon::EnergyLossType type, float scale=1);
+};
+
+}
+
+#endif

MuonSpectrometer/MuonValidation/MuonHistogramming/MuonHistUtils/MuonHistUtils/MuonTruthHitPlots.h

+/*
+  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef MUONHISTUTILS_MUONTRUTHHITPLOTS_H
+#define MUONHISTUTILS_MUONTRUTHHITPLOTS_H
+
+#include "TrkValHistUtils/PlotBase.h"
+#include "xAODMuon/Muon.h"
+
+namespace Muon{
+  
+class MuonTruthHitPlots:public PlotBase {
+ public:
+  MuonTruthHitPlots(PlotBase* pParent, std::string sDir);  
+  void fill(const xAOD::Muon& muon);
+  void fillPlot(TH1* hitPlots, const std::string& sInfo, const Muon::MuonStationIndex::ChIndex& index, const xAOD::Muon& muon);
+  void fillPlot(TH1* hitPlots, const std::string& sInfo, const Muon::MuonStationIndex::PhiIndex& index, const xAOD::Muon& muon);
+  void fillPlot(TH1* hitPlots, const std::string& sInfo, const xAOD::Muon& muon);
+ 
+  TH1* precMatchedHitsSummed;
+  TH1* precMatchedHitsBIS;
+  TH1* precMatchedHitsBIL;
+  TH1* precMatchedHitsBMS;
+  TH1* precMatchedHitsBML;
+  TH1* precMatchedHitsBOS;
+  TH1* precMatchedHitsBOL;
+  TH1* precMatchedHitsBEE;
+  TH1* precMatchedHitsEIS;
+  TH1* precMatchedHitsEIL;
+  TH1* precMatchedHitsEMS;
+  TH1* precMatchedHitsEML;
+  TH1* precMatchedHitsEOS;
+  TH1* precMatchedHitsEOL;
+  TH1* precMatchedHitsEES;
+  TH1* precMatchedHitsEEL;
+  TH1* precMatchedHitsCSS;
+  TH1* precMatchedHitsCSL;
+
+  TH1* phiMatchedHitsSummed;
+  TH1* phiMatchedHitsBM1;
+  TH1* phiMatchedHitsBM2;
+  TH1* phiMatchedHitsBO1;
+  TH1* phiMatchedHitsBO2;
+  TH1* phiMatchedHitsT1;
+  TH1* phiMatchedHitsT2;
+  TH1* phiMatchedHitsT3;
+  TH1* phiMatchedHitsT4;
+  TH1* phiMatchedHitsCSC;
+
+  TH1* trigEtaMatchedHitsSummed;
+  TH1* trigEtaMatchedHitsBM1;
+  TH1* trigEtaMatchedHitsBM2;
+  TH1* trigEtaMatchedHitsBO1;
+  TH1* trigEtaMatchedHitsBO2;
+  TH1* trigEtaMatchedHitsT1;
+  TH1* trigEtaMatchedHitsT2;
+  TH1* trigEtaMatchedHitsT3;
+  TH1* trigEtaMatchedHitsT4;
+  // TH1* trigEtaMatchedHitsCSC;
+
+ 
+};
+}
+
+#endif

MuonSpectrometer/MuonValidation/MuonHistogramming/MuonHistUtils/MuonHistUtils/SlowMuonParamPlots.h

+/*
+  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef MUONHISTUTILS_SLOWMUONPARAMPLOTS_H
+#define MUONHISTUTILS_SLOWMUONPARAMPLOTS_H
+
+#include "TrkValHistUtils/PlotBase.h"
+
+#include "xAODMuon/SlowMuon.h"
+
+namespace Muon{
+
+class SlowMuonParamPlots: public PlotBase {
+  public:
+    SlowMuonParamPlots(PlotBase *pParent, std::string sDir);
+
+    void fill(const xAOD::SlowMuon& smu);
+
+    TH1* beta;
+  
+  private:
+    void initializePlots();
+
+};
+
+}
+
+#endif

MuonSpectrometer/MuonValidation/MuonHistogramming/MuonHistUtils/MuonHistUtils/TruthRelatedMuonPlotOrganizer.h

@@ -11,7 +11,9 @@
 #include "MuonHistUtils/MuonHitDiffSummaryPlots.h"
 #include "MuonHistUtils/MuonResolutionPlots.h"
 #include "MuonHistUtils/MomentumTruthPullPlots.h"
+#include "MuonHistUtils/MuonParamElossPlots.h"
 #include "MuonHistUtils/MuonTree.h"
+#include "MuonHistUtils/MuonTruthHitPlots.h"
 #include "TrkValHistUtils/DefParamPullPlots.h"
 
 #include "xAODMuon/Muon.h"
@@ -20,7 +22,7 @@
 
 namespace Muon
 {
-  enum TRUTHRELATEDPLOTCLASS {TRK_MATCHEDTRUE,TRK_MATCHEDRECO,TRK_MSHITDIFF,MUON_HITDIFF,MUON_RESOL,TRK_DEFPARAMPULLS,MUON_PULLSTAIL,MUON_PULLSNOTAIL,MAX_TRUTHRELATEDPLOTCLASS};
+  enum TRUTHRELATEDPLOTCLASS {TRK_MATCHEDTRUE,TRK_MATCHEDRECO,TRK_MSHITDIFF,MUON_HITDIFF,MUON_TRUTHHIT,MUON_RESOL,TRK_DEFPARAMPULLS,MUON_PULLSTAIL,MUON_PULLSNOTAIL,MUON_PARAMELOSS,MAX_TRUTHRELATEDPLOTCLASS};
   
   class TruthRelatedMuonPlotOrganizer:public PlotBase {
   public:
@@ -39,10 +41,12 @@ namespace Muon
     Trk::ParamPlots                 *m_oMatchedRecoPlots;
     Trk::MSHitDiffPlots             *m_oMSHitDiffPlots;
     Muon::MuonHitDiffSummaryPlots   *m_oMuonHitDiffSummaryPlots;
+    Muon::MuonTruthHitPlots         *m_oMuonTruthHitPlots;
     Muon::MuonResolutionPlots       *m_oMuonResolutionPlots;
     Trk::DefParamPullPlots          *m_oDefParamPullPlots;
     Muon::MomentumTruthPullPlots    *m_oMomentumTruthPullPlots_Tail;
     Muon::MomentumTruthPullPlots    *m_oMomentumTruthPullPlots_NoTail;
+    Muon::MuonParamElossPlots       *m_oMatchedRecoElossPlots;
 
   };