Skip to content

Resync with Wolfgang's fork #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wa01 wants to merge 17 commits into
base: main
Choose a base branch
from
Open

Resync with Wolfgang's fork #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
a61a72d
remove files that are now in DrawHits
wa01 Nov 25, 2025
56e97dd
logZ option
wa01 Dec 1, 2025
7f0de31
utility for histograms
wa01 Dec 2, 2025
2b8128b
some more options for fits
wa01 Dec 2, 2025
567be62
cosmetics for res mean/width in 2d
wa01 Dec 2, 2025
14b0a34
change match to classical if elif statement to stay compatible with o…
wa01 Dec 2, 2025
5fc9c88
cosmetics
wa01 Dec 3, 2025
2fbcf3e
add histograms residuals (vs. pos on strip) vs. angle / cluster size
wa01 Dec 3, 2025
331c60a
define quantiles from cumulative histo of residuals via spline
wa01 Dec 3, 2025
8bde1d1
mainly cosmetics
wa01 Dec 4, 2025
0bd5fbe
style
wa01 Dec 4, 2025
2e2288e
tuning of quantile / width calculation
wa01 Dec 5, 2025
446a242
add efficiency as f(dx/dz)
wa01 Dec 5, 2025
e6572f9
adding result of fit
wa01 Dec 11, 2025
53950fa
adding result of fit
wa01 Dec 11, 2025
4ca6fdb
update to fitRes
wa01 Jan 9, 2026
d83c0b7
Merge branch 'HephyAnalysisSW:main' into main
wa01 Jan 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 60 additions & 6 deletions DrawHits/drawHits.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,8 @@ def fillHistoByDef(tree,hDef,extraCuts):
if hDef.vetoMType(mType):
continue
is1D = hDef.getParameter('yNbins',mType)==None
is2D = hDef.getParameter('yNbins',mType)!=None and hDef.getParameter('zNbins',mType)==None
is3D = hDef.getParameter('yNbins',mType)!=None and hDef.getParameter('zNbins',mType)!=None
isProfile = hDef.getParameter('profile',mType)!=None and hDef.getParameter('profile',mType)
effCuts = hDef.getParameter('effCuts',mType)
variable = hDef.getParameter('variable',mType)
Expand All @@ -278,6 +280,7 @@ def fillHistoByDef(tree,hDef,extraCuts):
tree.Project(hName+"_2",variable, \
cutString(extraCuts,hDef.getParameter('baseCuts',mType),"moduleType=="+str(mType),effCuts))
histos[mType][3] = ROOT.TEfficiency(histos[mType][1],histos[mType][0])
histos[mType][3].SetMarkerStyle(20)
else:
# always keep final histogram in 4th position
histos[mType][3] = histos[mType][0]
Expand All @@ -290,7 +293,7 @@ def fillHistoByDef(tree,hDef,extraCuts):
cutString(extraCuts,hDef.getParameter('baseCuts',mType),"moduleType=="+str(mType)))
# always keep final histogram in 4th position
histos[mType][3] = histos[mType][0]
else:
elif is2D:
nby = hDef.getParameter('yNbins',mType)
ymin = hDef.getParameter('yMin',mType)
ymax = hDef.getParameter('yMax',mType)
Expand All @@ -310,13 +313,27 @@ def fillHistoByDef(tree,hDef,extraCuts):
else:
# always keep final histogram in 4th position
histos[mType][3] = histos[mType][0]
elif is3D:
nby = hDef.getParameter('yNbins',mType)
ymin = hDef.getParameter('yMin',mType)
ymax = hDef.getParameter('yMax',mType)
nbz = hDef.getParameter('zNbins',mType)
zmin = hDef.getParameter('zMin',mType)
zmax = hDef.getParameter('zMax',mType)
histos[mType] = [ ROOT.TH3F(hName+"_1",hName+"_1",nbx,xmin,xmax,nby,ymin,ymax,nbz,zmin,zmax), \
None, None, None ]
tree.Project(hName+"_1",variable, \
cutString(extraCuts,hDef.getParameter('baseCuts',mType),"moduleType=="+str(mType)))
assert effCuts==None
# always keep final histogram in 4th position
histos[mType][3] = histos[mType][0]
#print("Ending for ",hDef.name,hName,hTitle)

