style: change include G4class

2023-04-09 22:30:59 +08:00 · 2023-04-09 22:30:59 +08:00 · 584c38c0ff
parent cf74c63e6b
commit 584c38c0ff
21 changed files with 118 additions and 111 deletions
--- a/include/GeneAnalysisManager.hh
+++ b/include/GeneAnalysisManager.hh
@ -1,5 +1,5 @@
-#ifndef GENEANALYSISMANAGER_HH
-#define GENEANALYSISMANAGER_HH 1
+#ifndef GeneAnalysisManager_hh
+#define GeneAnalysisManager_hh 1

 #include "TFile.h"
 #include "TROOT.h"
--- a/include/GeneDetectorConstruction.hh
+++ b/include/GeneDetectorConstruction.hh
@ -1,11 +1,11 @@
-#ifndef GeneDetectorConstruction_H
-#define GeneDetectorConstruction_H 1
+#ifndef GeneDetectorConstruction_hh
+#define GeneDetectorConstruction_hh 1

 class G4LogicalVolume;
 class G4VPhysicalVolume;
 class GeneDetectorConstructionMessenger;

-#include <G4VUserDetectorConstruction.hh>
+#include "G4VUserDetectorConstruction.hh"
 #include <globals.hh>

 class GeneDetectorConstruction : public G4VUserDetectorConstruction {
--- a/include/GeneDetectorConstructionMessenger.hh
+++ b/include/GeneDetectorConstructionMessenger.hh
@ -1,7 +1,7 @@
-#ifndef GeneDetectorConstructionMessenger_h
-#define GeneDetectorConstructionMessenger_h 1
+#ifndef GeneDetectorConstructionMessenger_hh
+#define GeneDetectorConstructionMessenger_hh 1

-#include <G4UImessenger.hh>
+#include "G4UImessenger.hh"
 #include <globals.hh>

 class GeneDetectorConstruction;
--- a/include/GeneEventAction.hh
+++ b/include/GeneEventAction.hh
@ -1,7 +1,7 @@
-#ifndef GeneEventAction_HH
-#define GeneEventAction_HH 1
+#ifndef GeneEventAction_hh
+#define GeneEventAction_hh 1

-#include <G4UserEventAction.hh>
+#include "G4UserEventAction.hh"
 #include <globals.hh>

 class GeneEventAction : public G4UserEventAction {
--- a/include/GeneHe3detHit.hh
+++ b/include/GeneHe3detHit.hh
@ -1,10 +1,10 @@
-#ifndef GeneHe3detHit_h
-#define GeneHe3detHit_h 1
+#ifndef GeneHe3detHit_hh
+#define GeneHe3detHit_hh 1

-#include <G4Allocator.hh>
-#include <G4THitsCollection.hh>
-#include <G4ThreeVector.hh>
-#include <G4VHit.hh>
+#include "G4Allocator.hh"
+#include "G4THitsCollection.hh"
+#include "G4ThreeVector.hh"
+#include "G4VHit.hh"

 class GeneHe3detHit : public G4VHit {
 public:
--- a/include/GeneHe3detSD.hh
+++ b/include/GeneHe3detSD.hh
@ -1,8 +1,8 @@
-#ifndef GeneHe3detSD_HH
-#define GeneHe3detSD_HH 1
+#ifndef GeneHe3detSD_hh
+#define GeneHe3detSD_hh 1

+#include "G4VSensitiveDetector.hh"
 #include "GeneHe3detHit.hh"
-#include <G4VSensitiveDetector.hh>
 #include <globals.hh>

 class G4Step;
--- a/include/GenePhysicsList.hh
+++ b/include/GenePhysicsList.hh
@ -0,0 +1,7 @@
+#ifndef GENEPHYSICSLIST_HH
+#define GENEPHYSICSLIST_HH 1
+
+#include "G4VUserPhysicsList.hh"
+#include "globals.hh"
+
+#endif
--- a/include/GenePrimaryGeneratorAction.hh
+++ b/include/GenePrimaryGeneratorAction.hh
@ -1,7 +1,7 @@
-#ifndef GenePrimaryGeneratorAction_H
-#define GenePrimaryGeneratorAction_H 1
+#ifndef GenePrimaryGeneratorAction_hh
+#define GenePrimaryGeneratorAction_hh 1

-#include <G4VUserPrimaryGeneratorAction.hh>
+#include "G4VUserPrimaryGeneratorAction.hh"
 #include <globals.hh>

 class G4ParticleGun;
--- a/include/GenePrimaryGeneratorActionMessenger.hh
+++ b/include/GenePrimaryGeneratorActionMessenger.hh
@ -1,7 +1,7 @@
-#ifndef GenePrimaryGeneratorActionMessenger_h
-#define GenePrimaryGeneratorActionMessenger_h 1
+#ifndef GenePrimaryGeneratorActionMessenger_hh
+#define GenePrimaryGeneratorActionMessenger_hh 1

-#include <G4UImessenger.hh>
+#include "G4UImessenger.hh"
 #include <globals.hh>

 class GenePrimaryGeneratorAction;
--- a/include/GeneRunAction.hh
+++ b/include/GeneRunAction.hh
@ -1,7 +1,7 @@
-#ifndef GeneRunAction_HH
-#define GeneRunAction_HH 1
+#ifndef GeneRunAction_hh
+#define GeneRunAction_hh 1

-#include <G4UserRunAction.hh>
+#include "G4UserRunAction.hh"
 #include <globals.hh>

 class G4String;
--- a/include/GeneRunActionMessenger.hh
+++ b/include/GeneRunActionMessenger.hh
@ -1,7 +1,7 @@
-#ifndef GeneRunActionMessenger_h
-#define GeneRunActionMessenger_h 1
+#ifndef GeneRunActionMessenger_hh
+#define GeneRunActionMessenger_hh 1

-#include <G4UImessenger.hh>
+#include "G4UImessenger.hh"
 #include <globals.hh>

 class GeneRunAction;
--- a/main.cpp
+++ b/main.cpp
@ -1,20 +1,20 @@
-#include <TROOT.h>
-#include <time.h>
+#include "TROOT.h"
+#include "time.h"

+#include "G4RunManager.hh"
+#include "G4SystemOfUnits.hh"
+#include "G4UIExecutive.hh"
+#include "G4UImanager.hh"
+#include "G4UItcsh.hh"
+#include "G4UIterminal.hh"
+#include "G4UnitsTable.hh"
+#include "G4VisExecutive.hh"
 #include "GeneDetectorConstruction.hh"
 #include "GeneEventAction.hh"
 #include "GenePrimaryGeneratorAction.hh"
 #include "GeneRunAction.hh"
-#include <G4RunManager.hh>
-#include <G4SystemOfUnits.hh>
-#include <G4UIExecutive.hh>
-#include <G4UImanager.hh>
-#include <G4UItcsh.hh>
-#include <G4UIterminal.hh>
-#include <G4UnitsTable.hh>
-#include <G4VisExecutive.hh>
-#include <QGSP_BERT_HP.hh>
-#include <Randomize.hh>
+#include "QGSP_BERT_HP.hh"
+#include "Randomize.hh"

 int main(int argc, char **argv) {
    G4UIExecutive *ui = nullptr;
--- a/src/GeneDetectorConstruction.cc
+++ b/src/GeneDetectorConstruction.cc
@ -1,23 +1,23 @@
 #include "GeneDetectorConstruction.hh"

+#include "G4Box.hh"
+#include "G4Colour.hh"
+#include "G4LogicalBorderSurface.hh"
+#include "G4LogicalVolume.hh"
+#include "G4Material.hh"
+#include "G4NistManager.hh"
+#include "G4OpticalSurface.hh"
+#include "G4PVPlacement.hh"
+#include "G4PhysicalConstants.hh"
+#include "G4RotationMatrix.hh"
+#include "G4SDManager.hh"
+#include "G4SubtractionSolid.hh"
+#include "G4SystemOfUnits.hh"
+#include "G4ThreeVector.hh"
+#include "G4Tubs.hh"
+#include "G4VisAttributes.hh"
 #include "GeneDetectorConstructionMessenger.hh"
 #include "GeneHe3detSD.hh"
-#include <G4Box.hh>
-#include <G4Colour.hh>
-#include <G4LogicalBorderSurface.hh>
-#include <G4LogicalVolume.hh>
-#include <G4Material.hh>
-#include <G4NistManager.hh>
-#include <G4OpticalSurface.hh>
-#include <G4PVPlacement.hh>
-#include <G4PhysicalConstants.hh>
-#include <G4RotationMatrix.hh>
-#include <G4SDManager.hh>
-#include <G4SubtractionSolid.hh>
-#include <G4SystemOfUnits.hh>
-#include <G4ThreeVector.hh>
-#include <G4Tubs.hh>
-#include <G4VisAttributes.hh>
 #include <globals.hh>

 GeneDetectorConstruction::GeneDetectorConstruction() {
@ -142,11 +142,11 @@ G4VPhysicalVolume* GeneDetectorConstruction::Construct() {
    ej_200_OpticalSurface->SetModel(glisur);

    // ********** Geometry **********
-    // world
+    // World
    G4double world_xyz = 2. * m;
-    G4Box* solidWorld = new G4Box("world", 0.5 * world_xyz, 0.5 * world_xyz, 0.5 * world_xyz);
-    logicalWorld = new G4LogicalVolume(solidWorld, mat_Air, "world", 0, 0, 0);
-    physicalWorld = new G4PVPlacement(0, G4ThreeVector(), "world", logicalWorld,
+    G4Box* solidWorld = new G4Box("World", 0.5 * world_xyz, 0.5 * world_xyz, 0.5 * world_xyz);
+    logicalWorld = new G4LogicalVolume(solidWorld, mat_Air, "World", 0, 0, 0);
+    physicalWorld = new G4PVPlacement(0, G4ThreeVector(), "World", logicalWorld,
                                      NULL,   // mother volume
                                      false,  // no boolean operation
                                      0);     // copy number
--- a/src/GeneDetectorConstructionMessenger.cc
+++ b/src/GeneDetectorConstructionMessenger.cc
@ -1,10 +1,10 @@
 #include "GeneDetectorConstructionMessenger.hh"

+#include "G4UIcmdWithADouble.hh"
+#include "G4UIcmdWithADoubleAndUnit.hh"
+#include "G4UIcmdWithAString.hh"
+#include "G4UIdirectory.hh"
 #include "GeneDetectorConstruction.hh"
-#include <G4UIcmdWithADouble.hh>
-#include <G4UIcmdWithADoubleAndUnit.hh>
-#include <G4UIcmdWithAString.hh>
-#include <G4UIdirectory.hh>

 GeneDetectorConstructionMessenger::GeneDetectorConstructionMessenger(GeneDetectorConstruction* pDets)
    : pDetectorConstruction(pDets) {
--- a/src/GeneEventAction.cc
+++ b/src/GeneEventAction.cc
@ -1,20 +1,20 @@
 #include "GeneEventAction.hh"

+#include "G4Event.hh"
+#include "G4EventManager.hh"
+#include "G4HCofThisEvent.hh"
+#include "G4SDManager.hh"
+#include "G4SystemOfUnits.hh"
+#include "G4Trajectory.hh"
+#include "G4TrajectoryContainer.hh"
+#include "G4UImanager.hh"
+#include "G4UnitsTable.hh"
+#include "G4VHitsCollection.hh"
+#include "G4VVisManager.hh"
+#include "G4ios.hh"
 #include "GeneAnalysisManager.hh"
 #include "GeneHe3detHit.hh"
 #include "Randomize.hh"
-#include <G4Event.hh>
-#include <G4EventManager.hh>
-#include <G4HCofThisEvent.hh>
-#include <G4SDManager.hh>
-#include <G4SystemOfUnits.hh>
-#include <G4Trajectory.hh>
-#include <G4TrajectoryContainer.hh>
-#include <G4UImanager.hh>
-#include <G4UnitsTable.hh>
-#include <G4VHitsCollection.hh>
-#include <G4VVisManager.hh>
-#include <G4ios.hh>

 GeneEventAction::GeneEventAction() : GeneHe3detSDCollID(-1), drawFlag("non") {}

--- a/src/GeneHe3detHit.cc
+++ b/src/GeneHe3detHit.cc
@ -1,10 +1,10 @@
 #include "GeneHe3detHit.hh"

-#include <G4Circle.hh>
-#include <G4Colour.hh>
-#include <G4UnitsTable.hh>
-#include <G4VVisManager.hh>
-#include <G4VisAttributes.hh>
+#include "G4Circle.hh"
+#include "G4Colour.hh"
+#include "G4UnitsTable.hh"
+#include "G4VVisManager.hh"
+#include "G4VisAttributes.hh"

 #include <iomanip>

--- a/src/GeneHe3detSD.cc
+++ b/src/GeneHe3detSD.cc
@ -1,14 +1,14 @@
 #include "GeneHe3detSD.hh"

+#include "G4HCofThisEvent.hh"
+#include "G4Ions.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4ParticleTypes.hh"
+#include "G4SDManager.hh"
+#include "G4Step.hh"
+#include "G4VPhysicalVolume.hh"
+#include "G4ios.hh"
 #include "GeneHe3detHit.hh"
-#include <G4HCofThisEvent.hh>
-#include <G4Ions.hh>
-#include <G4ParticleDefinition.hh>
-#include <G4ParticleTypes.hh>
-#include <G4SDManager.hh>
-#include <G4Step.hh>
-#include <G4VPhysicalVolume.hh>
-#include <G4ios.hh>

 GeneHe3detSD::GeneHe3detSD(G4String name) : G4VSensitiveDetector(name) {
    G4String HCname = "GeneHe3detHitCollection";
--- a/src/GenePrimaryGeneratorAction.cc
+++ b/src/GenePrimaryGeneratorAction.cc
@ -1,16 +1,16 @@
-#include "GenePrimaryGeneratorAction.hh"
 #include "TGraph.h"
 #include "TH1F.h"

+#include "G4Event.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4ParticleGun.hh"
+#include "G4ParticleTable.hh"
+#include "G4PhysicalConstants.hh"
+#include "G4SystemOfUnits.hh"
 #include "GeneAnalysisManager.hh"
+#include "GenePrimaryGeneratorAction.hh"
 #include "GenePrimaryGeneratorActionMessenger.hh"
 #include "Randomize.hh"
-#include <G4Event.hh>
-#include <G4ParticleDefinition.hh>
-#include <G4ParticleGun.hh>
-#include <G4ParticleTable.hh>
-#include <G4PhysicalConstants.hh>
-#include <G4SystemOfUnits.hh>
 #include <globals.hh>

 #include "fstream"
--- a/src/GenePrimaryGeneratorActionMessenger.cc
+++ b/src/GenePrimaryGeneratorActionMessenger.cc
@ -1,10 +1,10 @@
 #include "GenePrimaryGeneratorActionMessenger.hh"

+#include "G4SystemOfUnits.hh"
+#include "G4UIcmdWithADoubleAndUnit.hh"
+#include "G4UIcmdWithAString.hh"
+#include "G4UIdirectory.hh"
 #include "GenePrimaryGeneratorAction.hh"
-#include <G4SystemOfUnits.hh>
-#include <G4UIcmdWithADoubleAndUnit.hh>
-#include <G4UIcmdWithAString.hh>
-#include <G4UIdirectory.hh>

 GenePrimaryGeneratorActionMessenger::GenePrimaryGeneratorActionMessenger(GenePrimaryGeneratorAction* pPrimary)
    : pPrimaryGeneratorAction(pPrimary) {
--- a/src/GeneRunAction.cc
+++ b/src/GeneRunAction.cc
@ -1,12 +1,12 @@
 #include "GeneRunAction.hh"

+#include "G4Run.hh"
+#include "G4SystemOfUnits.hh"
+#include "G4UImanager.hh"
+#include "G4VVisManager.hh"
+#include "G4ios.hh"
 #include "GeneAnalysisManager.hh"
 #include "GeneRunActionMessenger.hh"
-#include <G4Run.hh>
-#include <G4SystemOfUnits.hh>
-#include <G4UImanager.hh>
-#include <G4VVisManager.hh>
-#include <G4ios.hh>

 GeneRunAction::GeneRunAction() : G4UserRunAction() {
    RunNo = "00";
--- a/src/GeneRunActionMessenger.cc
+++ b/src/GeneRunActionMessenger.cc
@ -1,8 +1,8 @@
 #include "GeneRunActionMessenger.hh"

+#include "G4UIcmdWithAString.hh"
+#include "G4UIdirectory.hh"
 #include "GeneRunAction.hh"
-#include <G4UIcmdWithAString.hh>
-#include <G4UIdirectory.hh>

 GeneRunActionMessenger::GeneRunActionMessenger(GeneRunAction* pRun) : pRunAction(pRun) {
    RunDir = new G4UIdirectory("/Gene/Run/");