Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Code maintenance: change quoted include statements to angular brackets. #1269

Merged
merged 1 commit into from
May 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions DDG4/examples/TEve.C
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@
// Author : M.Frank
//
//====================================================================
#include "DD4hep/Detector.h"
#include <DD4hep/Detector.h>

// ROOT include files
#include "TGeoManager.h"
#include "TEveGeoNode.h"
#include "TGLViewer.h"
#include "TGLUtil.h"
#include "TGLClip.h"
#include "TMap.h"
#include "TEveElement.h"
#include "TSysEvtHandler.h"
#include "TTimer.h"
#include "TVirtualPad.h"
#include <TGeoManager.h>
#include <TEveGeoNode.h>
#include <TGLViewer.h>
#include <TGLUtil.h>
#include <TGLClip.h>
#include <TMap.h>
#include <TEveElement.h>
#include <TSysEvtHandler.h>
#include <TTimer.h>
#include <TVirtualPad.h>

#define private public
#include "TEveManager.h"
#include <TEveManager.h>

using namespace dd4hep::detail;

Expand Down
28 changes: 14 additions & 14 deletions DDG4/g4gdmlDisplay.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,25 @@
//#define G4VIS_USE_OPENGL
//#define G4UI_USE_TCSH

#include "G4PVPlacement.hh"
#include "G4RunManager.hh"
#include "G4UImanager.hh"
#include "G4UIsession.hh"
#include "Randomize.hh"
#include <G4PVPlacement.hh>
#include <G4RunManager.hh>
#include <G4UImanager.hh>
#include <G4UIsession.hh>
#include <Randomize.hh>

#ifdef G4VIS_USE_OPENGLX
#include "G4OpenGLImmediateX.hh"
#include "G4OpenGLStoredX.hh"
#include <G4OpenGLImmediateX.hh>
#include <G4OpenGLStoredX.hh>
#endif

#include "G4VisManager.hh"
#include "G4VisExecutive.hh"
#include "G4UIExecutive.hh"
#include "G4VUserPhysicsList.hh"
#include "G4ParticleTypes.hh"
#include "globals.hh"
#include <G4VisManager.hh>
#include <G4VisExecutive.hh>
#include <G4UIExecutive.hh>
#include <G4VUserPhysicsList.hh>
#include <G4ParticleTypes.hh>
#include <globals.hh>

#include "DDG4/Geant4GDMLDetector.h"
#include <DDG4/Geant4GDMLDetector.h>
#include <cerrno>
#include <stdexcept>

Expand Down
10 changes: 5 additions & 5 deletions DDG4/hepmc/HepMC3EventReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

// Framework include files
#include "HepMC3EventReader.h"
#include "DD4hep/Printout.h"
#include "DDG4/Geant4Primary.h"
#include "DDG4/Geant4Context.h"
#include "DDG4/Factories.h"
#include <DD4hep/Printout.h>
#include <DDG4/Geant4Primary.h>
#include <DDG4/Geant4Context.h>
#include <DDG4/Factories.h>

#include <G4ParticleTable.hh>

Expand All @@ -29,7 +29,7 @@
#include <HepMC3/GenVertex.h>
#include <HepMC3/Units.h>

#include "G4Event.hh"
#include <G4Event.hh>


using dd4hep::sim::HEPMC3EventReader;
Expand Down
2 changes: 1 addition & 1 deletion DDG4/hepmc/HepMC3EventReader.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#define DDG4_HEPMC_HEPMC3EVENTREADER_H

// Framework include files
#include "DDG4/Geant4InputAction.h"
#include <DDG4/Geant4InputAction.h>

namespace HepMC3{ class GenEvent; }

Expand Down
8 changes: 4 additions & 4 deletions DDG4/hepmc/HepMC3FileReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@

#include "HepMC3EventReader.h"

#include "DDG4/EventParameters.h"
#include "DDG4/RunParameters.h"
#include <DDG4/EventParameters.h>
#include <DDG4/RunParameters.h>

#include <HepMC3/ReaderFactory.h>
#include <HepMC3/Version.h>
Expand Down Expand Up @@ -113,8 +113,8 @@ namespace dd4hep {
}
}

#include "DD4hep/Printout.h"
#include "DDG4/Factories.h"
#include <DD4hep/Printout.h>
#include <DDG4/Factories.h>

using dd4hep::sim::HEPMC3FileReader;
using dd4hep::sim::Geant4EventReader;
Expand Down
4 changes: 2 additions & 2 deletions DDG4/include/DDG4/ComponentUtils.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
#define DDG4_COMPONENTUTILS_H

// Framework include files
#include "DD4hep/Primitives.h"
#include "DD4hep/Exceptions.h"
#include <DD4hep/Primitives.h>
#include <DD4hep/Exceptions.h>

