feat: bump Geant4 version to 11.3.2#153
Merged
Merged
Conversation
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Cpp-linter Review
Used clang-format v18.1.3
Only 5 out of 7 clang-format concerns fit within this pull request's diff.
Click here for the full clang-format patch
diff --git a/u4/U4Surface.h b/u4/U4Surface.h
index 8dd6841..2a6bcd9 100644
--- a/u4/U4Surface.h
+++ b/u4/U4Surface.h
@@ -16,3 +15,0 @@ use a small array and plant metadata on that
-#include "G4String.hh"
-#include "G4OpticalSurface.hh"
-#include "G4MaterialPropertiesTable.hh"
@@ -21 +17,0 @@ use a small array and plant metadata on that
-#include "G4Version.hh"
@@ -22,0 +19,4 @@ use a small array and plant metadata on that
+#include "G4MaterialPropertiesTable.hh"
+#include "G4OpticalSurface.hh"
+#include "G4String.hh"
+#include "G4Version.hh"
@@ -222 +222 @@ inline const std::vector<G4LogicalBorderSurface*>* U4Surface::PrepareBorderSurfa
- G4LogicalBorderSurface* bs = it->second ;
+ G4LogicalBorderSurface* bs = it->second ;
@@ -228 +228 @@ inline const std::vector<G4LogicalBorderSurface*>* U4Surface::PrepareBorderSurfa
- vec->push_back(bs);
+ vec->push_back(bs);
@@ -261,2 +261,2 @@ inline const std::vector<G4LogicalSkinSurface*>* U4Surface::PrepareSkinSurfaceVe
- typedef std::map<const G4LogicalVolume*,G4LogicalSkinSurface*>::const_iterator IT ;
- VKS* vec = new VKS;
+ typedef std::map<const G4LogicalVolume*,G4LogicalSkinSurface*>::const_iterator IT ;
+ VKS *vec = new VKS;
@@ -278 +278 @@ inline const std::vector<G4LogicalSkinSurface*>* U4Surface::PrepareSkinSurfaceVe
- VKS* vec = tab;
+ VKS *vec = tab;
Have any feedback or feature suggestions? Share it here.
Contributor
There was a problem hiding this comment.
Cpp-linter Review
Used clang-format v18.1.3
Only 4 out of 6 clang-format concerns fit within this pull request's diff.
Click here for the full clang-format patch
diff --git a/u4/U4Surface.h b/u4/U4Surface.h
index 08a6622..7e5c6b7 100644
--- a/u4/U4Surface.h
+++ b/u4/U4Surface.h
@@ -16,3 +15,0 @@ use a small array and plant metadata on that
-#include "G4String.hh"
-#include "G4OpticalSurface.hh"
-#include "G4MaterialPropertiesTable.hh"
@@ -21 +17,0 @@ use a small array and plant metadata on that
-#include "G4Version.hh"
@@ -22,0 +19,4 @@ use a small array and plant metadata on that
+#include "G4MaterialPropertiesTable.hh"
+#include "G4OpticalSurface.hh"
+#include "G4String.hh"
+#include "G4Version.hh"
@@ -221,2 +221,2 @@ inline const std::vector<G4LogicalBorderSurface*>* U4Surface::PrepareBorderSurfa
- {
- G4LogicalBorderSurface* bs = it->second ;
+ {
+ G4LogicalBorderSurface *bs = it->second;
@@ -229 +229 @@ inline const std::vector<G4LogicalBorderSurface*>* U4Surface::PrepareBorderSurfa
- const PPV ppv = it->first ;
+ const PPV ppv = it->first;
@@ -261,2 +261,2 @@ inline const std::vector<G4LogicalSkinSurface*>* U4Surface::PrepareSkinSurfaceVe
- typedef std::map<const G4LogicalVolume*,G4LogicalSkinSurface*>::const_iterator IT ;
- VKS* vec = new VKS;
+ typedef std::map<const G4LogicalVolume*,G4LogicalSkinSurface*>::const_iterator IT ;
+ VKS *vec = new VKS;
Have any feedback or feature suggestions? Share it here.
Contributor
There was a problem hiding this comment.
Cpp-linter Review
Used clang-format v18.1.3
Only 4 out of 6 clang-format concerns fit within this pull request's diff.
Click here for the full clang-format patch
diff --git a/u4/U4Surface.h b/u4/U4Surface.h
index 6f9d86d..d4bd4a0 100644
--- a/u4/U4Surface.h
+++ b/u4/U4Surface.h
@@ -16,3 +15,0 @@ use a small array and plant metadata on that
-#include "G4String.hh"
-#include "G4OpticalSurface.hh"
-#include "G4MaterialPropertiesTable.hh"
@@ -21 +17,0 @@ use a small array and plant metadata on that
-#include "G4Version.hh"
@@ -22,0 +19,4 @@ use a small array and plant metadata on that
+#include "G4MaterialPropertiesTable.hh"
+#include "G4OpticalSurface.hh"
+#include "G4String.hh"
+#include "G4Version.hh"
@@ -221,2 +221,2 @@ inline const std::vector<G4LogicalBorderSurface*>* U4Surface::PrepareBorderSurfa
- {
- G4LogicalBorderSurface* bs = it->second ;
+ {
+ G4LogicalBorderSurface *bs = it->second;
@@ -230 +230 @@ inline const std::vector<G4LogicalBorderSurface*>* U4Surface::PrepareBorderSurfa
- assert( ppv.first == bs->GetVolume1());
+ assert(ppv.first == bs->GetVolume1());
@@ -261,2 +261,2 @@ inline const std::vector<G4LogicalSkinSurface*>* U4Surface::PrepareSkinSurfaceVe
- typedef std::map<const G4LogicalVolume*,G4LogicalSkinSurface*>::const_iterator IT ;
- VKS* vec = new VKS;
+ typedef std::map<const G4LogicalVolume*,G4LogicalSkinSurface*>::const_iterator IT ;
+ VKS *vec = new VKS;
Have any feedback or feature suggestions? Share it here.
Contributor
There was a problem hiding this comment.
Cpp-linter Review
Used clang-format v18.1.3
Only 4 out of 6 clang-format concerns fit within this pull request's diff.
Click here for the full clang-format patch
diff --git a/u4/U4Surface.h b/u4/U4Surface.h
index 22e2257..a38fd3e 100644
--- a/u4/U4Surface.h
+++ b/u4/U4Surface.h
@@ -16,3 +15,0 @@ use a small array and plant metadata on that
-#include "G4String.hh"
-#include "G4OpticalSurface.hh"
-#include "G4MaterialPropertiesTable.hh"
@@ -21 +17,0 @@ use a small array and plant metadata on that
-#include "G4Version.hh"
@@ -22,0 +19,4 @@ use a small array and plant metadata on that
+#include "G4MaterialPropertiesTable.hh"
+#include "G4OpticalSurface.hh"
+#include "G4String.hh"
+#include "G4Version.hh"
@@ -221,2 +221,2 @@ inline const std::vector<G4LogicalBorderSurface*>* U4Surface::PrepareBorderSurfa
- {
- G4LogicalBorderSurface* bs = it->second ;
+ {
+ G4LogicalBorderSurface *bs = it->second;
@@ -231 +231 @@ inline const std::vector<G4LogicalBorderSurface*>* U4Surface::PrepareBorderSurfa
- assert( ppv.second == bs->GetVolume2());
+ assert(ppv.second == bs->GetVolume2());
@@ -261,2 +261,2 @@ inline const std::vector<G4LogicalSkinSurface*>* U4Surface::PrepareSkinSurfaceVe
- typedef std::map<const G4LogicalVolume*,G4LogicalSkinSurface*>::const_iterator IT ;
- VKS* vec = new VKS;
+ typedef std::map<const G4LogicalVolume*,G4LogicalSkinSurface*>::const_iterator IT ;
+ VKS *vec = new VKS;
Have any feedback or feature suggestions? Share it here.
required for Geant4 11.3.2
Added logic to append formatted indices to border surface names to ensure uniqueness. Resolves BNLNPPS/esi-g4ox#50
plexoos
force-pushed
the
update-geant4
branch
from
ab345ed to
47be032
Compare
Contributor
There was a problem hiding this comment.
Cpp-linter Review
Used clang-format v18.1.3
Only 4 out of 6 clang-format concerns fit within this pull request's diff.
Click here for the full clang-format patch
diff --git a/u4/U4Surface.h b/u4/U4Surface.h
index 6843a9f..2a6bcd9 100644
--- a/u4/U4Surface.h
+++ b/u4/U4Surface.h
@@ -16,3 +15,0 @@ use a small array and plant metadata on that
-#include "G4String.hh"
-#include "G4OpticalSurface.hh"
-#include "G4MaterialPropertiesTable.hh"
@@ -21 +17,0 @@ use a small array and plant metadata on that
-#include "G4Version.hh"
@@ -22,0 +19,4 @@ use a small array and plant metadata on that
+#include "G4MaterialPropertiesTable.hh"
+#include "G4OpticalSurface.hh"
+#include "G4String.hh"
+#include "G4Version.hh"
@@ -222 +222 @@ inline const std::vector<G4LogicalBorderSurface*>* U4Surface::PrepareBorderSurfa
- G4LogicalBorderSurface* bs = it->second ;
+ G4LogicalBorderSurface* bs = it->second ;
@@ -228 +228 @@ inline const std::vector<G4LogicalBorderSurface*>* U4Surface::PrepareBorderSurfa
- vec->push_back(bs);
+ vec->push_back(bs);
@@ -261 +261 @@ inline const std::vector<G4LogicalSkinSurface*>* U4Surface::PrepareSkinSurfaceVe
- typedef std::map<const G4LogicalVolume*,G4LogicalSkinSurface*>::const_iterator IT ;
+ typedef std::map<const G4LogicalVolume*,G4LogicalSkinSurface*>::const_iterator IT ;
Have any feedback or feature suggestions? Share it here.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.