Commits

Anonymous committed 8c592cd

use a vector of SG::FolderItems instead of a pair clid+string

Comments (0)

Files changed (3)

+2012-03-13  Sebastien Binet  <binet@voatlas51.cern.ch>
+
+	* tagging AthenaRootComps-00-10-04
+	* use a vector of SG::FolderItems instead of a pair clid+string
+	* M src/RootNtupleOutputStream.h
+	* M src/RootNtupleOutputStream.cxx
+
 2012-03-10  Sebastien Binet  <binet@voatlas51.cern.ch>
 
 	* tagging AthenaRootComps-00-10-03

src/RootNtupleOutputStream.cxx

 void
 RootNtupleOutputStream::collectAllObjects() 
 {
-  typedef std::vector<std::pair<CLID, std::string> > Items_t;
+  typedef std::vector<SG::FolderItem> Items_t;
 
   if (!m_dynamicItemList && !m_selection.empty()) {
     // reuse object list from previous event.
 			  FNM_PATHNAME);
 	  if (o == 0) {
 	    // accept
-	    selection.push_back(std::make_pair(proxy->clID(), proxy->name()));
+	    selection.push_back(SG::FolderItem(proxy->clID(), proxy->name()));
 	    break;
 	  }
 	}
 	    iend=selection.end();
 	  isel != iend;
 	  ++isel) {
-	const std::string &name = isel->second;
+	const std::string &name = isel->key();
 	bool keep = true;
 	for (std::vector<std::string>::const_iterator
 	       jkey = toremove.begin(),
 	 iend = m_selection.end();
        itr != iend;
        ++itr) {
-    const std::string &name = itr->second;
-    SG::DataProxy *proxy = m_dataStore->proxy(itr->first, name);
+    const std::string &name = itr->key();
+    SG::DataProxy *proxy = m_dataStore->proxy(itr->id(), name);
     if (NULL == proxy) {
       continue;
     }

src/RootNtupleOutputStream.h

   bool m_dynamicItemList;
 
   /// list of selected proxies.
-  std::vector<std::pair<CLID, std::string> > m_selection;
+  std::vector<SG::FolderItem> m_selection;
 
   /// pointer to AthenaOutputStreamTool
   ToolHandle<IAthenaOutputStreamTool> m_streamer;