Merge branch 'author.MuonPrepRawData-20200618' into 'master'

MuonPrepRawData+MuonEventTPCnv: Fixes for MMPrepData::m_author.

See merge request !33900

MuonSpectrometer/MuonCnv/MuonEventTPCnv/MuonEventTPCnv/MuonPrepRawData/MMPrepData_p1.h

@@ -43,7 +43,7 @@ namespace Muon
 	std::vector<float>        m_stripDriftDist;
 	std::vector<Amg::MatrixX> m_stripDriftErrors;
 
-  int m_author; // contains the info about which cluster builder tool produced the PRD
+  int m_author = 0; // contains the info about which cluster builder tool produced the PRD
         
         //@}
         

MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/MMPrepDataCnv_p1.cxx

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "MuonPrepRawData/MMPrepData.h"
@@ -58,6 +58,7 @@ persToTrans( const Muon::MMPrepData_p1 *persObj, Muon::MMPrepData *transObj,MsgS
 				transObj->identify(),
                                 transObj->detectorElement(),
                                 log);
+  transObj->setAuthor(static_cast<Muon::MMPrepData::Author>(persObj->m_author));
 }
 
 void MMPrepDataCnv_p1::

MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MMPrepDataCnv_p1_test.cxx

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file MuonEventTPCnv/test/MMPrepDataCnv_p1_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -41,6 +39,7 @@ void compare (const Muon::MuonCluster& p1,
 void compare (const Muon::MMPrepData& p1,
               const Muon::MMPrepData& p2)
 {
+  assert (p1.author() == p2.author());
   compare (static_cast<const Muon::MuonCluster&>(p1),
            static_cast<const Muon::MuonCluster&>(p2));
   assert (p1.detectorElement() == p2.detectorElement());
@@ -80,6 +79,7 @@ void test1()
                            rdoList,
                            new Amg::MatrixX(cov),
                            nullptr);
+  trans1.setAuthor (Muon::MMPrepData::ConstraintuTPCClusterBuilder);
                           
   testit (trans1);
 }

MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MMPrepDataContainerCnv_p1_test.cxx

@@ -42,6 +42,7 @@ void compare (const Muon::MuonCluster& p1,
 void compare (const Muon::MMPrepData& p1,
               const Muon::MMPrepData& p2)
 {
+  assert (p1.author() == p2.author());
   assert (p1.identify() == p2.identify());
   compare (static_cast<const Muon::MuonCluster&>(p1),
            static_cast<const Muon::MuonCluster&>(p2));
@@ -117,6 +118,7 @@ makeclusts (const MuonGM::MuonDetectorManager& muo_dd)
          rdoList,
          new Amg::MatrixX(cov),
          muo_dd.getMMReadoutElement (clusId));
+      cl->setAuthor (Muon::MMPrepData::ProjectionClusterBuilder);
       coll->push_back (std::move (cl));
     }
     assert(cont->addCollection (coll.release(), hash));

MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData/src/MMPrepData.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "MuonPrepRawData/MMPrepData.h"
@@ -31,7 +31,8 @@ namespace Muon
     m_stripTimes(stripTimes),
     m_stripCharges(stripCharges),
     m_stripDriftDist(),
-    m_stripDriftErrors()
+    m_stripDriftErrors(),
+    m_author (SimpleClusterBuilder)
   { }
 
   MMPrepData::MMPrepData( const Identifier& RDOId,
@@ -51,7 +52,8 @@ namespace Muon
     m_chisqProb(0.0),
     m_stripNumbers(),
     m_stripTimes(),
-    m_stripCharges()
+    m_stripCharges(),
+    m_author (SimpleClusterBuilder)
   { }
 
   MMPrepData::MMPrepData( const Identifier& RDOId,
@@ -72,7 +74,8 @@ namespace Muon
     m_chisqProb(0.0),
     m_stripNumbers(),
     m_stripTimes(),
-    m_stripCharges()
+    m_stripCharges(),
+    m_author (SimpleClusterBuilder)
   { }
 
   MMPrepData::MMPrepData( const Identifier& RDOId,
@@ -92,7 +95,8 @@ namespace Muon
     m_stripTimes(),
     m_stripCharges(),
     m_stripDriftDist(),
-    m_stripDriftErrors()
+    m_stripDriftErrors(),
+    m_author (SimpleClusterBuilder)
   { }
 
   // Destructor:
@@ -114,7 +118,8 @@ namespace Muon
     m_stripTimes(),
     m_stripCharges(),
     m_stripDriftDist(),
-    m_stripDriftErrors()    
+    m_stripDriftErrors(),
+    m_author (SimpleClusterBuilder)
   { }
 
   //copy constructor:
@@ -130,7 +135,8 @@ namespace Muon
     m_stripTimes(RIO.m_stripTimes),
     m_stripCharges(RIO.m_stripCharges),
     m_stripDriftDist(RIO.m_stripDriftDist),
-    m_stripDriftErrors(RIO.m_stripDriftErrors)
+    m_stripDriftErrors(RIO.m_stripDriftErrors),
+    m_author(RIO.m_author)
   { }
 
   //move constructor:
@@ -146,7 +152,8 @@ namespace Muon
     m_stripTimes(RIO.m_stripTimes),
     m_stripCharges(RIO.m_stripCharges),
     m_stripDriftDist(RIO.m_stripDriftDist),
-    m_stripDriftErrors(RIO.m_stripDriftErrors)
+    m_stripDriftErrors(RIO.m_stripDriftErrors),
+    m_author(RIO.m_author)
   { }
 
   /// set the micro-tpc quantities
@@ -185,6 +192,7 @@ namespace Muon
 	m_stripCharges = RIO.m_stripCharges;
 	m_stripDriftDist = RIO.m_stripDriftDist;
 	m_stripDriftErrors = RIO.m_stripDriftErrors;
+	m_author = RIO.m_author;
       }
     return *this;
 
@@ -207,6 +215,7 @@ namespace Muon
 	m_stripCharges = RIO.m_stripCharges;
 	m_stripDriftDist = RIO.m_stripDriftDist;
 	m_stripDriftErrors = RIO.m_stripDriftErrors;
+	m_author = RIO.m_author;
       }
     return *this;