From 1595ccab829cc0b6506d8e71c50c007cf25037a1 Mon Sep 17 00:00:00 2001
From: Ruby Ferguson <ruby.alice.molly.ferguson@cern.ch>
Date: Tue, 28 Apr 2020 09:48:35 +0100
Subject: [PATCH] tidied merge request mistake
---
Reconstruction/tauMonitoring/python/tauMonitorAlgorithm.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/Reconstruction/tauMonitoring/python/tauMonitorAlgorithm.py b/Reconstruction/tauMonitoring/python/tauMonitorAlgorithm.py
index 2a27bb2420c..8224221e346 100644
--- a/Reconstruction/tauMonitoring/python/tauMonitorAlgorithm.py
+++ b/Reconstruction/tauMonitoring/python/tauMonitorAlgorithm.py
@@ -254,7 +254,6 @@ def tauMonitoringConfig(inputFlags):
igroup.defineHistogram('isolFrac,LB', type='TH2F', title='Isolation Fraction vs Lumiblock;Isolation Fraction;Lumiblock', path=folder+"Calo",
xbins=51,xmin=0,xmax=1.02,ybins=1200,ymin=0.,ymax=1200.)
->>>>>>> upstream/master
igroup.defineHistogram(namer('BDTJetScore','BDTJetScore','Identification',postfix), title='BDT Score for Jet Rejection;Boosted Decision Tree Score',path=folder+"Identification",
xbins=48, xmin=-1.1, xmax=1.1 )
--
GitLab