savedDir.cd()
return histos


def drawHistoByDef(histos,hDef,logY=False,same=False):
def drawHistoByDef(histos,hDef,logY=False,logZ=False,same=False):
result = { 'cnv' : None, 'histos' : histos, 'pave' : None }

savedDir = ROOT.gDirectory
Expand Down Expand Up @@ -344,6 +361,8 @@ def drawHistoByDef(histos,hDef,logY=False,same=False):
if hDef.vetoMType(mType):
continue
is1D = hDef.getParameter('yNbins',mType)==None
is2D = hDef.getParameter('yNbins',mType)!=None and hDef.getParameter('zNbins',mType)==None
is3D = hDef.getParameter('yNbins',mType)!=None and hDef.getParameter('zNbins',mType)!=None
isProfile = hDef.getParameter('profile',mType)!=None and hDef.getParameter('profile',mType)
effCuts = hDef.getParameter('effCuts',mType)
variable = hDef.getParameter('variable',mType)
Expand All @@ -362,6 +381,7 @@ def drawHistoByDef(histos,hDef,logY=False,same=False):
xmax = hDef.getParameter('xMax',mType)

ytitle = hDef.getParameter('yTitle',mType) if hDef.getParameter('yTitle',mType) else ""
ztitle = hDef.getParameter('zTitle',mType) if hDef.getParameter('zTitle',mType) else ""
if is1D and ( not isProfile ):
ymin = hDef.getParameter('yMin',mType) if hDef.getParameter('yMin',mType)!=None else 0.
ymax = hDef.getParameter('yMax',mType) if hDef.getParameter('yMax',mType)!=None else 1.05
Expand All @@ -372,13 +392,16 @@ def drawHistoByDef(histos,hDef,logY=False,same=False):
histos[mType][2].GetXaxis().SetTitle(xtitle)
histos[mType][2].GetYaxis().SetTitle(ytitle)
histos[mType][3] = ROOT.TEfficiency(histos[mType][1],histos[mType][0])
histos[mType][3].SetMarkerSize(0.3)
histos[mType][3].SetMarkerStyle(20)
histos[mType][3].Draw("same Z")
else:
histos[mType][0].SetTitle(hTitle)
histos[mType][0].GetXaxis().SetTitle(xtitle)
histos[mType][0].GetYaxis().SetTitle(ytitle)
histos[mType][0].Draw("same" if same else "")
fitFunc = hDef.getParameter('fit')
if fitFunc!=None:
histos[mType][0].Fit(fitFunc,"Q","same")
elif isProfile:
histos[mType][0].SetTitle(hTitle)
histos[mType][0].GetXaxis().SetTitle(xtitle)
Expand All @@ -387,7 +410,7 @@ def drawHistoByDef(histos,hDef,logY=False,same=False):
#histos[mType][0].SetFillColor(ROOT.TColor.GetColorBright(ROOT.kGray))
#histos[mType][0].SetFillColor(ROOT.kGray)
histos[mType][0].Draw("same" if same else "")
else:
elif is2D:
assert not same
zmin = hDef.getParameter('zMin',mType) if hDef.getParameter('zMin',mType)!=None else 0.
zmax = hDef.getParameter('zMax',mType) if hDef.getParameter('zMax',mType)!=None else 1.05
Expand All @@ -403,8 +426,20 @@ def drawHistoByDef(histos,hDef,logY=False,same=False):
histos[mType][0].GetXaxis().SetTitle(xtitle)
histos[mType][0].GetYaxis().SetTitle(ytitle)
histos[mType][0].Draw("ZCOL")
elif is3D:
assert not same
zmin = hDef.getParameter('zMin',mType) if hDef.getParameter('zMin',mType)!=None else 0.
zmax = hDef.getParameter('zMax',mType) if hDef.getParameter('zMax',mType)!=None else 1.05
assert effCuts==None
histos[mType][0].SetTitle(hTitle)
histos[mType][0].GetXaxis().SetTitle(xtitle)
histos[mType][0].GetYaxis().SetTitle(ytitle)
histos[mType][0].GetZaxis().SetTitle(ztitle)
histos[mType][0].Draw()
if logY or hDef.getParameter('logY',mType):
ROOT.gPad.SetLogy(1)
if is2D and ( logZ or hDef.getParameter('logZ',mType) ):
ROOT.gPad.SetLogz(1)
ROOT.gPad.Update()

