4 modified files
lcio/src/cpp
diff -u -r1.22.2.3 -r1.22.2.4
--- CMakeLists.txt 14 Sep 2009 13:50:48 -0000 1.22.2.3
+++ CMakeLists.txt 15 Sep 2009 08:06:22 -0000 1.22.2.4
@@ -173,6 +173,7 @@
OUTPUT_NAME lcio
)
+TARGET_LINK_LIBRARIES( lib_LCIO ${ROOT_LIBRARIES} )
TARGET_LINK_LIBRARIES( lib_LCIO lib_SIO )
TARGET_LINK_LIBRARIES( lib_LCIOF77 lib_LCIO )
lcio/src/cpp/include/IMPL
diff -u -r1.19.8.1 -r1.19.8.2
--- LCEventImpl.h 14 Sep 2009 13:50:48 -0000 1.19.8.1
+++ LCEventImpl.h 15 Sep 2009 08:06:22 -0000 1.19.8.2
@@ -173,13 +173,13 @@
std::string _detectorName ;
// map has to be defined mutable in order to use _map[] for const methods ...
- mutable LCCollectionMap _colMap ;
+ mutable LCCollectionMap _colMap ; //! no RIO
mutable std::vector<std::string> _colNames ;
LCParametersImpl _params ;
// set of collections that are not owned by the event anymore
- mutable LCCollectionSet _notOwned ;
+ mutable LCCollectionSet _notOwned ; //! no RIO
}; // class
lcio/src/cpp/include/RIO
diff -u -r1.1.2.2 -r1.1.2.3
--- rootio_templates.h 14 Sep 2009 13:50:48 -0000 1.1.2.2
+++ rootio_templates.h 15 Sep 2009 08:06:22 -0000 1.1.2.3
@@ -14,10 +14,15 @@
#include "IMPL/LCRelationImpl.h"
#include "TRefArray.h"
+#include <string>
// ---- tell ROOT about the templates instantiations that we are going to use ...
#ifdef __MAKECINT__
+#pragma link C++ class std::vector<std::string>+;
+#pragma link C++ class std::map<std::string,EVENT::LCCollection*>+;
+#pragma link C++ class std::pair<std::string,EVENT::LCCollection*>+;
+
#pragma link C++ class std::vector<IMPL::ReconstructedParticleImpl*>+;
#pragma link C++ class std::vector<IMPL::MCParticleImpl*>+;
#pragma link C++ class std::vector<IMPL::SimTrackerHitImpl*>+;
lcio/src/cpp/src/RIO
diff -u -r1.1.2.2 -r1.1.2.3
--- RIOReader.cc 14 Sep 2009 16:22:10 -0000 1.1.2.2
+++ RIOReader.cc 15 Sep 2009 08:06:22 -0000 1.1.2.3
@@ -347,6 +347,13 @@
<< " _evtImpl " << _evtImpl
<< std::endl ;
+ typedef std::vector< std::string > StrVec ;
+
+ const StrVec* strVec = _evtImpl->getCollectionNames() ;
+
+ for( StrVec::const_iterator name = strVec->begin() ; name != strVec->end() ; name++){
+ std::cout << " collection: " << *name << std::endl ;
+ }
if( !_haveBranches ) {
CVSspam 0.2.8