simple-build-dgcode 1.2.0__tar.gz → 1.3.0__tar.gz

{simple_build_dgcode-1.2.0/src/simple_build_dgcode.egg-info → simple_build_dgcode-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simple-build-dgcode
-Version: 1.2.0
+Version: 1.3.0
 Summary: The Geant4-based coding framework originating in the ESS Detector Group, provided as a simplebuild bundle of packages.
 Author-email: Thomas Kittelmann <thomas.kittelmann@ess.eu>
 License: The Apache 2.0 license is reproduced in the following. See the NOTICE file for

{simple_build_dgcode-1.2.0 → simple_build_dgcode-1.3.0/src/simple_build_dgcode.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simple-build-dgcode
-Version: 1.2.0
+Version: 1.3.0
 Summary: The Geant4-based coding framework originating in the ESS Detector Group, provided as a simplebuild bundle of packages.
 Author-email: Thomas Kittelmann <thomas.kittelmann@ess.eu>
 License: The Apache 2.0 license is reproduced in the following. See the NOTICE file for

{simple_build_dgcode-1.2.0 → simple_build_dgcode-1.3.0}/src/simple_build_dgcode.egg-info/SOURCES.txt

@@ -552,6 +552,7 @@ src/simplebuild_dgcode/data/pkgs/Utils/Utils/libinc/ByteStream.hh
 src/simplebuild_dgcode/data/pkgs/Utils/Utils/libinc/Cmd.hh
 src/simplebuild_dgcode/data/pkgs/Utils/Utils/libinc/DelayedAllocVector.hh
 src/simplebuild_dgcode/data/pkgs/Utils/Utils/libinc/DummyParamHolder.hh
+src/simplebuild_dgcode/data/pkgs/Utils/Utils/libinc/DynBuffer.hh
 src/simplebuild_dgcode/data/pkgs/Utils/Utils/libinc/FastLookupSet.hh
 src/simplebuild_dgcode/data/pkgs/Utils/Utils/libinc/Format.hh
 src/simplebuild_dgcode/data/pkgs/Utils/Utils/libinc/Glob.hh

{simple_build_dgcode-1.2.0 → simple_build_dgcode-1.3.0}/src/simplebuild_dgcode/data/pkgs/G4/G4Launcher/libsrc/launcher_impl_ts.cc

@@ -1,11 +1,11 @@
-
-
 //We need to extend G4HadronElasticPhysicsHP, but need to workaround a faulty
 //usage of the "final" keyword (should have been "override"), as discussed on
 //https://bugzilla-geant4.kek.jp/show_bug.cgi?id=2574 . We provide a somewhat
 //nasty (but reliable) workaround:
 
-#if G4VERSION_NUMBER >= 1020
+#include "G4Version.hh"
+
+#if G4VERSION_NUMBER >= 1120
 
 // Untested as per November 2023, but on the bug report it was indicated that we
 // should be able to use this directly with Geant4 11.2.0 and later:

{simple_build_dgcode-1.2.0 → simple_build_dgcode-1.3.0}/src/simplebuild_dgcode/data/pkgs/G4/G4OSG/libsrc/VHCommon.cc

@@ -2,7 +2,6 @@
 #include "G4OSG/VolHandle.hh"
 #include "G4OSG/Viewer.hh"
 #include "HepPolyhedron.h"
-#include "G4strstreambuf.hh"
 #include "G4OSG/BestUnit.hh"
 #include <sstream>
 

{simple_build_dgcode-1.2.0 → simple_build_dgcode-1.3.0}/src/simplebuild_dgcode/data/pkgs/G4/G4Utils/libinc/Flush.hh

@@ -1,8 +1,6 @@
 #ifndef G4Utils_Flush_hh
 #define G4Utils_Flush_hh
 
-#include "G4strstreambuf.hh"
-
 namespace G4Utils {
   void flush();//Flush G4cout and G4cerr buffers
 }

simple_build_dgcode-1.3.0/src/simplebuild_dgcode/data/pkgs/G4/G4Utils/libsrc/Flush.cc

@@ -0,0 +1,10 @@
+#include "G4Utils/Flush.hh"
+#include "G4ios.hh"
+
+void G4Utils::flush()
+{
+  G4cout << std::flush;
+  G4cerr << std::flush;
+  // G4coutbuf.sync();
+  // G4cerrbuf.sync();
+}

{simple_build_dgcode-1.2.0 → simple_build_dgcode-1.3.0}/src/simplebuild_dgcode/data/pkgs/G4/G4Utils/pycpp__init/mod.cc

@@ -1,6 +1,5 @@
 #include "G4Utils/Flush.hh"
 #include "Core/Python.hh"
-#include "G4strstreambuf.hh"
 #include "G4Version.hh"
 
 namespace pyG4Utils {

{simple_build_dgcode-1.2.0 → simple_build_dgcode-1.3.0}/src/simplebuild_dgcode/data/pkgs/Griff/EvtFile/libinc/DBEntryReader.hh

@@ -18,13 +18,18 @@
 namespace EvtFile {
 
   template<class Tentry>
-  class DBEntryReader : public IDBSubSectionReader {
+  class DBEntryReader final : public IDBSubSectionReader {
   public:
 
     DBEntryReader(subsectid_type subSectionID)
       : m_subSectionID(subSectionID) {}
     ~DBEntryReader(){}
 
+    DBEntryReader( const DBEntryReader& ) = delete;
+    DBEntryReader& operator=( const DBEntryReader& ) = delete;
+    DBEntryReader( DBEntryReader&& ) = delete;
+    DBEntryReader& operator=( DBEntryReader&& ) = delete;
+
     //Access the DB:
     const Tentry& getEntry( index_type i )
     {
@@ -38,8 +43,6 @@ namespace EvtFile {
     virtual void clearInfo();
 
   private:
-    DBEntryReader( const DBEntryReader & );
-    DBEntryReader & operator= ( const DBEntryReader & );
 
     std::vector<Tentry*> m_db;
     subsectid_type m_subSectionID;

{simple_build_dgcode-1.2.0 → simple_build_dgcode-1.3.0}/src/simplebuild_dgcode/data/pkgs/Griff/EvtFile/libinc/DBEntryWriter.hh

@@ -14,7 +14,7 @@ namespace EvtFile {
 
   class IDBEntry;
 
-  class DBEntryWriter : public IDBSubSectionWriter {
+  class DBEntryWriter final : public IDBSubSectionWriter {
   public:
     typedef std::uint32_t index_type;
 
@@ -23,6 +23,12 @@ namespace EvtFile {
         m_nextIndex(0),
         m_subSectionID(subSectionID)
     {}
+
+    DBEntryWriter( const DBEntryWriter& ) = delete;
+    DBEntryWriter& operator=( const DBEntryWriter& ) = delete;
+    DBEntryWriter( DBEntryWriter&& ) = delete;
+    DBEntryWriter& operator=( DBEntryWriter&& ) = delete;
+
     virtual ~DBEntryWriter();
 
     virtual std::uint16_t uniqueSubSectionID() const { return m_subSectionID; }

{simple_build_dgcode-1.2.0 → simple_build_dgcode-1.3.0}/src/simplebuild_dgcode/data/pkgs/Griff/EvtFile/libinc/DBStringsReader.hh

@@ -12,11 +12,16 @@
 
 namespace EvtFile {
 
-  class DBStringsReader : public IDBSubSectionReader {
+  class DBStringsReader final : public IDBSubSectionReader {
   public:
     DBStringsReader(subsectid_type subSectionID);
     ~DBStringsReader(){}
 
+    DBStringsReader( const DBStringsReader& ) = delete;
+    DBStringsReader& operator=( const DBStringsReader& ) = delete;
+    DBStringsReader( DBStringsReader&& ) = delete;
+    DBStringsReader& operator=( DBStringsReader&& ) = delete;
+
     //Access the string DB:
     const str_type& getString( index_type i ) const
     {
@@ -30,10 +35,6 @@ namespace EvtFile {
     virtual void clearInfo() { m_stringdb.clear(); }
 
   private:
-
-    DBStringsReader( const DBStringsReader & );
-    DBStringsReader & operator= ( const DBStringsReader & );
-
     //Indices are loaded consecutively and starting from zero => We can use a vector:
     std::vector<str_type> m_stringdb;
     subsectid_type m_subSectionID;

{simple_build_dgcode-1.2.0 → simple_build_dgcode-1.3.0}/src/simplebuild_dgcode/data/pkgs/Griff/EvtFile/libinc/DBStringsWriter.hh

@@ -13,7 +13,7 @@
 
 namespace EvtFile {
 
-  class DBStringsWriter : public IDBSubSectionWriter {
+  class DBStringsWriter final : public IDBSubSectionWriter {
   public:
     DBStringsWriter(subsectid_type subSectionID, FileWriter& fw)
       : IDBSubSectionWriter(fw),
@@ -22,6 +22,11 @@ namespace EvtFile {
     {}
     ~DBStringsWriter(){}
 
+    DBStringsWriter( const DBStringsWriter& ) = delete;
+    DBStringsWriter& operator=( const DBStringsWriter& ) = delete;
+    DBStringsWriter( DBStringsWriter&& ) = delete;
+    DBStringsWriter& operator=( DBStringsWriter&& ) = delete;
+
     virtual subsectid_type uniqueSubSectionID() const { return m_subSectionID; }
 
     //Get unique identifier of string (this will schedule the string for next
@@ -37,9 +42,6 @@ namespace EvtFile {
 
   private:
 
-    DBStringsWriter( const DBStringsWriter & );
-    DBStringsWriter & operator= ( const DBStringsWriter & );
-
     typedef std::map<str_type,index_type,Utils::fast_str_cmp> map_type;
     static const unsigned NMAPS = 32;//reduce map lookup time by keeping several maps and looking in m_map[str.size()%NMAPS]
     index_type m_nextIndex;

{simple_build_dgcode-1.2.0 → simple_build_dgcode-1.3.0}/src/simplebuild_dgcode/data/pkgs/Griff/EvtFile/libinc/DBSubSectReaderMgr.hh

@@ -7,18 +7,20 @@ namespace EvtFile {
 
   class IDBSubSectionReader;
 
-  class DBSubSectReaderMgr : public EvtFileDB {
+  class DBSubSectReaderMgr final : public EvtFileDB {
   public:
     DBSubSectReaderMgr(){}
     virtual ~DBSubSectReaderMgr(){}
 
+    DBSubSectReaderMgr( const DBSubSectReaderMgr& ) = delete;
+    DBSubSectReaderMgr& operator=( const DBSubSectReaderMgr& ) = delete;
+    DBSubSectReaderMgr( DBSubSectReaderMgr&& ) = delete;
+    DBSubSectReaderMgr& operator=( DBSubSectReaderMgr&& ) = delete;
+
     void addSubSection(IDBSubSectionReader&);//will keep a reference to the subsection
 
   private:
 
-    DBSubSectReaderMgr( const DBSubSectReaderMgr & );
-    DBSubSectReaderMgr & operator= ( const DBSubSectReaderMgr & );
-
     void newInfoAvailable(const char*data, unsigned nbytes);
     void clearInfo();
 

{simple_build_dgcode-1.2.0 → simple_build_dgcode-1.3.0}/src/simplebuild_dgcode/data/pkgs/Griff/EvtFile/libinc/FileReader.hh

@@ -2,7 +2,7 @@
 #define EvtFile_FileReader_hh
 
 #ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS
+#  define __STDC_LIMIT_MACROS
 #endif
 
 //Class responsible for actual reading of the data files.
@@ -15,6 +15,7 @@
 #include <cstring>
 #include <map>
 #include <cassert>
+#include "Utils/DynBuffer.hh"
 
 namespace EvtFile {
 
@@ -27,7 +28,7 @@ namespace EvtFile {
     virtual ~EvtFileDB(){}
   };
 
-  class FileReader {
+  class FileReader final {
   public:
 
     ////////////////////////////////////////////
@@ -41,6 +42,11 @@ namespace EvtFile {
                 EvtFileDB* db_listener = 0,
                 int buffer_len=8192 );
 
+    FileReader( const FileReader& ) = delete;
+    FileReader& operator=( const FileReader& ) = delete;
+    FileReader( FileReader&& ) = delete;
+    FileReader& operator=( FileReader&& ) = delete;
+
     bool isInit() const;//returns true after init() has been called.
 
     bool init();//Actually opens file and seeks to the first event if
@@ -88,7 +94,7 @@ namespace EvtFile {
     //eventActive() returns false if not at a readable event. This can occur as
     //a result of a failed navigation attempt or right after the constructor in
     //case the file has 0 events:
-    bool eventActive() const { return m_currentEventInfo!=0; }
+    bool eventActive() const { return m_currentEventInfo!=nullptr; }
 
     //Actual data access. Do not call before testing eventActive above.
     unsigned runNumber() const { return m_currentEventInfo->runNumber; }
@@ -113,8 +119,8 @@ namespace EvtFile {
   private:
 
 
-    FileReader( const FileReader & );
-    FileReader & operator= ( const FileReader & );
+    // FileReader( const FileReader & );
+    // FileReader & operator= ( const FileReader & );
 
     const IFormat* m_format;
     bool m_isInitialised;
@@ -132,11 +138,11 @@ namespace EvtFile {
     void read(T&t);
     void clearEOF();
 
-    std::vector<char> m_section_briefdata;
-    std::vector<char> m_section_fulldata;
+    Utils::DynBuffer<char> m_section_briefdata;
+    Utils::DynBuffer<char> m_section_fulldata;
     unsigned m_fulldata_size;
     bool m_fulldata_compressed;
-    std::vector<char> m_section_fulldata_compressed;
+    Utils::DynBuffer<char> m_section_fulldata_compressed;
     bool m_briefdata_isloaded;
     bool m_fulldata_isloaded;
 
@@ -152,7 +158,8 @@ namespace EvtFile {
       std::uint32_t evtIndex;
       std::uint32_t dummy;//Here to have sizeof(EventInfo)==8*sizeof(std::uint32_t)+sizeof(streampos) even on 64bit.
     };
-    EventInfo * m_currentEventInfo;
+    static_assert( sizeof(EventInfo)==8*sizeof(std::uint32_t)+sizeof(std::streampos), "" );
+    EventInfo * m_currentEventInfo = nullptr;
     std::vector<EventInfo> m_evts;
     ////The next map is only populated on demand when goToEvent is called!
     std::map<std::pair<std::uint32_t,std::uint32_t>,EventInfo* > m_evtMap; //(runNbr,evtNbr) -> EventInfo*

{simple_build_dgcode-1.2.0 → simple_build_dgcode-1.3.0}/src/simplebuild_dgcode/data/pkgs/Griff/EvtFile/libinc/FileReader.icc

@@ -6,6 +6,7 @@ inline bool EvtFile::FileReader::isInit() const
 
 inline void EvtFile::FileReader::read(char*data,unsigned nbytes)
 {
+  assert( data != nullptr );
   m_is.read( data, nbytes);
 }
 
@@ -23,5 +24,6 @@ inline void EvtFile::FileReader::clearEOF()
 
 inline std::uint32_t EvtFile::FileReader::eventCheckSum() const
 {
+  assert( m_currentEventInfo != nullptr );
   return m_currentEventInfo->checkSum;
 }

{simple_build_dgcode-1.2.0 → simple_build_dgcode-1.3.0}/src/simplebuild_dgcode/data/pkgs/Griff/EvtFile/libinc/FileWriter.hh

@@ -10,6 +10,7 @@
 #include <vector>
 #include <fstream>
 #include <cstring>
+#include "Utils/DynBuffer.hh"
 
 //TODO: Add method which will ignore current event.
 //TODO: Make sure (#evt,#run) is unique in file (merger scripts must honour this)
@@ -23,7 +24,7 @@ namespace EvtFile {
     virtual void aboutToFlushEventToDisk(FileWriter&) = 0;
   };
 
-  class FileWriter {
+  class FileWriter final {
   public:
     ////////////////////////////////////////////
     //  Methods for opening/closing the file  //
@@ -36,6 +37,11 @@ namespace EvtFile {
                 const char* filename,
                 int buffer_len=8192 );
 
+    FileWriter( const FileWriter& ) = delete;
+    FileWriter& operator=( const FileWriter& ) = delete;
+    FileWriter( FileWriter&& ) = delete;
+    FileWriter& operator=( FileWriter&& ) = delete;
+
     //Register callbacks to be notified just before events are flush to disk:
     void registerPreFlushCallback(IFWPreFlushCB&);
 
@@ -77,19 +83,23 @@ namespace EvtFile {
 
   private:
 
-    FileWriter( const FileWriter & );
-    FileWriter & operator= ( const FileWriter & );
+    // FileWriter( const FileWriter & );
+    // FileWriter & operator= ( const FileWriter & );
 
     const IFormat* m_format;
     char * m_buf;
     std::ofstream m_os;
-    std::vector<char> m_section_database;
-    std::vector<char> m_section_briefdata;
-    std::vector<char> m_section_fulldata;
-    std::vector<char> m_section_fulldata_compressed;
+    Utils::DynBuffer<char> m_section_database;
+    Utils::DynBuffer<char> m_section_briefdata;
+    Utils::DynBuffer<char> m_section_fulldata;
+    Utils::DynBuffer<char> m_section_fulldata_compressed;
     std::vector<IFWPreFlushCB*> m_preFlushCBs;
     std::string m_filename;
-    void write(const char*data,unsigned nbytes) { m_os.write( data, nbytes); }
+    void write( const char*data, unsigned nbytes ) { m_os.write( data, nbytes); }
+    void write( const Utils::DynBuffer<char>& buf )
+    { if (!buf.empty())
+        m_os.write( buf.data(), buf.size());
+    }
     template<class T>
     void write(const T&t) { m_os.write( (char*)&t, sizeof(t)); }
   };

{simple_build_dgcode-1.2.0 → simple_build_dgcode-1.3.0}/src/simplebuild_dgcode/data/pkgs/Griff/EvtFile/libinc/FileWriter.icc

@@ -1,22 +1,27 @@
 inline void FileWriter::writeDataDBSection(const char* data, unsigned n)//data nbytes
 {
-  //TODO: Could we do something slightly more efficient here by a custom data array and integer?
+  if (!n)
+    return;
   unsigned l(m_section_database.size());
-  m_section_database.resize(l+n);//useless initialisation happens...
+  m_section_database.resize_without_init(l+n);
   std::memcpy(&(m_section_database[l]),data,n);
 }
 
 inline void FileWriter::writeDataBriefSection(const char* data, unsigned n)
 {
+  if (!n)
+    return;
   unsigned l(m_section_briefdata.size());
-  m_section_briefdata.resize(l+n);
+  m_section_briefdata.resize_without_init(l+n);
   std::memcpy(&(m_section_briefdata[l]),data,n);
 }
 
 inline void FileWriter::writeDataFullSection(const char* data, unsigned n)
 {
+  if (!n)
+    return;
   unsigned l(m_section_fulldata.size());
-  m_section_fulldata.resize(l+n);
+  m_section_fulldata.resize_without_init(l+n);
   std::memcpy(&(m_section_fulldata[l]),data,n);
 }
 

{simple_build_dgcode-1.2.0 → simple_build_dgcode-1.3.0}/src/simplebuild_dgcode/data/pkgs/Griff/EvtFile/libinc/IDBEntry.hh

@@ -19,6 +19,11 @@ namespace EvtFile {
 
     IDBEntry();
 
+    IDBEntry( const IDBEntry& ) = delete;
+    IDBEntry& operator=( const IDBEntry& ) = delete;
+    IDBEntry( IDBEntry&& ) = delete;
+    IDBEntry& operator=( IDBEntry&& ) = delete;
+
     //When writing:
     virtual void write(EvtFile::FileWriter&) = 0;//stream data to db section
 
@@ -37,8 +42,8 @@ namespace EvtFile {
     virtual bool equals(const IDBEntry& o) const = 0;
     virtual ~IDBEntry() {}
   private:
-    IDBEntry( const IDBEntry & );
-    IDBEntry & operator= ( const IDBEntry & );
+    // IDBEntry( const IDBEntry & );
+    // IDBEntry & operator= ( const IDBEntry & );
     unsigned m_hash;
     unsigned m_refCount;
     friend class DBEntryWriter;

{simple_build_dgcode-1.2.0 → simple_build_dgcode-1.3.0}/src/simplebuild_dgcode/data/pkgs/Griff/EvtFile/libsrc/FileReader.cc

@@ -24,7 +24,7 @@ namespace EvtFile {
       m_fulldata_compressed(format->compressFullData()),
       m_briefdata_isloaded(false),
       m_fulldata_isloaded(false),
-      m_currentEventInfo(0),
+      m_currentEventInfo(nullptr),
       m_fileName(filename)
   {
     //NB: Rest of initialisation done in init()
@@ -85,6 +85,7 @@ namespace EvtFile {
     m_version=fileversion;
     m_section_briefdata.reserve(4096);
     m_section_fulldata.reserve(4096);
+    m_section_fulldata_compressed.reserve(4096);
     m_evts.reserve(1000);
     initEventAtIndex(0);
     return ok();
@@ -126,7 +127,7 @@ namespace EvtFile {
     unsigned targetidx=idx+n;
     if (targetidx<m_evts.size()) {
       initEventAtIndex(targetidx);//Already read it, jump directly there
-      return m_currentEventInfo!=0;
+      return m_currentEventInfo!=nullptr;
     }
 
     //Ok, targetidx lies beyond the events already read. Jump to the first
@@ -135,7 +136,7 @@ namespace EvtFile {
     while(m_currentEventInfo && targetidx>m_currentEventInfo->evtIndex)
       initEventAtIndex(m_evts.size());
 
-    return m_currentEventInfo!=0;
+    return m_currentEventInfo!=nullptr;
   }
 
   bool FileReader::seekEventByIndex(unsigned idx)
@@ -175,7 +176,7 @@ namespace EvtFile {
     if (m_currentEventInfo && m_currentEventInfo->evtIndex==idx)
       return;//already there
 
-    m_currentEventInfo=0;
+    m_currentEventInfo=nullptr;
     m_briefdata_isloaded = false;
     m_fulldata_isloaded = false;
 
@@ -211,7 +212,7 @@ namespace EvtFile {
       }
       if (m_evts.capacity()==m_evts.size())
         m_evts.reserve(m_evts.size()*2);
-      m_evts.resize(m_evts.size()+1);
+      m_evts.emplace_back();//.resize(m_evts.size()+1);
       EventInfo& newEvt = m_evts.back();
       newEvt.evtPosInFile = newEvtPos;
       newEvt.evtIndex = m_evts.size()-1;
@@ -229,15 +230,15 @@ namespace EvtFile {
         //Read the database info and pass it on to any derived class.
         //For economical reasons we temporarily use the m_section_briefdata for this.
         assert(!m_briefdata_isloaded);
-        m_section_briefdata.reserve(newEvt.sectionSize_database);
-        read(&(m_section_briefdata[0]),newEvt.sectionSize_database);
+        m_section_briefdata.resize_without_init(newEvt.sectionSize_database);
+        read(m_section_briefdata.data(),newEvt.sectionSize_database);
         if (m_is.fail()) {
           m_bad=true;
           m_evts.resize(m_evts.size()-1);
           m_reason="Errors encountered while reading database section of event";
           return;
         }
-        m_db_listener->newInfoAvailable(&(m_section_briefdata[0]),newEvt.sectionSize_database);
+        m_db_listener->newInfoAvailable(m_section_briefdata.data(),newEvt.sectionSize_database);
       }
       //All ok it seems:
       m_currentEventInfo=&newEvt;
@@ -254,7 +255,8 @@ namespace EvtFile {
     if (m_currentEventInfo&&m_currentEventInfo->evtNumber==evt_number&&m_currentEventInfo->runNumber==run_number)
       return true;//already there.
 
-    m_currentEventInfo=0;
+    m_currentEventInfo=nullptr;
+
     m_briefdata_isloaded = false;
     m_fulldata_isloaded = false;
 
@@ -276,13 +278,14 @@ namespace EvtFile {
     assert(isInit());
     assert(eventActive() && "getSharedDataInEvent() called when not eventActive()");
 
+    assert(m_currentEventInfo!=nullptr);
     data.resize(m_currentEventInfo->sectionSize_database);
     if (!m_currentEventInfo->sectionSize_database)
       return;
 
     m_is.seekg(m_currentEventInfo->evtPosInFile+std::streampos(EVTFILE_EVENT_HEADER_BYTES));
     assert(m_is.tellg()==m_currentEventInfo->evtPosInFile+std::streampos(EVTFILE_EVENT_HEADER_BYTES));
-    char * tmp = &data[0];
+    char * tmp = data.data();
     assert(tmp);
     read(tmp,m_currentEventInfo->sectionSize_database);
     return;
@@ -291,11 +294,12 @@ namespace EvtFile {
   const char* FileReader::getBriefData() {
     assert(isInit());
     if (m_briefdata_isloaded)
-      return &(m_section_briefdata[0]);
+      return m_section_briefdata.data();
     assert(eventActive() && "getBriefData() called when not eventActive()");
     unsigned n(nBytesBriefData());
     if (n) {
-      m_section_briefdata.reserve(nBytesBriefData());
+      m_section_briefdata.resize_without_init(nBytesBriefData());
+      assert(m_currentEventInfo!=nullptr);
       std::streampos pos = m_currentEventInfo->evtPosInFile;
       pos+=EVTFILE_EVENT_HEADER_BYTES;
       pos+=m_currentEventInfo->sectionSize_database;
@@ -304,21 +308,21 @@ namespace EvtFile {
         m_bad=true;
         return 0;
       }
-      read(&(m_section_briefdata[0]),n);
+      read(m_section_briefdata.data(),n);
       if (m_is.fail()) {
         m_bad=true;
         return 0;
       }
     }
     m_briefdata_isloaded=true;
-    return &(m_section_briefdata[0]);
+    return m_section_briefdata.data();
   }
 
   const char* FileReader::getFullData() {
     assert(isInit());
 
     if (m_fulldata_isloaded)
-      return &(m_section_fulldata[0]);
+      return m_section_fulldata.data();
 
     assert(eventActive() && "getFullData() called when not eventActive()");
 
@@ -327,9 +331,10 @@ namespace EvtFile {
     if (n) {
       //read compressed data:
       if (m_fulldata_compressed)
-        m_section_fulldata_compressed.reserve(n);
+        m_section_fulldata_compressed.resize_without_init(n);
       else
-        m_section_fulldata.reserve(n);
+        m_section_fulldata.resize_without_init(n);
+      assert(m_currentEventInfo!=nullptr);
       std::streampos pos = m_currentEventInfo->evtPosInFile;
       pos+=EVTFILE_EVENT_HEADER_BYTES;
       pos+=m_currentEventInfo->sectionSize_database;
@@ -340,9 +345,9 @@ namespace EvtFile {
         return 0;
       }
       if (m_fulldata_compressed)
-        read(&(m_section_fulldata_compressed[0]),n);
+        read(m_section_fulldata_compressed.data(),n);
       else
-        read(&(m_section_fulldata[0]),n);
+        read(m_section_fulldata.data(),n);
       if (m_is.fail()) {
         m_bad=true;
         return 0;
@@ -350,15 +355,14 @@ namespace EvtFile {
       if (m_fulldata_compressed) {
         //uncompress:
         assert(n>sizeof(std::uint32_t));
-        //ZLibUtils::decompressToBuffer(&(m_section_fulldata_compressed[0]), n, m_section_fulldata,m_fulldata_size);
-        ZLibUtils::decompressToBufferNew(&(m_section_fulldata_compressed[0]), n, m_section_fulldata);
+        ZLibUtils::decompressToBufferNew(m_section_fulldata_compressed.data(), n, m_section_fulldata);
         if ( m_section_fulldata.size() >= std::numeric_limits<unsigned>::max() )
           throw std::runtime_error("full data section size exceeds unsigned integer limits");
         m_fulldata_size = static_cast<unsigned>(m_section_fulldata.size());
       }
     }
     m_fulldata_isloaded=true;
-    return &(m_section_fulldata[0]);
+    return m_section_fulldata.data();
   }
 
   bool FileReader::verifyEventDataIntegrity()