From 691095ef74a1835e55a308be432e53c27c99e298 Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Thu, 9 Feb 2017 19:15:23 +0100
Subject: [PATCH] Start working on alignment integration tests. Improve C++14
compatibility
---
DDCond/src/plugins/ConditionsRepositoryParser.cpp | 2 +-
DDG4/include/DDG4/Geant4InputAction.h | 7 +++----
DDG4/include/DDG4/IoStreams.h | 8 ++++----
.../Geant4DetectorGeometryConstruction.cpp | 1 -
DDG4/plugins/Geant4EventReaderHepMC.cpp | 15 ++++++---------
DDG4/src/Geant4DetectorConstruction.cpp | 1 -
DDG4/src/Geant4InputAction.cpp | 1 -
DDG4/src/Geant4VolumeManager.cpp | 1 -
DDG4/src/IoStreams.cpp | 8 --------
9 files changed, 14 insertions(+), 30 deletions(-)
diff --git a/DDCond/src/plugins/ConditionsRepositoryParser.cpp b/DDCond/src/plugins/ConditionsRepositoryParser.cpp
index 1b3f7751b..69eb3a8fb 100644
--- a/DDCond/src/plugins/ConditionsRepositoryParser.cpp
+++ b/DDCond/src/plugins/ConditionsRepositoryParser.cpp
@@ -252,7 +252,7 @@ namespace DD4hep {
ConversionArg* arg = _param<ConversionArg>();
if ( element.hasAttr(_U(ref)) ) {
XML::DocumentHolder doc(XML::DocumentHandler().load(element, element.attr_value(_U(ref))));
- (*this)(doc.root());
+ Converter<arbitrary>(lcdd,param,optional)(doc.root());
}
for( xml_coll_t c(element,_UC(property)); c; ++c) {
xml_dim_t d = c;
diff --git a/DDG4/include/DDG4/Geant4InputAction.h b/DDG4/include/DDG4/Geant4InputAction.h
index 4333e996d..3a63bdfd9 100644
--- a/DDG4/include/DDG4/Geant4InputAction.h
+++ b/DDG4/include/DDG4/Geant4InputAction.h
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
@@ -70,11 +69,11 @@ namespace DD4hep {
/// Default destructor
virtual ~Geant4EventReader();
/// File name
- const std::string& name() const { return m_name; }
+ const std::string& name() const { return m_name; }
/// Flag if direct event access (by event sequence number) is supported (Default: false)
- bool hasDirectAccess() const { return m_directAccess; }
+ bool hasDirectAccess() const { return m_directAccess; }
/// return current Event Number
- int currentEventNumber() const { return m_currEvent; }
+ int currentEventNumber() const { return m_currEvent; }
/// Move to the indicated event number.
/** For pure sequential access, the default implementation
* will skip events one by one.
diff --git a/DDG4/include/DDG4/IoStreams.h b/DDG4/include/DDG4/IoStreams.h
index 67fc4800b..89333e80d 100644
--- a/DDG4/include/DDG4/IoStreams.h
+++ b/DDG4/include/DDG4/IoStreams.h
@@ -81,13 +81,13 @@ namespace DD4hep {
struct category : boost::iostreams::seekable_device_tag, boost::iostreams::closable_tag { };
/// Default constructor
- dd4hep_file() : m_handle(0) { }
+ dd4hep_file() = default;
/// Constructors taking file desciptors
dd4hep_file(handle_type fd, dd4hep_file_flags);
/// Constructors taking file desciptors
dd4hep_file(const char* fname, BOOST_IOS::openmode mode);
/// Default destructor
- ~dd4hep_file();
+ ~dd4hep_file() = default;
/// open overloads taking file descriptors
void open(handle_type fd, dd4hep_file_flags flags);
/// open overload taking C-style string
@@ -107,9 +107,9 @@ namespace DD4hep {
private:
/// Native stream handle
- handle_type m_handle;
+ handle_type m_handle = 0;
/// Stream flag(s)
- dd4hep_file_flags m_flag;
+ dd4hep_file_flags m_flag = 0;
};
diff --git a/DDG4/plugins/Geant4DetectorGeometryConstruction.cpp b/DDG4/plugins/Geant4DetectorGeometryConstruction.cpp
index 2bb868764..5d7c0d394 100644
--- a/DDG4/plugins/Geant4DetectorGeometryConstruction.cpp
+++ b/DDG4/plugins/Geant4DetectorGeometryConstruction.cpp
@@ -10,7 +10,6 @@
// \date 2015-11-09
//
//==========================================================================
-// $Id$
// Framework include files
#include "DDG4/Geant4DetectorConstruction.h"
diff --git a/DDG4/plugins/Geant4EventReaderHepMC.cpp b/DDG4/plugins/Geant4EventReaderHepMC.cpp
index 0ef39a63a..c06566eeb 100644
--- a/DDG4/plugins/Geant4EventReaderHepMC.cpp
+++ b/DDG4/plugins/Geant4EventReaderHepMC.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
@@ -50,15 +49,14 @@ namespace DD4hep {
/// Read an event and fill a vector of MCParticles.
virtual EventReaderStatus readParticles(int event_number,
Vertex& primary_vertex,
- std::vector<Particle*>& particles);
- virtual EventReaderStatus moveToEvent(int event_number);
- virtual EventReaderStatus skipEvent() { return EVENT_READER_OK; }
+ std::vector<Particle*>& particles) override;
+ virtual EventReaderStatus moveToEvent(int event_number) override;
+ virtual EventReaderStatus skipEvent() override { return EVENT_READER_OK; }
};
} /* End namespace Simulation */
} /* End namespace DD4hep */
-// $Id: Geant4Converter.cpp 603 2013-06-13 21:15:14Z markus.frank $
//====================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------
@@ -170,9 +168,8 @@ Geant4EventReaderHepMC::Geant4EventReaderHepMC(const string& nam)
// Now open the input file:
m_input.open(nam.c_str(),BOOST_IOS::in|BOOST_IOS::binary);
if ( not m_input.is_open() ) {
- string err = "+++ Geant4EventReaderHepMC: Failed to open input stream:"+nam+
- " Error:"+string(strerror(errno));
- throw runtime_error(err);
+ except("Geant4EventReaderHepMC","+++ Failed to open input stream: %s Error:%s.",
+ nam.c_str(), ::strerror(errno));
}
m_events = new HepMC::EventStream(m_input);
}
@@ -187,7 +184,7 @@ Geant4EventReaderHepMC::~Geant4EventReaderHepMC() {
/// skipEvents if required
Geant4EventReader::EventReaderStatus
Geant4EventReaderHepMC::moveToEvent(int event_number) {
- if( m_currEvent == 0 && event_number != 0 ) {
+ if( m_currEvent < event_number && event_number != 0 ) {
printout(INFO,"EventReaderHepMC::moveToEvent","Skipping the first %d events", event_number);
printout(INFO,"EventReaderHepMC::moveToEvent","Event number before skipping: %d", m_currEvent);
while ( m_currEvent < event_number ) {
diff --git a/DDG4/src/Geant4DetectorConstruction.cpp b/DDG4/src/Geant4DetectorConstruction.cpp
index 8715ca3c1..a58e755de 100644
--- a/DDG4/src/Geant4DetectorConstruction.cpp
+++ b/DDG4/src/Geant4DetectorConstruction.cpp
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4InputAction.cpp b/DDG4/src/Geant4InputAction.cpp
index fda767660..f396abb12 100644
--- a/DDG4/src/Geant4InputAction.cpp
+++ b/DDG4/src/Geant4InputAction.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4VolumeManager.cpp b/DDG4/src/Geant4VolumeManager.cpp
index a9c2c1e09..86775173d 100644
--- a/DDG4/src/Geant4VolumeManager.cpp
+++ b/DDG4/src/Geant4VolumeManager.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDG4/src/IoStreams.cpp b/DDG4/src/IoStreams.cpp
index 940a388f9..55a8ccec0 100644
--- a/DDG4/src/IoStreams.cpp
+++ b/DDG4/src/IoStreams.cpp
@@ -61,10 +61,6 @@ namespace DD4hep {
template<> std::streamsize dd4hep_file<int>::read(char_type* s, std::streamsize n)
{ return ::read(m_handle,s,n); }
- /// Specialization for standard file descriptor files according to the posix standard: Default destructor
- template<> dd4hep_file<int>::~dd4hep_file()
- { if (m_handle) ::close(m_handle); m_handle = 0;}
-
/// Specialization for standard file descriptor files according to the posix standard
template<> std::streamsize dd4hep_file<int>::write(const char_type* s, std::streamsize n)
{ return ::write(m_handle,s,n); }
@@ -107,10 +103,6 @@ namespace DD4hep {
template<> dd4hep_file<TFile*>::dd4hep_file(const char* fname, BOOST_IOS::openmode mode)
: m_handle(0), m_flag(close_handle) { open(fname,mode); }
- /// Specialization for the usage of TFile structures: Default destructor
- template<> dd4hep_file<TFile*>::~dd4hep_file()
- { if ( m_handle ) m_handle->Close(); m_handle = 0; }
-
/// Specialization for the usage of TFile structures
template<> std::streamsize dd4hep_file<TFile*>::read(char_type* s, std::streamsize n) {
if ( m_handle ) {
--
GitLab