Skip to content
Snippets Groups Projects
Commit 05b2808c authored by Susumu Oda's avatar Susumu Oda Committed by Walter Lampl
Browse files

Remove std::recursive_mutex from SCT_FrontEnd.

parent ead8d466
No related branches found
No related tags found
7 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!28528Revert 63f845ae,!27054Atr20369 210
Expand all Hide whitespace changes
Inline Side-by-side
InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_FrontEnd.h
+ 20
− 18
View file @ 05b2808c
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
// STL // STL
#include <atomic> #include <atomic>
#include <mutex> #include <mutex>
#include <vector>
class ISCT_Amp; class ISCT_Amp;
class SCT_ID; class SCT_ID;
...@@ -59,6 +60,15 @@ namespace CLHEP { ...@@ -59,6 +60,15 @@ namespace CLHEP {
* collected charges, also does cross-talk, offset * collected charges, also does cross-talk, offset
* variation and gain variation, in a correlated way * variation and gain variation, in a correlated way
*/ */
struct SCT_FrontEndData {
std::vector<float> m_Offset; //!< generate offset per channel
std::vector<float> m_GainFactor; //!< generate gain per channel (added to the gain per chip from calib data)
std::vector<float> m_NoiseFactor; //!< Kondo: 31/08/07 noise per channel (actually noise per chip from calib data)
std::vector<double> m_Analogue[3]; //!< To hold the noise and amplifier response
std::vector<int> m_StripHitsOnWafer; //!< Info about which strips are above threshold
};
class SCT_FrontEnd : public extends<AthAlgTool, ISCT_FrontEnd> { class SCT_FrontEnd : public extends<AthAlgTool, ISCT_FrontEnd> {
public: public:
...@@ -80,18 +90,18 @@ class SCT_FrontEnd : public extends<AthAlgTool, ISCT_FrontEnd> { ...@@ -80,18 +90,18 @@ class SCT_FrontEnd : public extends<AthAlgTool, ISCT_FrontEnd> {
* process the collection of pre digits: needed to go through all single-strip pre-digits to calculate * process the collection of pre digits: needed to go through all single-strip pre-digits to calculate
* the amplifier response add noise (this could be moved elsewhere later) apply threshold do clustering * the amplifier response add noise (this could be moved elsewhere later) apply threshold do clustering
*/ */
virtual void process(SiChargedDiodeCollection& collection, CLHEP::HepRandomEngine * rndmEngine) const override; virtual void process(SiChargedDiodeCollection& collection, CLHEP::HepRandomEngine* rndmEngine) const override;
StatusCode doSignalChargeForHits(SiChargedDiodeCollection& collectione) const; StatusCode doSignalChargeForHits(SiChargedDiodeCollection& collectione, SCT_FrontEndData& data) const;
StatusCode doThresholdCheckForRealHits(SiChargedDiodeCollection& collectione) const; StatusCode doThresholdCheckForRealHits(SiChargedDiodeCollection& collectione, SCT_FrontEndData& data) const;
StatusCode doThresholdCheckForCrosstalkHits(SiChargedDiodeCollection& collection) const; StatusCode doThresholdCheckForCrosstalkHits(SiChargedDiodeCollection& collection, SCT_FrontEndData& data) const;
StatusCode doClustering(SiChargedDiodeCollection& collection) const; StatusCode doClustering(SiChargedDiodeCollection& collection, SCT_FrontEndData& data) const;
StatusCode prepareGainAndOffset(SiChargedDiodeCollection& collection, const Identifier& moduleId, CLHEP::HepRandomEngine * rndmEngine) const; StatusCode prepareGainAndOffset(SiChargedDiodeCollection& collection, const Identifier& moduleId, CLHEP::HepRandomEngine* rndmEngine, SCT_FrontEndData& data) const;
StatusCode prepareGainAndOffset(SiChargedDiodeCollection& collection, int side, const Identifier& moduleId, CLHEP::HepRandomEngine * rndmEngine) const; StatusCode prepareGainAndOffset(SiChargedDiodeCollection& collection, int side, const Identifier& moduleId, CLHEP::HepRandomEngine* rndmEngine, SCT_FrontEndData& data) const;
StatusCode randomNoise(SiChargedDiodeCollection& collection, const Identifier& moduleId, CLHEP::HepRandomEngine * rndmEngine) const; StatusCode randomNoise(SiChargedDiodeCollection& collection, const Identifier& moduleId, CLHEP::HepRandomEngine* rndmEngine, SCT_FrontEndData& data) const;
StatusCode randomNoise(SiChargedDiodeCollection& collection, const Identifier& moduleId, int side, CLHEP::HepRandomEngine * rndmEngine) const; StatusCode randomNoise(SiChargedDiodeCollection& collection, const Identifier& moduleId, int side, CLHEP::HepRandomEngine* rndmEngine, SCT_FrontEndData& data) const;
StatusCode addNoiseDiode(SiChargedDiodeCollection& collection, int strip, int tbin) const; StatusCode addNoiseDiode(SiChargedDiodeCollection& collection, int strip, int tbin) const;
float meanValue(std::vector<float>& calibDataVect) const; float meanValue(std::vector<float>& calibDataVect) const;
StatusCode initVectors(int strips) const; StatusCode initVectors(int strips, SCT_FrontEndData& data) const;
private: private:
...@@ -125,14 +135,6 @@ class SCT_FrontEnd : public extends<AthAlgTool, ISCT_FrontEnd> { ...@@ -125,14 +135,6 @@ class SCT_FrontEnd : public extends<AthAlgTool, ISCT_FrontEnd> {
const SCT_ID* m_sct_id{nullptr}; //!< Handle to SCT ID helper const SCT_ID* m_sct_id{nullptr}; //!< Handle to SCT ID helper
mutable std::atomic_int m_strip_max{768}; //!< For SLHC studies mutable std::atomic_int m_strip_max{768}; //!< For SLHC studies
mutable std::recursive_mutex m_mutex{};
mutable std::vector<float> m_Offset ATLAS_THREAD_SAFE; //!< generate offset per channel
mutable std::vector<float> m_GainFactor ATLAS_THREAD_SAFE; //!< generate gain per channel (added to the gain per chip from calib data)
mutable std::vector<float> m_NoiseFactor ATLAS_THREAD_SAFE; //!< Kondo: 31/08/07 noise per channel (actually noise per chip from calib data)
mutable std::vector<double> m_Analogue[3] ATLAS_THREAD_SAFE; //!< To hold the noise and amplifier response
mutable std::vector<int> m_StripHitsOnWafer ATLAS_THREAD_SAFE; //!< Info about which strips are above threshold
}; };
#endif //SCT_FRONTEND_H #endif //SCT_FRONTEND_H
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment