From f6495992bf8d70a07a8f29b9bbb1c0814d56f3a0 Mon Sep 17 00:00:00 2001
From: sergeizharko <zharkosergey94@yandex.ru>
Date: Mon, 20 Dec 2021 19:58:30 +0100
Subject: [PATCH] L1Parameters.h: new file ; L1BaseStationInfo.h: getters and
setters added; L1Station.h: minor modifications; L1Field.h: magic constant
'21' changed to the constexpr parameter L1Parameters::kN_FS_COEFFS
---
reco/L1/L1Algo/L1BaseStationInfo.h | 4 ----
1 file changed, 4 deletions(-)
diff --git a/reco/L1/L1Algo/L1BaseStationInfo.h b/reco/L1/L1Algo/L1BaseStationInfo.h
index 8407c5ad8f..f923110475 100644
--- a/reco/L1/L1Algo/L1BaseStationInfo.h
+++ b/reco/L1/L1Algo/L1BaseStationInfo.h
@@ -2,11 +2,7 @@
SPDX-License-Identifier: GPL-3.0-only
Authors: Sergey Gorbunov, Sergei Zharko [committer] */
-<<<<<<< HEAD
-/************************************************************************************************************
-=======
/**************************************************************************************************************
->>>>>>> Added new class L1BaseStationInfo to the L1Algo core
* @file L1BaseStationInfo.h
* @bried A base class for a L1 station interface
* @since 18.12.2021
--
GitLab