'CMakeLists.txt' (EventTPCnv-00-04-19)

2015-10-22  scott snyder  <snyder@bnl.gov>
	* Tagging EventTPCnv-00-04-19.
	* src/vectorize.cxx: Need to clear the containers before appending
	to them.

Event/EventTPCnv/CMakeLists.txt

+################################################################################
+# Package: EventTPCnv
+################################################################################
+
+# Declare the package name:
+atlas_subdir( EventTPCnv )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+                          Database/AthenaPOOL/AthenaPoolCnvSvc
+                          Event/EventInfo
+                          PRIVATE
+                          AtlasTest/TestTools
+                          Control/AthenaKernel )
+
+# External dependencies:
+find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+
+# Component(s) in the package:
+atlas_add_tpcnv_library( EventTPCnv
+                         src/*.cxx
+                         PUBLIC_HEADERS EventTPCnv
+                         INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+                         LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib EventInfo TestTools AthenaKernel )
+
+atlas_add_dictionary( EventTPCnvDict
+                      EventTPCnv/EventTPCnvDict.h
+                      EventTPCnv/selection.xml
+                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib EventInfo TestTools AthenaKernel EventTPCnv )
+
+atlas_add_dictionary( OLD_EventTPCnvDict
+                      EventTPCnv/EventTPCnvDict.h
+                      EventTPCnv/OLD_selection.xml
+                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib EventInfo TestTools AthenaKernel EventTPCnv )
+
+atlas_add_test( vectorize_test
+                SOURCES
+                test/vectorize_test.cxx
+                INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+                LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib EventInfo TestTools AthenaKernel EventTPCnv )
+

Event/EventTPCnv/src/PileUpEventInfoCnv_p5.cxx

@@ -17,6 +17,8 @@ static	EventInfoCnv_p4		evInfoConv;
 void PileUpEventInfoCnv_p5::transToPers(const PileUpEventInfo* trans, PileUpEventInfo_p5* pers, MsgStream &log) {
    evInfoConv.transToPers(trans, pers, log); 
 
+   pers->m_subEvents.clear();
+   /*
    size_t	sub_ev_n = trans->m_subEvents.size();
    pers->m_subEvents.resize(sub_ev_n);
    PileUpEventInfo::SubEvent::const_iterator	sub_iter = trans->beginSubEvt();
@@ -28,7 +30,7 @@ void PileUpEventInfoCnv_p5::transToPers(const PileUpEventInfo* trans, PileUpEven
       evInfoConv.transToPers(sub_iter->pSubEvt, &p_sub_iter->m_subEventInfo, log);
       p_sub_iter++;  sub_iter++;
    }
-
+   */
 }
 
 void PileUpEventInfoCnv_p5::persToTrans(const PileUpEventInfo_p5* pers, PileUpEventInfo* trans, MsgStream &log) 

Event/EventTPCnv/src/vectorize.cxx

@@ -30,6 +30,7 @@ void UITostr(std::string &n, std::vector<unsigned int>::const_iterator &i,
              bool bugcompat){
     int l = (*i) >> 16;
 
+    n.clear();
     n.reserve(l);
     int rem = 16;
 	
@@ -103,6 +104,7 @@ void UITobitmap(std::vector<bool> &n,
                 std::vector<unsigned int>::const_iterator &i,
                 bool bugcompat)
 {
+    n.clear();
     int l=(*i)>>16;
     n.reserve(l);
     int rem = 16;