Skip to content

Commit 5b60cd9

Browse files
jmcarcellandresailer
authored andcommitted
Fix a few typos and remove unused includes
1 parent cd6cbfd commit 5b60cd9

File tree

10 files changed

+9
-13
lines changed

10 files changed

+9
-13
lines changed

DDCore/include/DD4hep/Detector.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
#include <map>
3535
#include <vector>
3636
#include <string>
37-
#include <cstdio>
3837
#include <memory>
3938

4039
// Forward declarations
@@ -216,14 +215,14 @@ namespace dd4hep {
216215
unsigned int excludeFlag=0 ) const = 0 ;
217216
#endif
218217

219-
/** Miscaneleous accessors to the detexctor description */
218+
/** Miscaneleous accessors to the detector description */
220219

221220
/// Register new parent detector using the detector name.
222221
/** Volumes must be registered/declared PRIOR to be picked up!
223222
* Once registered, Detector::pickMotherVolume(detector) will automatically return the
224223
* proper parent volume!
225224
*
226-
* The method throws an exception if another volume was already declared for this subdetector
225+
* The method throws an exception if another volume was already declared for this subdetector.
227226
* The method throws an exception if the volume to be registered is invalid.
228227
*/
229228
virtual void declareParent(const std::string& detector_name, const DetElement& det) = 0;

DDCore/include/DD4hep/SignalHandler.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
#ifndef DD4HEP_DDCORE_SIGNALHANDLER_H
1414
#define DD4HEP_DDCORE_SIGNALHANDLER_H
1515

16-
/// System include files
17-
#include <csignal>
18-
1916
/// Namespace for the AIDA detector description toolkit
2017
namespace dd4hep {
2118

DDCore/src/DetectorLoad.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ void DetectorLoad::processXMLElement(const std::string& xmlfile, const xml::Hand
136136
PluginDebug dbg;
137137
result = PluginService::Create<long>(type, m_detDesc, &handle);
138138
if ( 0 == result ) {
139-
throw std::runtime_error("dd4hep: Failed to locate plugin to interprete files of type"
139+
throw std::runtime_error("dd4hep: Failed to locate plugin to interpret files of type"
140140
" \"" + tag + "\" - no factory:" + type + ". " + dbg.missingFactory(type));
141141
}
142142
}

DDCore/src/SignalHandler.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <DD4hep/Printout.h>
1616
#include <DD4hep/SignalHandler.h>
1717

18+
#include <csignal>
1819
#include <map>
1920
#include <memory>
2021
#include <string>

DDCore/src/plugins/LCDDConverter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1063,7 +1063,7 @@ void LCDDConverter::handleProperties(Detector::Properties& prp) const {
10631063
PluginDebug dbg;
10641064
result = PluginService::Create<long>(tag, &m_detDesc, ptr, &vals);
10651065
if (0 == result) {
1066-
except("LCDDConverter", "Failed to locate plugin to interprete files of type"
1066+
except("LCDDConverter", "Failed to locate plugin to interpret files of type"
10671067
" \"" + tag + "\" - no factory:" + type + ". " +
10681068
dbg.missingFactory(tag));
10691069
}

DDG4/src/Geant4Interrupts.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
#include <DDG4/Geant4Kernel.h>
1717
#include <DDG4/Geant4Interrupts.h>
1818

19+
#include <csignal>
20+
1921
/// Default SIGINT handler: trigger end-of-event-loop in Geant4Kernel object
2022
bool dd4hep::sim::Geant4Interrupts::default_sigint_handler(void* user_context, int) {
2123
Geant4Kernel* krnl = (Geant4Kernel*)user_context;

DDParsers/include/Parsers/spirit/GrammarsV2.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
//==============================================================================
2323
#include <string>
2424
#include <vector>
25-
#include <deque>
2625
#include <list>
2726
#include <set>
2827
#include <map>

DDParsers/include/Parsers/spirit/ParsersFactory.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
// STD & STL
1717
// ============================================================================
1818
#include <string>
19-
#include <vector>
20-
#include <map>
2119
// ============================================================================
2220
// Boost:
2321
// ============================================================================

doc/usermanuals/DD4hep/chapters/basics.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ \section{The Detector Description Data Hub: \texttt{Detector}}
434434
435435
\section{Detector Description Persistency in \texttt{XML}}
436436
\label{sec:compact-xml-structure}
437-
As explained in a previous section, the mechanism involved in the data loading allows an application to be fairly independent of the technology used to populate the transient detector representation. However, if one wants to use a given technology, she/he has to get/provide the corresponding conversion mechanism. The choice of \texttt{XML} was driven mainly by its easiness of use and the number of tools provided for its manipulation and parsing. Moreover, \texttt{XML} data can be easily translated into many other format using tools like \texttt{XSLT} processors. The grammar used for the \texttt{XML} data is pretty simple and straight forward, actually very similar to other geometry description languages based on \texttt{XML}. For example the material description is nearly identical to the material description in \texttt{GDML}~\cite{Chytracek:2006be}. The syntactic structure of the compact \texttt{XML} description was taken from the SiD detector description~\cite{Gaede:81331}. The following listing shows the basic layout of any the compact detector description file with its different sections:
437+
As explained in a previous section, the mechanism involved in the data loading allows an application to be fairly independent of the technology used to populate the transient detector representation. However, if one wants to use a given technology, she/he has to get/provide the corresponding conversion mechanism. The choice of \texttt{XML} was driven mainly by its easiness of use and the number of tools provided for its manipulation and parsing. Moreover, \texttt{XML} data can be easily translated into many other format using tools like \texttt{XSLT} processors. The grammar used for the \texttt{XML} data is pretty simple and straight forward, actually very similar to other geometry description languages based on \texttt{XML}. For example the material description is nearly identical to the material description in \texttt{GDML}~\cite{Chytracek:2006be}. The syntactic structure of the compact \texttt{XML} description was taken from the SiD detector description~\cite{Gaede:81331}. The following listing shows the basic layout of the compact detector description file with its different sections:
438438
439439
\begin{minted}[frame=single,framesep=3pt,breaklines=true,tabsize=2,linenos,fontsize=\small]{xml}
440440
<lccdd>

examples/DDDigi/scripts/DigiTest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ def next_input(self):
105105
self.used_inputs = []
106106
next_source = self.inputs[len(self.used_inputs)]
107107
self.used_inputs.append(next_source)
108-
self.info('Prepariing next input file: ' + str(next_source))
108+
self.info('Preparing next input file: ' + str(next_source))
109109
return next_source
110110

111111
def run_checked(self, num_events=5, num_threads=5, parallel=3):

0 commit comments

Comments
 (0)