5 modified files
lcio/rootio
diff -u -r1.1.2.5 -r1.1.2.6
--- ToDo.txt 1 Dec 2009 11:11:03 -0000 1.1.2.5
+++ ToDo.txt 1 Dec 2009 14:15:31 -0000 1.1.2.6
@@ -37,8 +37,13 @@
- make LCCollection branches subbranches of LCEvent
-
+
- don't flush at the end of writing the event - rather use 'autosave' feature
TTree::SetAutoSave()
+ DONE.
+
+
+ - add LCParameters to outout file as soon as problem is fixed in next ROOT release (5.26.00 )
+
lcio/src/cpp/include/IMPL
diff -u -r1.2.20.2 -r1.2.20.3
--- LCParametersImpl.h 1 Dec 2009 11:11:03 -0000 1.2.20.2
+++ LCParametersImpl.h 1 Dec 2009 14:15:32 -0000 1.2.20.3
@@ -128,9 +128,9 @@
protected:
- mutable IntMap _intMap ;
- mutable FloatMap _floatMap ;
- mutable StringMap _stringMap ;
+ mutable IntMap _intMap ; //! no RIO - for debugging
+ mutable FloatMap _floatMap ; //! no RIO - for debugging
+ mutable StringMap _stringMap ; //! no RIO - for debugging
}; // class
} // namespace IMPL
lcio/src/cpp/include/RIO
diff -u -r1.1.2.4 -r1.1.2.5
--- RIO.h 1 Dec 2009 11:11:03 -0000 1.1.2.4
+++ RIO.h 1 Dec 2009 14:15:32 -0000 1.1.2.5
@@ -16,7 +16,7 @@
#define RIO_RECORD_SIZE 16000
-#define RIO_SPLIT_LEVEL 5
+#define RIO_SPLIT_LEVEL 99
#define RIO_DEFAULT_COMPRESS 1
// 1 is TFile default ?
lcio/src/cpp/include/RIO
diff -u -r1.1.2.6 -r1.1.2.7
--- RIOLCCollectionHandler.h 1 Dec 2009 11:29:45 -0000 1.1.2.6
+++ RIOLCCollectionHandler.h 1 Dec 2009 14:15:32 -0000 1.1.2.7
@@ -81,15 +81,17 @@
} else {
- //FIXME: make split level and 'record size' parameters ....
- // _br = tree->Branch( _name.c_str(), &_tv, 16000, RIO_SPLIT_LEVEL );
-
+ // create a string with the typename of the collection used by ROOT I/O
+ // - note the LCIO API still uses LCCollectionVec, i.e. a vector of LCObject*
std::stringstream typeStream ;
- typeStream << "IMPL::LCCollectionTVec<EVENT::" << type << ">" ;
+ // typeStream << "IMPL::LCCollectionTVec<EVENT::" << type << ">" ;
+ typeStream << "IMPL::LCCollectionTVec<IMPL::" << type << "Impl>" ;
+#ifdef DEBUG
std::cout << " create branch for type " << typeStream.str() << std::endl ;
+#endif
- _br = tree->Branch( _name.c_str(), typeStream.str().c_str(), (void*) &_tv, 16000, RIO_SPLIT_LEVEL );
+ _br = tree->Branch( _name.c_str(), typeStream.str().c_str(), (void*) &_tv, RIO_RECORD_SIZE, RIO_SPLIT_LEVEL );
lcio/src/cpp/include/RIO
diff -u -r1.1.2.5 -r1.1.2.6
--- rootio_templates.h 1 Dec 2009 11:11:03 -0000 1.1.2.5
+++ rootio_templates.h 1 Dec 2009 14:15:32 -0000 1.1.2.6
@@ -8,6 +8,8 @@
#include "IMPL/MCParticleImpl.h"
#include "IMPL/SimCalorimeterHitImpl.h"
#include "IMPL/SimTrackerHitImpl.h"
+#include "IMPL/CalorimeterHitImpl.h"
+#include "IMPL/TrackerHitImpl.h"
#include "IMPL/VertexImpl.h"
#include "IMPL/TrackImpl.h"
#include "IMPL/ClusterImpl.h"
@@ -81,6 +83,17 @@
#pragma link C++ class IMPL::LCCollectionTVec<EVENT::Vertex>+;
+#pragma link C++ class IMPL::LCCollectionTVec<IMPL::ReconstructedParticleImpl>+;
+#pragma link C++ class IMPL::LCCollectionTVec<IMPL::MCParticleImpl>+;
+#pragma link C++ class IMPL::LCCollectionTVec<IMPL::SimTrackerHitImpl>+;
+#pragma link C++ class IMPL::LCCollectionTVec<IMPL::SimCalorimeterHitImpl>+;
+#pragma link C++ class IMPL::LCCollectionTVec<IMPL::TrackerHitImpl>+;
+#pragma link C++ class IMPL::LCCollectionTVec<IMPL::CalorimeterHitImpl>+;
+#pragma link C++ class IMPL::LCCollectionTVec<IMPL::TrackImpl>+;
+#pragma link C++ class IMPL::LCCollectionTVec<IMPL::ClusterImpl>+;
+#pragma link C++ class IMPL::LCCollectionTVec<IMPL::LCRelationImpl>+;
+#pragma link C++ class IMPL::LCCollectionTVec<IMPL::VertexImpl>+;
+
#endif
CVSspam 0.2.8