From c2e1c82d27649f343b98e47f9bc1ddeba294be71 Mon Sep 17 00:00:00 2001
From: Christian Weber <ChristianTMWeber@gmail.com>
Date: Tue, 20 Sep 2022 12:56:09 -0400
Subject: [PATCH] Remove residual merge conflict markers
---
limitSetting/limitSetting.py | 4 ----
1 file changed, 4 deletions(-)
diff --git a/limitSetting/limitSetting.py b/limitSetting/limitSetting.py
index 369c11f..a911a37 100644
--- a/limitSetting/limitSetting.py
+++ b/limitSetting/limitSetting.py
@@ -1128,11 +1128,7 @@ if __name__ == '__main__':
# expectedLimitsGraph_1Sigma, expectedLimitsGraph_2Sigma , colorScheme = ROOT.kRed , writeTo = writeTFile)
-<<<<<<< limitSetting/limitSetting.py
writeLimitsToCSV( {"lowLimit2Sigma" : lowLimits2SigDict, "lowLimit1Sigma" : lowLimits1SigDict, "bestEstimate" : bestEstimateDict, "expectedLimit": expectedLimitDict, "upperLimit1Sigma" : upperLimits1SigDict , "upperLimit2Sigma" : upperLimits2SigDict } )
-=======
- writeLimitsToCSV( {"lowLimit2Sigma" : lowLimits2SigDict, "lowLimit1Sigma" : lowLimits1SigDict, "bestEstimate" : bestEstimateDict, "expectedLimit": expectedLimitDict "upperLimit1Sigma" : upperLimits1SigDict , "upperLimit2Sigma" : upperLimits2SigDict } )
->>>>>>> limitSetting/limitSetting.py
###############################################
--
GitLab