From df38a54b2fac95936a07e5786262f8b1be94e78a Mon Sep 17 00:00:00 2001
From: Apar Agarwal <a.agarwal@vecc.gov.in>
Date: Mon, 6 Nov 2023 14:18:19 +0000
Subject: [PATCH] Changes now accommodate odd number of pads in a sector
---
core/detectors/much/CbmMuchSectorRadial.cxx | 10 +++++-----
external/InstallGeometry.cmake | 2 +-
external/InstallParameter.cmake | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/core/detectors/much/CbmMuchSectorRadial.cxx b/core/detectors/much/CbmMuchSectorRadial.cxx
index e0f9527f44..dba77394a7 100644
--- a/core/detectors/much/CbmMuchSectorRadial.cxx
+++ b/core/detectors/much/CbmMuchSectorRadial.cxx
@@ -1,6 +1,6 @@
/* Copyright (C) 2012-2020 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
SPDX-License-Identifier: GPL-3.0-only
- Authors: Evgeny Kryshen [committer], Florian Uhlig */
+ Authors: Evgeny Kryshen [committer], Florian Uhlig , Apar Agarwal */
/** CbmMuchSectorRadial.cxx
*@author E.Kryshen <e.kryshen@gsi.de>
@@ -37,10 +37,10 @@ CbmMuchSectorRadial::CbmMuchSectorRadial(Int_t detId, Int_t secId, Double_t r1,
, fPhi2(0.)
, fPadDphi((r2 - r1) / r1)
{
- if (phi2 < phi1) LOG(error) << "Panic!";
- fNChannels = 2 * TMath::Ceil((phi2 - phi1) / 2 / fPadDphi);
- fPhi1 = (phi1 + phi2) / 2 - fNChannels / 2 * fPadDphi;
- fPhi2 = (phi1 + phi2) / 2 + fNChannels / 2 * fPadDphi;
+ if (phi2 < phi1) LOG(error) << "Error in description of module paramaters (phi1 > phi2)";
+ fNChannels = TMath::Ceil(((phi2 - phi1) / fPadDphi) - DBL_EPSILON);
+ fPhi1 = phi1;
+ fPhi2 = phi2;
}
// -----------------o--------------------------------------------------------
diff --git a/external/InstallGeometry.cmake b/external/InstallGeometry.cmake
index 9726a335ca..274b8bc6b0 100644
--- a/external/InstallGeometry.cmake
+++ b/external/InstallGeometry.cmake
@@ -1,5 +1,5 @@
-set(GEOMETRY_VERSION c7d89e005b1f1d0baed271e5fe292886a13201c3)
+set(GEOMETRY_VERSION 8fbf605d896cda44147236453e6026a424291900)
set(GEOMETRY_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_geometry.git")
diff --git a/external/InstallParameter.cmake b/external/InstallParameter.cmake
index 166b5b99af..4c016d3555 100644
--- a/external/InstallParameter.cmake
+++ b/external/InstallParameter.cmake
@@ -1,4 +1,4 @@
-set(PARAMETER_VERSION 6e29512b5db4315f7307573460093546f70f079b)
+set(PARAMETER_VERSION 8e6118215398a0517712af64557100cf3fae2fde)
set(PARAMETER_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_parameter.git")
--
GitLab