Address Simon's comments

Framework/API/inc/MantidAPI/ComponentInfo.h

@@ -52,14 +52,11 @@ private:
   /// Map of component ids to indexes
   boost::shared_ptr<std::unordered_map<Geometry::IComponent *, size_t>>
       m_compIDToIndex;
-  void init();
 
 public:
   ComponentInfo(
       const Mantid::Beamline::ComponentInfo &componentInfo,
-      const std::vector<Mantid::Geometry::IComponent *> &componentIds);
-  ComponentInfo(const Mantid::Beamline::ComponentInfo &componentInfo,
-                std::vector<Mantid::Geometry::IComponent *> &&componentIds);
+      const std::vector<Mantid::Geometry::IComponent *> componentIds);
   std::vector<size_t> detectorIndices(size_t componentIndex) const;
   std::vector<Mantid::Geometry::IComponent *> componentIds() const;
   size_t size() const;

Framework/API/src/ComponentInfo.cpp

@@ -10,42 +10,22 @@
 namespace Mantid {
 namespace API {
 
-/**
- * Constructor
- * @param componentInfo : Beamline wrapped ComponentInfo
- * @param componentIds : l-value reference to ComponentIDs ordered by component
- * index
- */
-ComponentInfo::ComponentInfo(
-    const Mantid::Beamline::ComponentInfo &componentInfo,
-    const std::vector<Mantid::Geometry::IComponent *> &componentIds)
-    : m_componentInfo(componentInfo),
-      m_componentIds(
-          boost::make_shared<std::vector<Geometry::ComponentID>>(componentIds)),
-      m_compIDToIndex(boost::make_shared<
-          std::unordered_map<Geometry::IComponent *, size_t>>()) {
-  init();
-}
 
 /**
  * Constructor
  * @brief ComponentInfo::ComponentInfo
  * @param componentInfo
- * @param componentIds : r-value reference to ComponentIDs ordered by component
+ * @param componentIds : ComponentIDs ordered by component
  * index
  */
 ComponentInfo::ComponentInfo(
     const Mantid::Beamline::ComponentInfo &componentInfo,
-    std::vector<Mantid::Geometry::IComponent *> &&componentIds)
+    std::vector<Mantid::Geometry::IComponent *> componentIds)
     : m_componentInfo(componentInfo),
       m_componentIds(boost::make_shared<std::vector<Geometry::ComponentID>>(
           std::move(componentIds))),
       m_compIDToIndex(boost::make_shared<
           std::unordered_map<Geometry::IComponent *, size_t>>()) {
-  init();
-}
-
-void ComponentInfo::init() {
   /*
    * Ideally we would check here that componentIds.size() ==
    * m_componentInfo.size().

Framework/API/src/ExperimentInfo.cpp

@@ -103,7 +103,6 @@ void ExperimentInfo::copyExperimentInfoFrom(const ExperimentInfo *other) {
   for (const auto &chopper : other->m_choppers) {
     m_choppers.push_back(chopper->clone());
   }
-  *m_detectorInfo = *other->m_detectorInfo;
   // We do not copy Beamline::SpectrumInfo (which contains detector grouping
   // information) for now:
   // - For MatrixWorkspace, grouping information is still stored in ISpectrum
@@ -111,7 +110,6 @@ void ExperimentInfo::copyExperimentInfoFrom(const ExperimentInfo *other) {
   //   not here since we just copy the experiment data).
   // - For cached groupings (for MDWorkspaces), grouping was not copied in the
   //   old implementation either.
-  *m_componentInfo = *other->m_componentInfo;
 }
 
 /** Clone this ExperimentInfo class into a new one