From 70bb36842d92a77feaca0d66cf1efc644db9c3ed Mon Sep 17 00:00:00 2001
From: Jana Schaarschmidt <jana.schaarschmidt@cern.ch>
Date: Tue, 6 Mar 2018 10:40:15 +0000
Subject: [PATCH] Update TFCS1DFunctionHistogram.cxx
Former-commit-id: 9ed4de3d586dc13a2cb0cd3c422080fc4b9ed371
---
.../ISF_FastCaloSimEvent/src/TFCS1DFunctionHistogram.cxx | 6 ------
1 file changed, 6 deletions(-)
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCS1DFunctionHistogram.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCS1DFunctionHistogram.cxx
index bace2b2e05fd..9d66dec54935 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCS1DFunctionHistogram.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCS1DFunctionHistogram.cxx
@@ -19,13 +19,7 @@ TFCS1DFunctionHistogram::TFCS1DFunctionHistogram(TH1* hist, int verbose, double
void TFCS1DFunctionHistogram::Initialize(TH1* hist, int verbose,double cut_maxdev)
{
-<<<<<<< HEAD
- smart_rebin_loop(hist, verbose,cut_maxdev);
-=======
-
smart_rebin_loop(hist, cut_maxdev);
-
->>>>>>> 21c89eb728cd64a1fd53fdee5823966a9eced97e
}
double* TFCS1DFunctionHistogram::histo_to_array(TH1* hist)
--
GitLab