/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
Expand Down
6 changes: 3 additions & 3 deletions DDG4/include/DDG4/DDG4Dict.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
#endif

// FRamework include files
#include "DD4hep/Memory.h"
#include "DDG4/Geant4Data.h"
#include "DDG4/Geant4Particle.h"
#include <DD4hep/Memory.h>
#include <DDG4/Geant4Data.h>
#include <DDG4/Geant4Particle.h>

namespace dd4hep {
namespace DDSegmentation { }
Expand Down
2 changes: 1 addition & 1 deletion DDG4/include/DDG4/Defs.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#define DDG4_DEFS_H

// Framework include files
#include "DD4hep/Detector.h"
#include <DD4hep/Detector.h>

/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
Expand Down
10 changes: 5 additions & 5 deletions DDG4/include/DDG4/Factories.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
#define DDG4_FACTORIES_H

// Framework include files
#include "DDG4/Defs.h"
#include "DD4hep/Plugins.h"
#include "DD4hep/Printout.h"
#include "DD4hep/Factories.h"
#include "DD4hep/Primitives.h"
#include <DDG4/Defs.h>
#include <DD4hep/Plugins.h>
#include <DD4hep/Printout.h>
#include <DD4hep/Factories.h>
#include <DD4hep/Primitives.h>

// C/C++ include files
#include <string>
Expand Down
4 changes: 2 additions & 2 deletions DDG4/include/DDG4/Geant4AssemblyVolume.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
#define DDG4_GEANT4ASSEMBLYVOLUME_H

/// ROOT includes
#include "TGeoNode.h"
#include <TGeoNode.h>

/// Geant4 include files
#include "G4AssemblyVolume.hh"
#include <G4AssemblyVolume.hh>

/// C/C++ include files
#include <vector>
Expand Down
2 changes: 1 addition & 1 deletion DDG4/include/DDG4/Geant4Callback.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
#define DDG4_GEANT4CALLBACK_H

// Just forward header for dd4hep callbacks
#include "DD4hep/Callback.h"
#include <DD4hep/Callback.h>

#endif // DDG4_GEANT4CALLBACK_H
4 changes: 2 additions & 2 deletions DDG4/include/DDG4/Geant4Context.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
#define DDG4_GEANT4CONTEXT_H

// Framework incloude files
#include "DD4hep/Primitives.h"
#include "DD4hep/ObjectExtensions.h"
#include <DD4hep/Primitives.h>
#include <DD4hep/ObjectExtensions.h>

// Forward declarations
class G4Run;
Expand Down
4 changes: 2 additions & 2 deletions DDG4/include/DDG4/Geant4DataConversion.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
#define DDG4_GEANT4DATACONVERSION_H

// Framework include files
#include "DD4hep/VolumeManager.h"
#include "DD4hep/DetElement.h"
#include <DD4hep/VolumeManager.h>
#include <DD4hep/DetElement.h>
#include <typeinfo>

/// Namespace for the AIDA detector description toolkit
Expand Down
6 changes: 3 additions & 3 deletions DDG4/include/DDG4/Geant4DataDump.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
#define DDG4_GEANT4DATADUMP_H

// Framework include files
#include "DD4hep/Printout.h"
#include "DDG4/Geant4Data.h"
#include "DDG4/Geant4Particle.h"
#include <DD4hep/Printout.h>
#include <DDG4/Geant4Data.h>
#include <DDG4/Geant4Particle.h>

// C/C++ include files
#include <vector>
Expand Down
4 changes: 2 additions & 2 deletions DDG4/include/DDG4/Geant4FastSimShowerModel.inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ namespace dd4hep {
} /* End namespace sim */
} /* End namespace dd4hep */

#include "G4Version.hh"
#include <G4Version.hh>
#if G4VERSION_NUMBER > 1070
#include "G4FastSimHitMaker.hh"
#include <G4FastSimHitMaker.hh>
#else
class G4FastHit;
class G4FastSimHitMaker { public: void make(const G4FastHit&, const G4FastTrack&) { } };
Expand Down
2 changes: 1 addition & 1 deletion DDG4/include/DDG4/Geant4GDMLDetector.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#ifndef DDG4_GEANT4GDMLDETECTOR_H
#define DDG4_GEANT4GDMLDETECTOR_H

#include "G4VUserDetectorConstruction.hh"
#include <G4VUserDetectorConstruction.hh>
#include <string>

/// Namespace for the AIDA detector description toolkit
Expand Down
2 changes: 1 addition & 1 deletion DDG4/include/DDG4/Geant4HierarchyDump.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#define DDG4_GEANT4HIERARCHYDUMP_H

// Geant 4 include files
#include "G4VPhysicalVolume.hh"
#include <G4VPhysicalVolume.hh>

