From b9213e39c25af65bf45348eb0930a28b5bd5b65d Mon Sep 17 00:00:00 2001
From: Atlas-Software Librarian <Atlas-Software.Librarian@cern.ch>
Date: Fri, 8 Apr 2016 16:55:07 +0200
Subject: [PATCH] 'CMakeLists.txt' (MuonDigitContainer-01-02-20)
* Tagging MuonDigitContainer-01-02-20.
* MuonDigitContainer/MmDigit.h, src/MmDigit.cxx: Vectors should be
passed by const reference.
---
.../MuonDigitContainer/CMakeLists.txt | 35 +++++++++++++++++++
.../MuonDigitContainer/MmDigit.h | 24 ++++++++-----
.../MuonDigitContainer/src/MmDigit.cxx | 24 ++++++++++---
3 files changed, 69 insertions(+), 14 deletions(-)
create mode 100644 MuonSpectrometer/MuonDigitContainer/CMakeLists.txt
diff --git a/MuonSpectrometer/MuonDigitContainer/CMakeLists.txt b/MuonSpectrometer/MuonDigitContainer/CMakeLists.txt
new file mode 100644
index 00000000000..1c538aad65f
--- /dev/null
+++ b/MuonSpectrometer/MuonDigitContainer/CMakeLists.txt
@@ -0,0 +1,35 @@
+################################################################################
+# Package: MuonDigitContainer
+################################################################################
+
+# Declare the package name:
+atlas_subdir( MuonDigitContainer )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+ Control/CLIDSvc
+ Control/DataModel
+ Control/SGTools
+ DetectorDescription/Identifier
+ Event/EventContainers
+ MuonSpectrometer/MuonIdHelpers
+ PRIVATE
+ TestPolicy )
+
+# External dependencies:
+find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+
+# Component(s) in the package:
+atlas_add_library( MuonDigitContainer
+ src/*.cxx
+ PUBLIC_HEADERS MuonDigitContainer
+ PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES DataModel SGTools Identifier MuonIdHelpersLib
+ PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
+
+atlas_add_dictionary( MuonDigitContainerDict
+ MuonDigitContainer/MuonDigitContainerDict.h
+ MuonDigitContainer/selection.xml
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel SGTools Identifier MuonIdHelpersLib MuonDigitContainer )
+
diff --git a/MuonSpectrometer/MuonDigitContainer/MuonDigitContainer/MmDigit.h b/MuonSpectrometer/MuonDigitContainer/MuonDigitContainer/MmDigit.h
index 59db582c2db..d4a41f62558 100755
--- a/MuonSpectrometer/MuonDigitContainer/MuonDigitContainer/MmDigit.h
+++ b/MuonSpectrometer/MuonDigitContainer/MuonDigitContainer/MmDigit.h
@@ -42,20 +42,26 @@ class MmDigit : public MuonDigit {
/** Full constructor --- From Identifier and time */
- MmDigit(const Identifier& id, std::vector<float> stripResponseTime, std::vector<int> stripResponsePosition, std::vector<float> stripResponseCharge,
- std::vector<float> chipResponseTime, std::vector<int> chipResponsePosition, std::vector<float> chipResponseCharge,
- int stripForTrigger, float stripTimeForTrigger);
+ MmDigit(const Identifier& id,
+ const std::vector<float>& stripResponseTime,
+ const std::vector<int>& stripResponsePosition,
+ const std::vector<float>& stripResponseCharge,
+ const std::vector<float>& chipResponseTime,
+ const std::vector<int>& chipResponsePosition,
+ const std::vector<float>& chipResponseCharge,
+ int stripForTrigger,
+ float stripTimeForTrigger);
// Is this a valid digit?
bool is_valid(const MmIdHelper * mmHelper) const;
/** strip response info */
/** return the time */
- const std::vector<float> stripResponseTime() const { return m_stripResponseTime; }
+ const std::vector<float>& stripResponseTime() const { return m_stripResponseTime; }
/** Return the strip position */
- const std::vector<int> stripResponsePosition() const { return m_stripResponsePosition; }
+ const std::vector<int>& stripResponsePosition() const { return m_stripResponsePosition; }
/** Return the charge */
- const std::vector<float> stripResponseCharge() const { return m_stripResponseCharge; }
+ const std::vector<float>& stripResponseCharge() const { return m_stripResponseCharge; }
/** Return the stripForTrigger */
int stripForTrigger() const { return m_stripForTrigger; }
/** Return the charge */
@@ -63,11 +69,11 @@ class MmDigit : public MuonDigit {
/** chip response info */
/** return the time */
- const std::vector<float> chipResponseTime() const { return m_chipResponseTime; }
+ const std::vector<float>& chipResponseTime() const { return m_chipResponseTime; }
/** Return the strip position */
- const std::vector<int> chipResponsePosition() const { return m_chipResponsePosition; }
+ const std::vector<int>& chipResponsePosition() const { return m_chipResponsePosition; }
/** Return the charge */
- const std::vector<float> chipResponseCharge() const { return m_chipResponseCharge; }
+ const std::vector<float>& chipResponseCharge() const { return m_chipResponseCharge; }
diff --git a/MuonSpectrometer/MuonDigitContainer/src/MmDigit.cxx b/MuonSpectrometer/MuonDigitContainer/src/MmDigit.cxx
index 77b82f9f91c..368b1610ee1 100755
--- a/MuonSpectrometer/MuonDigitContainer/src/MmDigit.cxx
+++ b/MuonSpectrometer/MuonDigitContainer/src/MmDigit.cxx
@@ -34,11 +34,25 @@ MmDigit::MmDigit(const Identifier& id)
// Full constructor, with trigger Info
-MmDigit::MmDigit(const Identifier& id, std::vector<float> stripResponseTime, std::vector<int> stripResponsePosition, std::vector<float> stripResponseCharge,
-std::vector<float> chipResponseTime, std::vector<int> chipResponsePosition, std::vector<float> chipResponseCharge, int stripForTrigger, float stripTimeForTrigger)
- : MuonDigit(id), m_stripResponseTime(stripResponseTime), m_stripResponseCharge(stripResponseCharge), m_stripResponsePosition(stripResponsePosition),
- m_chipResponseTime(chipResponseTime), m_chipResponseCharge(chipResponseCharge), m_chipResponsePosition(chipResponsePosition),
- m_stripForTrigger(stripForTrigger), m_stripTimeForTrigger(stripTimeForTrigger) { }
+MmDigit::MmDigit(const Identifier& id,
+ const std::vector<float>& stripResponseTime,
+ const std::vector<int>& stripResponsePosition,
+ const std::vector<float>& stripResponseCharge,
+ const std::vector<float>& chipResponseTime,
+ const std::vector<int>& chipResponsePosition,
+ const std::vector<float>& chipResponseCharge,
+ int stripForTrigger,
+ float stripTimeForTrigger)
+ : MuonDigit(id),
+ m_stripResponseTime(stripResponseTime),
+ m_stripResponseCharge(stripResponseCharge),
+ m_stripResponsePosition(stripResponsePosition),
+ m_chipResponseTime(chipResponseTime),
+ m_chipResponseCharge(chipResponseCharge),
+ m_chipResponsePosition(chipResponsePosition),
+ m_stripForTrigger(stripForTrigger),
+ m_stripTimeForTrigger(stripTimeForTrigger)
+{ }
//**********************************************************************/
// Validity check.
--
GitLab