From 7b7f3470ae192ae7dff1112a1003066dfacc0ecc Mon Sep 17 00:00:00 2001
From: Patrick Scholer <patrick.scholer@cern.ch>
Date: Tue, 20 Apr 2021 16:29:09 +0200
Subject: [PATCH 1/2] fix of cross talk simulation to work with 0 cross talk in
mm digi
---
.../MM_Digitization/src/MM_StripResponse.cxx | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripResponse.cxx b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripResponse.cxx
index 33809e82e456..468479cd2eda 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripResponse.cxx
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripResponse.cxx
@@ -63,18 +63,18 @@ void MM_StripResponse::calculateTimeSeries(float /*thetaD*/, int /*gasgap*/) {
void MM_StripResponse::simulateCrossTalk(float crossTalk1, float crossTalk2) {
+ // if no cross talk is simulate just skip everything and keep m_stripCharges as it was
+ if (crossTalk1 > 0.){
+ // Unfortunately get stuck in the loop if you edit the map in the loop
+ // So make a copy!
- // Unfortunately get stuck in the loop if you edit the map in the loop
- // So make a copy!
-
- std::map< int, std::map<int,float> > stripChargesCopy1;
- stripChargesCopy1.insert(m_stripCharges.begin(), m_stripCharges.end());
+ std::map< int, std::map<int,float> > stripChargesCopy1;
+ stripChargesCopy1.insert(m_stripCharges.begin(), m_stripCharges.end());
- // clear strip charge map since charge on the main strip needs to be scaled
- m_stripCharges.clear();
+ // clear strip charge map since charge on the main strip needs to be scaled
+ m_stripCharges.clear();
- if (crossTalk1 > 0.){
for (auto & stripTimeSeries : stripChargesCopy1){
int timeBin = stripTimeSeries.first;
for (auto & stripCharge : stripTimeSeries.second ){
--
GitLab
From e0f544ff711fddfac3cd504b10fc026a2852de28 Mon Sep 17 00:00:00 2001
From: Patrick Scholer <patrick.scholer@cern.ch>
Date: Tue, 20 Apr 2021 16:35:55 +0200
Subject: [PATCH 2/2] fix whitespace
---
.../MuonDigitization/MM_Digitization/src/MM_StripResponse.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripResponse.cxx b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripResponse.cxx
index 468479cd2eda..7b1839faf87b 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripResponse.cxx
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripResponse.cxx
@@ -63,7 +63,7 @@ void MM_StripResponse::calculateTimeSeries(float /*thetaD*/, int /*gasgap*/) {
void MM_StripResponse::simulateCrossTalk(float crossTalk1, float crossTalk2) {
- // if no cross talk is simulate just skip everything and keep m_stripCharges as it was
+ // if no cross talk is simulate just skip everything and keep m_stripCharges as it was
if (crossTalk1 > 0.){
// Unfortunately get stuck in the loop if you edit the map in the loop
--
GitLab