Import Geant4 11.3.0.beta source tree

examples/basic/B4/B4d/include/ActionInitialization.hh

@@ -47,8 +47,6 @@ class ActionInitialization : public G4VUserActionInitialization
     void Build() const override;
 };
 
-}
+}  // namespace B4d
 
 #endif
-
-

examples/basic/B4/B4d/include/DetectorConstruction.hh

@@ -73,13 +73,13 @@ class DetectorConstruction : public G4VUserDetectorConstruction
 
     // data members
     //
-    static G4ThreadLocal G4GlobalMagFieldMessenger*  fMagFieldMessenger;
-                            // magnetic field messenger
+    static G4ThreadLocal G4GlobalMagFieldMessenger* fMagFieldMessenger;
+    // magnetic field messenger
 
-    G4bool fCheckOverlaps = true; // option to activate checking of volumes overlaps
+    G4bool fCheckOverlaps = true;  // option to activate checking of volumes overlaps
 };
 
-}
+}  // namespace B4d
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 

examples/basic/B4/B4d/include/EventAction.hh

@@ -31,10 +31,11 @@
 #define EventAction_h 1
 
 #include "G4UserEventAction.hh"
-
-#include "G4THitsMap.hh"
 #include "globals.hh"
 
+class G4Event;
+template <typename T> class G4THitsMap;
+
 namespace B4d
 {
 
@@ -46,29 +47,28 @@ namespace B4d
 
 class EventAction : public G4UserEventAction
 {
-public:
-  EventAction() = default;
-  ~EventAction() override = default;
+  public:
+    EventAction() = default;
+    ~EventAction() override = default;
 
-  void  BeginOfEventAction(const G4Event* event) override;
-  void    EndOfEventAction(const G4Event* event) override;
+    void BeginOfEventAction(const G4Event* event) override;
+    void EndOfEventAction(const G4Event* event) override;
 
-private:
-  // methods
-  G4THitsMap<G4double>* GetHitsCollection(G4int hcID,
-                                          const G4Event* event) const;
-  G4double GetSum(G4THitsMap<G4double>* hitsMap) const;
-  void PrintEventStatistics(G4double absoEdep, G4double absoTrackLength,
-                            G4double gapEdep, G4double gapTrackLength) const;
+  private:
+    // methods
+    G4THitsMap<G4double>* GetHitsCollection(G4int hcID, const G4Event* event) const;
+    G4double GetSum(G4THitsMap<G4double>* hitsMap) const;
+    void PrintEventStatistics(G4double absoEdep, G4double absoTrackLength, G4double gapEdep,
+                              G4double gapTrackLength) const;
 
-  // data members
-  G4int fAbsoEdepHCID = -1;
-  G4int fGapEdepHCID = -1;
-  G4int fAbsoTrackLengthHCID = -1;
-  G4int fGapTrackLengthHCID = -1;
+    // data members
+    G4int fAbsoEdepHCID = -1;
+    G4int fGapEdepHCID = -1;
+    G4int fAbsoTrackLengthHCID = -1;
+    G4int fGapTrackLengthHCID = -1;
 };
 
-}
+}  // namespace B4d
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 

examples/basic/B4/B4d/include/PrimaryGeneratorAction.hh

@@ -25,13 +25,12 @@
 //
 //
 /// \file B4/B4d/include/PrimaryGeneratorAction.hh
-/// \brief Definition of the PrimaryGeneratorAction class
+/// \brief Definition of the B4::PrimaryGeneratorAction class
 
 #ifndef B4PrimaryGeneratorAction_h
 #define B4PrimaryGeneratorAction_h 1
 
 #include "G4VUserPrimaryGeneratorAction.hh"
-#include "globals.hh"
 
 class G4ParticleGun;
 class G4Event;
@@ -48,17 +47,17 @@ namespace B4
 
 class PrimaryGeneratorAction : public G4VUserPrimaryGeneratorAction
 {
-public:
-  PrimaryGeneratorAction();
-  ~PrimaryGeneratorAction() override;
+  public:
+    PrimaryGeneratorAction();
+    ~PrimaryGeneratorAction() override;
 
-  void GeneratePrimaries(G4Event* event) override;
+    void GeneratePrimaries(G4Event* event) override;
 
-private:
-  G4ParticleGun* fParticleGun = nullptr; // G4 particle gun
+  private:
+    G4ParticleGun* fParticleGun = nullptr;  // G4 particle gun
 };
 
-}
+}  // namespace B4
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 

examples/basic/B4/B4d/include/RunAction.hh

@@ -31,7 +31,6 @@
 #define B4RunAction_h 1
 
 #include "G4UserRunAction.hh"
-#include "globals.hh"
 
 class G4Run;
 
@@ -63,10 +62,10 @@ class RunAction : public G4UserRunAction
     ~RunAction() override = default;
 
     void BeginOfRunAction(const G4Run*) override;
-    void   EndOfRunAction(const G4Run*) override;
+    void EndOfRunAction(const G4Run*) override;
 };
 
-}
+}  // namespace B4
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......