Commit in lcio/src on je20081114-nda
aid/EVENT/LCIO.aid+2-11.67 -> 1.67.2.1
aid/IO/ILCFactory.aid+10-11.1 -> 1.1.20.1
cpp/include/IOIMPL/LCFactory.h+2-11.2 -> 1.2.18.1
cpp/include/SIO/SIOReader.h+3-21.25 -> 1.25.6.1
cpp/src/EXAMPLE/anajob.cc+11.16 -> 1.16.4.1
cpp/src/IOIMPL/LCFactory.cc+3-21.2 -> 1.2.18.1
cpp/src/SIO/SIOReader.cc+5-21.51 -> 1.51.4.1
+26-9
7 modified files
switch reading the event map by setting boolean parameter in createLCReader() (experimental)

lcio/src/aid/EVENT
LCIO.aid 1.67 -> 1.67.2.1
diff -u -r1.67 -r1.67.2.1
--- LCIO.aid	7 Nov 2008 15:58:05 -0000	1.67
+++ LCIO.aid	14 Nov 2008 13:21:49 -0000	1.67.2.1
@@ -16,7 +16,7 @@
 /** Global constants used in LCIO.
  *
  * @author gaede
- * @version $Id: LCIO.aid,v 1.67 2008/11/07 15:58:05 gaede Exp $
+ * @version $Id: LCIO.aid,v 1.67.2.1 2008/11/14 13:21:49 engels Exp $
  * @see LCObject
  * @see LCIO
  */
@@ -74,6 +74,7 @@
     // LCGenericObject
     static const int GOBIT_FIXED = 31 ; // is fixed size
 
+    static const int READ_EVENT_MAP =  1 ;
     static const int READ_ONLY =  0 ;
     static const int UPDATE   =  1 ;
     // error handling

lcio/src/aid/IO
ILCFactory.aid 1.1 -> 1.1.20.1
diff -u -r1.1 -r1.1.20.1
--- ILCFactory.aid	10 Mar 2003 14:06:32 -0000	1.1
+++ ILCFactory.aid	14 Nov 2008 13:21:49 -0000	1.1.20.1
@@ -1,4 +1,7 @@
 package hep.lcio.io;
+@ifdef cpp
+@cpp{class LCReader;
+}
 
 
 /**Factory to create LCWriter and Reader object for the known data 
@@ -30,6 +33,12 @@
 	
 /**Creates an LCReader object for the current persistency type.
  */
-	public  LCReader* createLCReader() ;
+@ifdef cpp
+@cpp{
+    virtual LCReader * createLCReader(const bool) = 0;
+}
+@else
+    public  LCReader* createLCReader() ;
+@endif
 
 }

lcio/src/cpp/include/IOIMPL
LCFactory.h 1.2 -> 1.2.18.1
diff -u -r1.2 -r1.2.18.1
--- LCFactory.h	15 Apr 2005 08:37:40 -0000	1.2
+++ LCFactory.h	14 Nov 2008 13:21:49 -0000	1.2.18.1
@@ -40,7 +40,8 @@
   
   /**Creates an LCReader object for the current persistency type.
    */
-  virtual IO::LCReader * createLCReader() ;
+  virtual IO::LCReader * createLCReader(
+  	const bool readEventMap=false ) ;
 
 
 private:

lcio/src/cpp/include/SIO
SIOReader.h 1.25 -> 1.25.6.1
diff -u -r1.25 -r1.25.6.1
--- SIOReader.h	16 Oct 2007 16:22:45 -0000	1.25
+++ SIOReader.h	14 Nov 2008 13:21:49 -0000	1.25.6.1
@@ -24,7 +24,7 @@
 /** Concrete implementation of LCWriter using SIO.
  * 
  * @author gaede
- * @version $Id: SIOReader.h,v 1.25 2007/10/16 16:22:45 gaede Exp $
+ * @version $Id: SIOReader.h,v 1.25.6.1 2008/11/14 13:21:49 engels Exp $
  */
   class SIOReader : public IO::LCReader {
     
@@ -34,7 +34,7 @@
     
     /** Default constructor.
      */
-    SIOReader() ;
+    SIOReader( const bool readEventMap=false ) ;
     
     // Destructor
     virtual ~SIOReader() ;
@@ -179,6 +179,7 @@
     unsigned int _currentFileIndex ;
 
     EventMap _evtMap ;
+    const bool _readEventMap ;
 
   }; // class
 } // namespace

lcio/src/cpp/src/EXAMPLE
anajob.cc 1.16 -> 1.16.4.1
diff -u -r1.16 -r1.16.4.1
--- anajob.cc	28 May 2008 14:02:09 -0000	1.16
+++ anajob.cc	14 Nov 2008 13:21:49 -0000	1.16.4.1
@@ -33,6 +33,7 @@
   int nFiles = argc-1 ;
   
   LCReader* lcReader = LCFactory::getInstance()->createLCReader() ;
+  //LCReader* lcReader = LCFactory::getInstance()->createLCReader(LCIO::READ_EVENT_MAP) ;
   
   // first we read the run information
   

lcio/src/cpp/src/IOIMPL
LCFactory.cc 1.2 -> 1.2.18.1
diff -u -r1.2 -r1.2.18.1
--- LCFactory.cc	15 Apr 2005 08:37:48 -0000	1.2
+++ LCFactory.cc	14 Nov 2008 13:21:50 -0000	1.2.18.1
@@ -41,9 +41,10 @@
     return new SIOWriter ;
   }
   
-  LCReader * LCFactory::createLCReader() { 
+  LCReader * LCFactory::createLCReader(
+  		const bool readEventMap ) { 
     // so far we just create SIO objects
-    return new SIOReader ;
+    return new SIOReader( readEventMap );
   }
   
   

lcio/src/cpp/src/SIO
SIOReader.cc 1.51 -> 1.51.4.1
diff -u -r1.51 -r1.51.4.1
--- SIOReader.cc	28 May 2008 14:02:09 -0000	1.51
+++ SIOReader.cc	14 Nov 2008 13:21:50 -0000	1.51.4.1
@@ -57,7 +57,8 @@
   
   //#define DEBUG 1
   
-  SIOReader::SIOReader() 
+  SIOReader::SIOReader( const bool readEventMap ) :
+        _readEventMap( readEventMap )
     //     :     
     //     _myFilenames(0), 
     //     _currentFileIndex(0) 
@@ -187,7 +188,9 @@
 //     else
 //       eh->setEventPtr( _evtP ) ;
 
-    getEventMap() ;
+    if( _readEventMap ){
+        getEventMap() ;
+    }
 
   }
   
CVSspam 0.2.8