From 1842f3340fdb5e088b91d216d3ab8588f5520d12 Mon Sep 17 00:00:00 2001
From: John Derek Chapman <chapman@hep.phy.cam.ac.uk>
Date: Thu, 30 Apr 2020 10:33:47 +0000
Subject: [PATCH] sweep 32457 and resolve conflicts
---
.../MuonReadoutGeometry/MMReadoutElement.h | 35 +++++----
.../MuonReadoutGeometry/MuonChannelDesign.h | 12 +--
.../src/MMReadoutElement.cxx | 76 +++++++------------
.../MM_Digitization/CMakeLists.txt | 6 +-
.../MM_Digitization/MM_DigitToolInput.h | 5 +-
.../MM_Digitization/MM_StripResponse.h | 3 +-
.../MM_StripsResponseSimulation.h | 2 +-
.../src/MM_DigitizationTool.cxx | 72 +++++++++---------
.../MM_Digitization/src/MM_StripResponse.cxx | 44 ++++++-----
.../src/MM_StripsResponseSimulation.cxx | 4 +-
.../MuonPRDTest/src/MMDigitVariables.cxx | 8 +-
11 files changed, 129 insertions(+), 138 deletions(-)
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MMReadoutElement.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MMReadoutElement.h
index ae64d383e8c..94d9e628ef2 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MMReadoutElement.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MMReadoutElement.h
@@ -2,29 +2,16 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-/***************************************************************************
- MM Readout Element properties
- -----------------------------------------
-***************************************************************************/
-
#ifndef MUONGEOMODEL_MMREADOUTELEMENT_H
-# define MUONGEOMODEL_MMREADOUTELEMENT_H
+#define MUONGEOMODEL_MMREADOUTELEMENT_H
#include "MuonReadoutGeometry/MuonClusterReadoutElement.h"
#include "MuonReadoutGeometry/MuonDetectorManager.h"
#include "MuonReadoutGeometry/MuonChannelDesign.h"
#include <cmath>
-class StoreGateSvc;
-
class BLinePar;
-namespace Trk{
- class RectangleBounds;
- class PlaneSurface;
-}
-
-
namespace MuonGM {
/**
An MMReadoutElement corresponds to a single STGC module; therefore
@@ -58,7 +45,7 @@ namespace MuonGM {
If the strip number is outside the range of valid strips, the function will return false */
virtual bool stripPosition( const Identifier& id, Amg::Vector2D& pos ) const override;
bool stripGlobalPosition( const Identifier& id, Amg::Vector3D& gpos ) const;
-
+
double stripLength( const Identifier& id) const;
/** number of layers in phi/eta projection */
@@ -68,6 +55,10 @@ namespace MuonGM {
virtual int numberOfStrips( const Identifier& layerId ) const override;
virtual int numberOfStrips( int , bool measuresPhi ) const override;
+ /** Number of missing bottom and top strips (not read out) */
+ int numberOfMissingTopStrips( const Identifier& layerId ) const;
+ int numberOfMissingBottomStrips( const Identifier& layerId ) const;
+
/** space point position for a given pair of phi and eta identifiers
The LocalPosition is expressed in the reference frame of the phi surface.
If one of the identifiers is outside the valid range, the function will return false */
@@ -252,6 +243,20 @@ namespace MuonGM {
else return -1;
}
+ inline int MMReadoutElement::numberOfMissingTopStrips( const Identifier& id ) const {
+ const MuonChannelDesign* design = getDesign(id);
+ if( !design ) return -1;
+ int nStrips = design->sAngle == 0 ? design->nMissedTopEta : design->nMissedTopStereo;
+ return nStrips;
+ }
+
+ inline int MMReadoutElement::numberOfMissingBottomStrips( const Identifier& id ) const {
+ const MuonChannelDesign* design = getDesign(id);
+ if( !design ) return -1;
+ int nStrips = design->sAngle == 0 ? design->nMissedBottomEta : design->nMissedBottomStereo;
+ return nStrips;
+ }
+
inline bool MMReadoutElement::spacePointPosition( const Identifier& phiId, const Identifier& etaId, Amg::Vector2D& pos ) const {
Amg::Vector2D phiPos;
Amg::Vector2D etaPos;
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonChannelDesign.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonChannelDesign.h
index 70757a64ad9..309d09b738e 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonChannelDesign.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonChannelDesign.h
@@ -311,12 +311,9 @@ namespace MuonGM {
else if (detType==MuonChannelDesign::DetType::MM) { //its a MM eta layer | for MM the strips indices start from 0 to reflect the electronics channels numbering
- if( st < 0 ) return false;
- if( st > totalStrips ) return false;
+ if( st < nMissedBottomEta ) return false;
+ if( st > totalStrips-nMissedTopEta ) return false;
- if(st<nMissedBottomEta || st>=(totalStrips-nMissedTopEta) || st == 1023 || st == 1024 || st == 2047 || st == 2048 || st == 3071 || st == 3072 || st == 4095 || st == 4096) return false;
-
-
else{
pos[0] = firstPos + inputPitch*(st-nMissedBottomEta);
pos[1] = 0;
@@ -333,10 +330,9 @@ namespace MuonGM {
}
else if (sAngle!=0. && detType==MuonChannelDesign::DetType::MM) { //its a MM stereo layer
- if( st < 0 ) return false;
- if( st > totalStrips ) return false;
+ if( st < nMissedBottomStereo ) return false;
+ if( st > totalStrips-nMissedTopStereo ) return false;
- if(st<nMissedBottomStereo || st>=(totalStrips-nMissedTopStereo) || st == 1023 || st == 1024 || st == 2047 || st == 2048 || st == 3071 || st == 3072 || st == 4095 || st == 4096) return false;
else{
pos[0] = firstPos + inputPitch*(st-nMissedBottomStereo);
pos[1] = 0;
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MMReadoutElement.cxx b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MMReadoutElement.cxx
index d21d212ddca..11784751c4d 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MMReadoutElement.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MMReadoutElement.cxx
@@ -165,7 +165,7 @@ namespace MuonGM {
char side = getStationEta() < 0 ? 'C' : 'A';
char sector_l = getStationName().substr(2,1)=="L" ? 'L' : 'S';
MMDetectorHelper aHelper;
- MMDetectorDescription* mm = aHelper.Get_MMDetector(sector_l, abs(getStationEta()), getStationPhi(), m_ml, side);
+ MMDetectorDescription* mm = aHelper.Get_MMDetector(sector_l, std::abs(getStationEta()), getStationPhi(), m_ml, side);
MMReadoutParameters roParam = mm->GetReadoutParameters();
@@ -198,69 +198,47 @@ namespace MuonGM {
m_etaDesign[il].minYPhiR = roParam.minYPhiR;
m_etaDesign[il].maxYPhi = roParam.maxYPhi;
m_etaDesign[il].totalStrips = roParam.tStrips;
-
-
- if (m_ml == 1) m_etaDesign[il].sAngle = (roParam.stereoAngle).at(il);
- else if (m_ml == 2){ m_etaDesign[il].sAngle = (roParam.stereoAngle).at(il); }
- else {
+ m_etaDesign[il].sAngle = (roParam.stereoAngle).at(il);
+ if (m_ml < 1 || m_ml > 2) {
MsgStream log(Athena::getMessageSvc(),"MMReadoutElement");
log << MSG::WARNING <<"MMReadoutElement -- Unexpected Multilayer: m_ml= " << m_ml <<endmsg;
}
if (m_etaDesign[il].sAngle == 0.) { // eta layers
-
- m_etaDesign[il].firstPos = -0.5*m_etaDesign[il].xSize;
- m_etaDesign[il].signY = 1 ;
-
- m_etaDesign[il].nch = ((int) std::round( (m_etaDesign[il].xSize/pitch))) + 1;
- if (m_etaDesign[il].nch > chMax) { // never enters in this if statement
- // fix with help of dead zone
-
- double dead = 0.5*(m_etaDesign[il].xSize - chMax*pitch);
- m_etaDesign[il].deadO = dead;
- m_etaDesign[il].deadI = dead;
- m_etaDesign[il].firstPos += dead;
- m_etaDesign[il].nch = chMax;
- }
+ m_etaDesign[il].firstPos = -0.5*m_etaDesign[il].xSize;
+ m_etaDesign[il].signY = 1 ;
+ m_etaDesign[il].nch = ((int) std::round( (m_etaDesign[il].xSize/pitch))) + 1; // Total number of active strips
} else { // stereo layers
- m_etaDesign[il].signY = il==2? 1 : -1 ;
-
- // define the distance from the frame till the point that the first and last active stereo strips cross the center of the chamber (low_swift & up_swift)
- // in order to derive the total number of active strips for the stereo layer
+ m_etaDesign[il].signY = il==2? 1 : -1 ;
-
- double low_swift=( m_minHalfY -m_etaDesign[il].dlStereoBottom)*fabs(tan(m_etaDesign[il].sAngle));
- double up_swift = (m_maxHalfY - m_etaDesign[il].dlStereoTop)*fabs(tan(m_etaDesign[il].sAngle));
-
- double lm1_swift =0;
- if(sector_l=='L' && (abs(getStationEta()))==1){
- lm1_swift = (m_etaDesign[il].minYPhiR - m_etaDesign[il].minYPhiL)/2 + m_etaDesign[il].minYPhiL;
- low_swift = 0;
- }
-
- double fPos = -0.5*m_etaDesign[il].xSize - low_swift + lm1_swift;
- double lPos = 0.5*m_etaDesign[il].xSize + up_swift;
-
- m_etaDesign[il].nch = ((int)std::round( (lPos - fPos)/pitch )) + 1;
-
- m_etaDesign[il].firstPos = ( -0.5*m_etaDesign[il].xSize + (m_etaDesign[il].nMissedBottomStereo + m_etaDesign[il].nRoutedBottom - m_etaDesign[il].nMissedBottomEta)*pitch) - m_etaDesign[il].nRoutedBottom*pitch;
+ // define the distance from the frame till the point that the first and last active stereo strips cross the center of the chamber (low_swift & up_swift)
+ // in order to derive the total number of active strips for the stereo layer
+ double low_swift=( m_minHalfY -m_etaDesign[il].dlStereoBottom)*std::abs(std::tan(m_etaDesign[il].sAngle));
+ double up_swift = (m_maxHalfY - m_etaDesign[il].dlStereoTop)*std::abs(std::tan(m_etaDesign[il].sAngle));
- if (m_etaDesign[il].nch > chMax) {
- // dead zone does not help here - just limit number of channels
- m_etaDesign[il].nch = chMax;
- }
+ double lm1_swift =0;
+ if(sector_l=='L' && (std::abs(getStationEta()))==1){
+ lm1_swift = (m_etaDesign[il].minYPhiR - m_etaDesign[il].minYPhiL)/2 + m_etaDesign[il].minYPhiL;
+ low_swift = 0;
+ }
+
+ double fPos = -0.5*m_etaDesign[il].xSize - low_swift + lm1_swift;
+ double lPos = 0.5*m_etaDesign[il].xSize + up_swift;
+
+ m_etaDesign[il].nch = ((int)std::round( (lPos - fPos)/pitch )) + 1;
+
+ m_etaDesign[il].firstPos = ( -0.5*m_etaDesign[il].xSize + (m_etaDesign[il].nMissedBottomStereo - m_etaDesign[il].nMissedBottomEta)*pitch);
+
+ }
+ m_nStrips.push_back(m_etaDesign[il].totalStrips);
- }
-
- m_nStrips.push_back(m_etaDesign[il].nch);
-#ifndef NDEBUG
MsgStream log(Athena::getMessageSvc(),"MMReadoutElement");
if (log.level()<=MSG::DEBUG) log << MSG::DEBUG <<"initDesign:" << getStationName()<< " layer " << il << ", strip pitch " << m_etaDesign[il].inputPitch << ", nstrips " << m_etaDesign[il].nch << " stereo " << m_etaDesign[il].sAngle << endmsg;
-#endif
+
}
}
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/CMakeLists.txt b/MuonSpectrometer/MuonDigitization/MM_Digitization/CMakeLists.txt
index ffc7132be41..02f3c6374f2 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/CMakeLists.txt
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/CMakeLists.txt
@@ -15,6 +15,7 @@ atlas_depends_on_subdirs( PUBLIC
GaudiKernel
MagneticField/MagFieldElements
MagneticField/MagFieldConditions
+ MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
MuonSpectrometer/MuonDigitization/MuonDigToolInterfaces
MuonSpectrometer/MuonSimEvent
Simulation/HitManagement
@@ -23,7 +24,6 @@ atlas_depends_on_subdirs( PUBLIC
Generators/GeneratorObjects
Generators/AtlasHepMC
MuonSpectrometer/MuonDetDescr/MuonAGDDDescription
- MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
MuonSpectrometer/MuonDigitContainer
MuonSpectrometer/MuonIdHelpers
MuonSpectrometer/MuonSimData
@@ -51,8 +51,8 @@ atlas_add_library( MM_DigitizationLib
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${AIDA_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps AthenaKernel GeoPrimitives Identifier GaudiKernel MagFieldInterfaces MuonSimEvent HitManagement PileUpToolsLib StoreGateLib SGtests MuonIdHelpersLib NSWCalibToolsLib MagFieldElements MagFieldConditions
- PRIVATE_LINK_LIBRARIES AtlasHepMCLib GeneratorObjects MuonAGDDDescription MuonReadoutGeometry MuonDigitContainer MuonSimData AtlasCLHEP_RandomGenerators PathResolver TrkDetDescrUtils TrkSurfaces TrkEventPrimitives )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps AthenaKernel GeoPrimitives Identifier GaudiKernel MagFieldInterfaces MuonSimEvent HitManagement PileUpToolsLib StoreGateLib SGtests MuonIdHelpersLib NSWCalibToolsLib MagFieldElements MagFieldConditions MuonReadoutGeometry
+ PRIVATE_LINK_LIBRARIES AtlasHepMCLib GeneratorObjects MuonAGDDDescription MuonDigitContainer MuonSimData AtlasCLHEP_RandomGenerators PathResolver TrkDetDescrUtils TrkSurfaces TrkEventPrimitives )
atlas_add_component( MM_Digitization
src/components/*.cxx
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_DigitToolInput.h b/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_DigitToolInput.h
index f44273073e7..ed3bae9741f 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_DigitToolInput.h
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_DigitToolInput.h
@@ -25,13 +25,14 @@ Class to store input needed for the MM_Digitization tools:
class MM_DigitToolInput {
public:
- MM_DigitToolInput(int stripIdLocal, double posx, double incomingAngleXZ, double incomingAngleYZ, const Amg::Vector3D& magneticField, int stripMaxId, int gasgap, float eventTime)
+ MM_DigitToolInput(int stripIdLocal, double posx, double incomingAngleXZ, double incomingAngleYZ, const Amg::Vector3D& magneticField, int stripMinId, int stripMaxId, int gasgap, float eventTime)
: m_stripIDLocal(stripIdLocal),
m_xpos(posx),
m_incomingAngleXZ(incomingAngleXZ),
m_incomingAngleYZ(incomingAngleYZ),
m_magneticField(magneticField),
+ m_stripMinId(stripMinId),
m_stripMaxId(stripMaxId),
m_gasgap(gasgap),
m_eventTime(eventTime)
@@ -45,6 +46,7 @@ class MM_DigitToolInput {
double incomingAngleXZ() const { return m_incomingAngleXZ; }
double incomingAngleYZ() const { return m_incomingAngleYZ; }
const Amg::Vector3D& magneticField() const { return m_magneticField; } // kT unit, local cordinate
+ int stripMinID() const { return m_stripMinId; }
int stripMaxID() const { return m_stripMaxId; }
int gasgap() const { return m_gasgap; }
Identifier getHitID() const { return m_hitID; }
@@ -56,6 +58,7 @@ class MM_DigitToolInput {
double m_incomingAngleXZ;
double m_incomingAngleYZ;
Amg::Vector3D m_magneticField;
+ int m_stripMinId;
int m_stripMaxId;
int m_gasgap;
Identifier m_hitID;
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_StripResponse.h b/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_StripResponse.h
index a2bddb14e5d..f3b5d1612d6 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_StripResponse.h
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_StripResponse.h
@@ -22,7 +22,7 @@ class MM_StripResponse {
public:
MM_StripResponse();
- MM_StripResponse(std::vector<MM_IonizationCluster> IonizationClusters, float timeResolution, float stripPitch, int stripID, int maxstripID);
+ MM_StripResponse(std::vector<MM_IonizationCluster> IonizationClusters, float timeResolution, float stripPitch, int stripID, int minstripID, int maxstripID);
void timeOrderElectrons();
void calculateTimeSeries(float thetaD, int gasgap);
// void calculateTimeSeries();
@@ -47,6 +47,7 @@ class MM_StripResponse {
float m_timeResolution;
float m_stripPitch;
int m_stripID;
+ int m_minstripID;
int m_maxstripID;
std::vector<MM_Electron*> m_Electrons;
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_StripsResponseSimulation.h b/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_StripsResponseSimulation.h
index 691dfb62f34..aacdb0d6f7b 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_StripsResponseSimulation.h
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_StripsResponseSimulation.h
@@ -70,7 +70,7 @@ public :
void initHistos ();
void clearValues ();
void initFunctions ();
- void whichStrips(const float & hitx, const int & stripOffest, const float & incidentAngleXZ, const float & incidentAngleYZ, const int & stripMaxID, const MM_DigitToolInput & digiInput);
+ void whichStrips(const float & hitx, const int & stripOffest, const float & incidentAngleXZ, const float & incidentAngleYZ, const int & stripMinID, const int & stripMaxID, const MM_DigitToolInput & digiInput);
inline void setQThreshold (float val) { m_qThreshold = val; };
inline void setTransverseDiffusionSigma (float val) { m_transverseDiffusionSigma = val; };
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_DigitizationTool.cxx b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_DigitizationTool.cxx
index 75d19243bc4..56dca652ea1 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_DigitizationTool.cxx
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_DigitizationTool.cxx
@@ -892,23 +892,23 @@ StatusCode MM_DigitizationTool::doDigitization(const EventContext& ctx) {
Amg::Vector2D tmp (stripLayerPosition.x(), stripLayerPosition.y());
if( stripNumber == -1 ){
- ATH_MSG_WARNING("!!! Failed to obtain strip number "
- << m_idHelperSvc->mmIdHelper().print_to_string(layerID)
- << "\n\t\t with pos "
- << positionOnSurface
- << " z "
- << stripLayerPosition.z()
- << " eKin: "
- << hit.kineticEnergy()
- << " eDep: "
- << hit.depositEnergy()
- << " unprojectedStrip: "
- << detectorReadoutElement->stripNumber(positionOnSurfaceUnprojected, layerID)
- );
- m_exitcode = 2;
- if(m_writeOutputFile) m_ntuple->Fill();
- ATH_MSG_DEBUG( "m_exitcode = 2 " );
- continue;
+ ATH_MSG_WARNING("!!! Failed to obtain strip number "
+ << m_idHelperSvc->mmIdHelper().print_to_string(layerID)
+ << "\n\t\t with pos "
+ << positionOnSurface
+ << " z "
+ << stripLayerPosition.z()
+ << " eKin: "
+ << hit.kineticEnergy()
+ << " eDep: "
+ << hit.depositEnergy()
+ << " unprojectedStrip: "
+ << detectorReadoutElement->stripNumber(positionOnSurfaceUnprojected, layerID)
+ );
+ m_exitcode = 2;
+ if(m_writeOutputFile) m_ntuple->Fill();
+ ATH_MSG_DEBUG( "m_exitcode = 2 " );
+ continue;
}
// Re-definition Of ID
@@ -975,18 +975,17 @@ StatusCode MM_DigitizationTool::doDigitization(const EventContext& ctx) {
//
////////////////////////////////////////////////////////////////////
-
////////////////////////////////////////////////////////////////////
//
// Strip Response Simulation For This Hit
//
-
const MM_DigitToolInput stripDigitInput( stripNumber,
distToChannel,
inAngle_XZ,
inAngle_YZ,
localMagneticField,
- detectorReadoutElement->numberOfStrips(layerID),
+ detectorReadoutElement->numberOfMissingBottomStrips(layerID),
+ detectorReadoutElement->numberOfStrips(layerID)-detectorReadoutElement->numberOfMissingTopStrips(layerID),
m_idHelperSvc->mmIdHelper().gasGap(layerID),
m_eventTime+m_globalHitTime
);
@@ -1022,26 +1021,23 @@ StatusCode MM_DigitizationTool::doDigitization(const EventContext& ctx) {
MM_ElectronicsToolInput stripDigitOutput( tmpStripOutput.NumberOfStripsPos(), tmpStripOutput.chipCharge(), tmpStripOutput.chipTime(), digitID , hit.kineticEnergy());
// This block is purely validation
- if (stripNumber!=1){ // Extra if statement from quick fix from deadstrip = #1
- for(size_t i = 0; i<tmpStripOutput.NumberOfStripsPos().size(); i++){
- int tmpStripID = tmpStripOutput.NumberOfStripsPos().at(i);
- bool isValid;
- Identifier cr_id = m_idHelperSvc->mmIdHelper().channelID(stName, m_idHelperSvc->mmIdHelper().stationEta(layerID), m_idHelperSvc->mmIdHelper().stationPhi(layerID), m_idHelperSvc->mmIdHelper().multilayer(layerID), m_idHelperSvc->mmIdHelper().gasGap(layerID), tmpStripID, true, &isValid);
- if (!isValid) {
- ATH_MSG_WARNING( "MicroMegas digitization: failed to create a valid ID for (chip response) strip n. " << tmpStripID << "; associated positions will be set to 0.0." );
- } else {
- Amg::Vector2D cr_strip_pos(0., 0.);
- if ( !detectorReadoutElement->stripPosition(cr_id,cr_strip_pos) ) {
- ATH_MSG_WARNING("MicroMegas digitization: failed to associate a valid local position for (chip response) strip n. "
- << tmpStripID
- << "; associated positions will be set to 0.0."
- );
- }
- }
- }
+ for(size_t i = 0; i<tmpStripOutput.NumberOfStripsPos().size(); i++){
+ int tmpStripID = tmpStripOutput.NumberOfStripsPos().at(i);
+ bool isValid;
+ Identifier cr_id = m_idHelperSvc->mmIdHelper().channelID(stName, m_idHelperSvc->mmIdHelper().stationEta(layerID), m_idHelperSvc->mmIdHelper().stationPhi(layerID), m_idHelperSvc->mmIdHelper().multilayer(layerID), m_idHelperSvc->mmIdHelper().gasGap(layerID), tmpStripID, true, &isValid);
+ if (!isValid) {
+ ATH_MSG_WARNING( "MicroMegas digitization: failed to create a valid ID for (chip response) strip n. " << tmpStripID << "; associated positions will be set to 0.0." );
+ } else {
+ Amg::Vector2D cr_strip_pos(0., 0.);
+ if ( !detectorReadoutElement->stripPosition(cr_id,cr_strip_pos) ) {
+ ATH_MSG_WARNING("MicroMegas digitization: failed to associate a valid local position for (chip response) strip n. "
+ << tmpStripID
+ << "; associated positions will be set to 0.0."
+ );
+ }
+ }
}
-
v_stripDigitOutput.push_back(stripDigitOutput);
//
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripResponse.cxx b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripResponse.cxx
index 8530e5c84fa..2ab98c8e481 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripResponse.cxx
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripResponse.cxx
@@ -6,7 +6,7 @@
MM_StripResponse::MM_StripResponse() {}
-MM_StripResponse::MM_StripResponse(std::vector<MM_IonizationCluster> IonizationClusters, float timeResolution, float stripPitch, int stripID, int maxstripID) : m_timeResolution(timeResolution), m_stripPitch(stripPitch), m_stripID(stripID), m_maxstripID(maxstripID) {
+MM_StripResponse::MM_StripResponse(std::vector<MM_IonizationCluster> IonizationClusters, float timeResolution, float stripPitch, int stripID, int minstripID, int maxstripID) : m_timeResolution(timeResolution), m_stripPitch(stripPitch), m_stripID(stripID), m_minstripID(minstripID), m_maxstripID(maxstripID) {
for (auto& IonizationCluster : IonizationClusters)
for (auto& Electron : IonizationCluster.getElectrons())
@@ -35,7 +35,7 @@ void MM_StripResponse::calculateTimeSeries(float /*thetaD*/, int /*gasgap*/) {
// m_stripID defines the initial strip where the muon entered the gas gap
int stripVal = 0;
- if(fabs(Electron->getX())>m_stripPitch/2){
+ if(std::abs(Electron->getX())>m_stripPitch/2){
if(Electron->getX()>0.0)
stripVal = m_stripID + int( (Electron->getX()-m_stripPitch/2)/m_stripPitch ) + 1 ;
else
@@ -43,8 +43,10 @@ void MM_StripResponse::calculateTimeSeries(float /*thetaD*/, int /*gasgap*/) {
}
else stripVal = m_stripID;
- if (stripVal < 0 || stripVal > m_maxstripID) stripVal = -1;
- (m_stripCharges[timeBin])[stripVal] += Electron->getCharge();
+ // Only add the strips that are either read out, or can cross talk to the read out strips
+ if (stripVal < m_minstripID-2 || stripVal > m_maxstripID+1) stripVal = -1;
+ if (stripVal > 0)
+ (m_stripCharges[timeBin])[stripVal] += Electron->getCharge();
}
}
@@ -68,14 +70,16 @@ void MM_StripResponse::simulateCrossTalk(float crossTalk1, float crossTalk2) {
if (stripChargeVal==0.) continue;
- if (stripVal-1 > -1) (m_stripCharges[timeBin])[stripVal-1] += stripChargeVal * crossTalk1;
- if (stripVal+1 > -1) (m_stripCharges[timeBin])[stripVal+1] += stripChargeVal * crossTalk1;
- (m_stripCharges[timeBin])[stripVal] -= stripChargeVal * crossTalk1 * ( (stripVal-1 > -1) + (stripVal+1 > -1) );
+ // Allow crosstalk between strips that exist.
+ // Will check for read out strips in calculateSummaries function
+ if (stripVal-1 > 0) (m_stripCharges[timeBin])[stripVal-1] += stripChargeVal * crossTalk1;
+ if (stripVal+1 < m_maxstripID) (m_stripCharges[timeBin])[stripVal+1] += stripChargeVal * crossTalk1;
+ (m_stripCharges[timeBin])[stripVal] -= stripChargeVal * crossTalk1 * ( (stripVal-1 > 0) + (stripVal+1 < m_maxstripID) );
if (crossTalk2 > 0.){
- if (stripVal-2 > -1) (m_stripCharges[timeBin])[stripVal-2] += stripChargeVal * crossTalk2;
- if (stripVal+2 > -1) (m_stripCharges[timeBin])[stripVal+2] += stripChargeVal * crossTalk2;
- (m_stripCharges[timeBin])[stripVal] -= stripChargeVal * crossTalk2 * ( (stripVal-2 > -1) + (stripVal+2 > -1) );
+ if (stripVal-2 > 0) (m_stripCharges[timeBin])[stripVal-2] += stripChargeVal * crossTalk2;
+ if (stripVal+2 < m_maxstripID) (m_stripCharges[timeBin])[stripVal+2] += stripChargeVal * crossTalk2;
+ (m_stripCharges[timeBin])[stripVal] -= stripChargeVal * crossTalk2 * ( (stripVal-2 > 0) + (stripVal+2 < m_maxstripID) );
}
}
}
@@ -90,6 +94,12 @@ void MM_StripResponse::calculateSummaries(float chargeThreshold) {
int timeBin = stripTimeSeries.first;
for (auto & stripCharge : stripTimeSeries.second ){
int stripVal = stripCharge.first;
+ // remove dead (missing) strips
+ // First active strip starts at m_minstripID
+ // Last active strip numbrer is maxStripID-1
+ if (stripVal < m_minstripID || stripVal > m_maxstripID-1) continue;
+ // remove PCB gap strips
+ if (stripVal == 1023 || stripVal == 1024 || stripVal == 2047 || stripVal == 2048 || stripVal == 3071 || stripVal == 3072 || stripVal == 4095 || stripVal == 4096) continue;
float stripChargeVal = stripCharge.second;
if(stripChargeVal < chargeThreshold) continue;
@@ -103,13 +113,13 @@ void MM_StripResponse::calculateSummaries(float chargeThreshold) {
}
}
if(!found){ // // strip not in vector, add new entry
- m_v_strip.push_back(stripVal);
- std::vector<float> qTemp;
- qTemp.push_back(stripChargeVal);
- m_v_stripTotalCharge.push_back(qTemp);
- std::vector<float> tTemp;
- tTemp.push_back(timeBin*m_timeResolution);
- m_v_stripTimeThreshold.push_back(tTemp);
+ m_v_strip.push_back(stripVal);
+ std::vector<float> qTemp;
+ qTemp.push_back(stripChargeVal);
+ m_v_stripTotalCharge.push_back(qTemp);
+ std::vector<float> tTemp;
+ tTemp.push_back(timeBin*m_timeResolution);
+ m_v_stripTimeThreshold.push_back(tTemp);
}
}
}
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripsResponseSimulation.cxx b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripsResponseSimulation.cxx
index b1f4ad09c12..381917cf668 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripsResponseSimulation.cxx
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripsResponseSimulation.cxx
@@ -151,6 +151,7 @@ MM_StripToolOutput MM_StripsResponseSimulation::GetResponseFrom(const MM_DigitTo
digiInput.stripIDLocal(),
digiInput.incomingAngleXZ(), //degrees
digiInput.incomingAngleYZ(), //degrees
+ digiInput.stripMinID(),
digiInput.stripMaxID(),
digiInput
);
@@ -171,6 +172,7 @@ void MM_StripsResponseSimulation::whichStrips( const float & hitx,
const int & stripID,
const float & incidentAngleXZ,
const float & incidentAngleYZ,
+ const int & stripMinID,
const int & stripMaxID,
const MM_DigitToolInput & digiInput)
{
@@ -283,7 +285,7 @@ void MM_StripsResponseSimulation::whichStrips( const float & hitx,
float timeresolution = 0.01; //ns
- MM_StripResponse stripResponseObject(m_IonizationClusters, timeresolution, m_pitch, stripID, stripMaxID);
+ MM_StripResponse stripResponseObject(m_IonizationClusters, timeresolution, m_pitch, stripID, stripMinID, stripMaxID);
stripResponseObject.timeOrderElectrons();
stripResponseObject.calculateTimeSeries(incidentAngleXZ, digiInput.gasgap());
stripResponseObject.simulateCrossTalk( m_crossTalk1, m_crossTalk2);
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMDigitVariables.cxx b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMDigitVariables.cxx
index 34273f34ff5..8c809ca0a19 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMDigitVariables.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMDigitVariables.cxx
@@ -119,13 +119,13 @@ StatusCode MMDigitVariables::fillVariables(const MuonGM::MuonDetectorManager* Mu
//retrieve the detailed identifier for the strip form the chip response
Identifier cr_id = m_MmIdHelper->channelID(stationName, stationEta, stationPhi, multiplet, gas_gap, cr_strip, true, &isValid);
if (!isValid) {
- ATH_MSG_WARNING("MicroMegas digitization: failed to create a valid ID for (chip response) strip n. " << cr_strip
+ ATH_MSG_WARNING("MMDigitVariables: failed to create a valid ID for (chip response) strip n. " << cr_strip
<< "; associated positions will be set to 0.0.");
} else {
// asking the detector element to get local position of strip
Amg::Vector2D cr_strip_pos(0., 0.);
if ( !rdoEl->stripPosition(cr_id,cr_strip_pos) ) {
- ATH_MSG_WARNING("MicroMegas digitization: failed to associate a valid local position for (chip response) strip n. " << cr_strip
+ ATH_MSG_WARNING("MMDigitVariables: failed to associate a valid local position for (chip response) strip n. " << cr_strip
<< "; associated positions will be set to 0.0.");
} else {
localPosX.at(i) = cr_strip_pos.x();
@@ -168,13 +168,13 @@ StatusCode MMDigitVariables::fillVariables(const MuonGM::MuonDetectorManager* Mu
//retrieve the detailed identifier for the strip form the strip response
Identifier sr_id = m_MmIdHelper->channelID(stationName, stationEta, stationPhi, multiplet, gas_gap, sr_strip, true, &isValid);
if (!isValid) {
- ATH_MSG_WARNING("MicroMegas digitization: failed to create a valid ID for (chip response) strip n. " << sr_strip
+ ATH_MSG_WARNING("MMDigitVariables: failed to create a valid ID for (chip response) strip n. " << sr_strip
<< "; associated positions will be set to 0.0.");
} else {
// asking the detector element to transform this local to the global position
Amg::Vector2D sr_strip_pos(0., 0.);
if ( !rdoEl->stripPosition(sr_id,sr_strip_pos) ) {
- ATH_MSG_WARNING("MicroMegas digitization: failed to associate a valid local position for (chip response) strip n. " << sr_strip
+ ATH_MSG_WARNING("MMDigitVariables: failed to associate a valid local position for (chip response) strip n. " << sr_strip
<< "; associated positions will be set to 0.0.");
} else {
sr_localPosX.at(i) = sr_strip_pos.x();
--
GitLab