/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
Expand Down
8 changes: 4 additions & 4 deletions DDG4/include/DDG4/Geant4HitCollection.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
#define DDG4_GEANT4HITCOLLECTION_H

// Framework include files
#include "DD4hep/Handle.h"
#include "DDG4/ComponentUtils.h"
#include "G4VHitsCollection.hh"
#include "G4VHit.hh"
#include <DD4hep/Handle.h>
#include <DDG4/ComponentUtils.h>
#include <G4VHitsCollection.hh>
#include <G4VHit.hh>

// C/C++ include files
#include <vector>
Expand Down
6 changes: 3 additions & 3 deletions DDG4/include/DDG4/Geant4HitHandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
#define DDG4_GEANT4HITHANDLER_H

// Framework include files
#include "DDG4/Defs.h"
#include <DDG4/Defs.h>

// Geant4 include files
#include "G4EmSaturation.hh"
#include "G4Version.hh"
#include <G4EmSaturation.hh>
#include <G4Version.hh>

/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
Expand Down
2 changes: 1 addition & 1 deletion DDG4/include/DDG4/Geant4InteractionMerger.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#define DDG4_GEANT4INTERACTIONMERGER_H

// Framework include files
#include "DDG4/Geant4GeneratorAction.h"
#include <DDG4/Geant4GeneratorAction.h>

/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
Expand Down
4 changes: 2 additions & 2 deletions DDG4/include/DDG4/Geant4InteractionVertexBoost.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
#define DDG4_GEANT4INTERACTIONVERTEXBOOST_H

// Framework include files
#include "DDG4/Geant4GeneratorAction.h"
#include "DDG4/Geant4Primary.h"
#include <DDG4/Geant4GeneratorAction.h>
#include <DDG4/Geant4Primary.h>

/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
Expand Down
4 changes: 2 additions & 2 deletions DDG4/include/DDG4/Geant4InteractionVertexSmear.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
#define DDG4_GEANT4INTERACTIONVERTEXSMEAR_H

// Framework include files
#include "DDG4/Geant4GeneratorAction.h"
#include <DDG4/Geant4GeneratorAction.h>

// ROOT include files
#include "Math/Vector4D.h"
#include <Math/Vector4D.h>

/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
Expand Down
2 changes: 1 addition & 1 deletion DDG4/include/DDG4/Geant4IsotropeGenerator.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#define DDG4_GEANT4ISOTROPEGENERATOR_H

// Framework include files
#include "DDG4/Geant4ParticleGenerator.h"
#include <DDG4/Geant4ParticleGenerator.h>

/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
Expand Down
10 changes: 5 additions & 5 deletions DDG4/include/DDG4/Geant4Mapping.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
#define DDG4_GEANT4MAPPING_H

// Framework include files
#include "DD4hep/Detector.h"
#include "DD4hep/Volumes.h"
#include "DD4hep/GeoHandler.h"
#include "DDG4/Geant4GeometryInfo.h"
#include "DDG4/Geant4VolumeManager.h"
#include <DD4hep/Detector.h>
#include <DD4hep/Volumes.h>
#include <DD4hep/GeoHandler.h>
#include <DDG4/Geant4GeometryInfo.h>
#include <DDG4/Geant4VolumeManager.h>

/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
Expand Down
2 changes: 1 addition & 1 deletion DDG4/include/DDG4/Geant4MonteCarloTruth.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#define DDG4_GEANT4MONTECARLOTRUTH_H

// Framework include files
#include "DDG4/Geant4Action.h"
#include <DDG4/Geant4Action.h>

// C/C++ include files
#include <map>
Expand Down
2 changes: 1 addition & 1 deletion DDG4/include/DDG4/Geant4Output2ROOT.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#define DDG4_GEANT4OUTPUT2ROOT_H

// Framework include files
#include "DDG4/Geant4OutputAction.h"
#include <DDG4/Geant4OutputAction.h>

class TFile;
class TTree;
Expand Down
2 changes: 1 addition & 1 deletion DDG4/include/DDG4/Geant4Particle.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// Framework include files

// ROOT includes
#include "Math/Vector4D.h"
#include <Math/Vector4D.h>

// Geant4 forward declarations
class G4ParticleDefinition;
Expand Down
4 changes: 2 additions & 2 deletions DDG4/include/DDG4/Geant4ParticleGenerator.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
#define DDG4_GEANT4PARTICLEGENERATOR_H

// Framework include files
#include "DDG4/Geant4GeneratorAction.h"
#include "Math/Vector3D.h"
#include <DDG4/Geant4GeneratorAction.h>
#include <Math/Vector3D.h>

// Forward declarations
class G4ParticleDefinition;
Expand Down
Loading
Loading