#cnv.cd()
Expand Down Expand Up @@ -484,10 +519,13 @@ def addHistogram(varString,cuts,effCuts=None,name='userHist'):
type=str, default='*')
parser.add_argument('--vetoedHistograms', help='comma-separated names of histogram definitions not to be used',
type=str, default='')
parser.add_argument('--logY', help='use log scale', action='store_true', default=False)
parser.add_argument('--logY', help='use log scale for y axis', action='store_true', default=False)
parser.add_argument('--logZ', help='use log scale for z axis', action='store_true', default=False)
parser.add_argument('--printTree', '-p', help='print TTree contents', action='store_true', default=False)
parser.add_argument('--listHistograms', '-l', help='list predefined and selected histograms', \
action='store_true', default=False)
parser.add_argument('--zone', '-z', help='restrict to zone in OT (barrel, tilted, endcap)', type=str, \
choices=['barrel','tilted','endcap'], default=None)
parser.add_argument('file', help='input file', type=str, nargs='+', default=None)
args = parser.parse_args()
outputFormats = [ ]
Expand All @@ -498,6 +536,19 @@ def addHistogram(varString,cuts,effCuts=None,name='userHist'):
fitResiduals = args.fitResiduals.split(",") if args.fitResiduals else [ ]
selectedHistoNames = args.selectedHistograms.split(",")
vetoedHistoNames = args.vetoedHistograms.split(",")
#
# add cut for zone definition?
#
if args.zone=="barrel":
zoneCuts = "detNormal.Rho()>0.99"
elif args.zone=="endcap":
zoneCuts = "detNormal.Rho()<0.01"
elif args.zone=="tilted":
zoneCuts = "detNormal.Rho()>0.05&&detNormal.Rho()<0.095"
else:
zoneCuts = ""
args.cuts = cutString(args.cuts,zoneCuts)

#
# load histogram definitions
#
Expand Down Expand Up @@ -591,14 +642,17 @@ def addHistogram(varString,cuts,effCuts=None,name='userHist'):
for hName in allHDefs.byCanvas[cName]:
print("Processing histogram",hName,"in canvas",cName)
cHistos[hName] = fillHistoByDef(simHitTree,allHDefs.byCanvas[cName][hName],extraCuts)
allObjects.append(drawHistoByDef(cHistos[hName],allHDefs.byCanvas[cName][hName],logY=args.logY,same=same))
allObjects.append(drawHistoByDef(cHistos[hName],allHDefs.byCanvas[cName][hName], \
logY=args.logY,logZ=args.logZ,same=same))
same = True
if args.output!=None:
c = allObjects[-1]['cnv']
#for c in [ x['cnv'] for x in allObjects ]:
basename = os.path.join(args.output,c.GetName())
if args.sampleName!=None:
basename += "_" + args.sampleName
if args.zone!=None:
basename += "_" + args.zone
print(basename)
for fmt in outputFormats:
c.SaveAs(basename+"."+fmt)
Expand Down
Loading